[PATCH 2 of 2] unbundle: Support bundle2 files

[Pierre-Yves David]

On 01/16/2015 12:20 PM, Eric Sumner wrote:
> # HG changeset patch
> # User Eric Sumner <ericsumner at fb.com>
> # Date 1421284195 28800
> #      Wed Jan 14 17:09:55 2015 -0800
> # Node ID e330ca1592577409465f1b238b9b2ce689ba55e9
> # Parent  e07587a186a859fdb065b9475afd0470e2ae4508
> unbundle: Support bundle2 files
>
> This adds support for bundle2 files to the unbundle command.  The modheads code
> is complicated by the odd return values from addchangegroup (0 => no change,
> 1 => no new heads, +/-2 => 1 more/fewer heads, etc)
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -6143,8 +6143,33 @@
>           for fname in fnames:
>               f = hg.openpath(ui, fname)
>               gen = exchange.readbundle(ui, f, fname)
> -            modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
> -                                                  'bundle:' + fname)
> +            if isinstance(gen, bundle2.unbundle20):
> +                tr = repo.transaction('unbundle')
> +                try:
> +                    op = bundle2.processbundle(repo, gen, lambda: tr)
> +                    tr.close()
> +                finally:
> +                    if tr:
> +                        tr.release()
> +                modheads = 0
> +                changes = False
> +                for r in op.records['changegroup']:
> +                    result = r.get('result', 0)
> +                    if result > 1:
> +                        changes = True
> +                        modheads += result - 1
> +                    elif result < -1:
> +                        changes = True
> +                        modheads += result + 1
> +                    elif result == 1:
> +                        changes = True
> +                if changes and modheads >= 0:
> +                    modheads += 1
> +                elif changes:
> +                    modheads -= 1

There is already an implementation of this in exchange.py, can you check 
it for factorisation?

-- 
Pierre-Yves David