[PATCH] bundle2: rename functions that have the same name
Augie Fackler
raf at durin42.com
Tue Sep 23 13:15:49 CDT 2014
On Tue, Sep 23, 2014 at 04:23:53PM +0900, Mike Hommey wrote:
> # HG changeset patch
> # User Mike Hommey <mh at glandium.org>
> # Date 1411456972 -32400
> # Tue Sep 23 16:22:52 2014 +0900
> # Node ID 80ffdeecf26b373db4fd4a4bf26d548d456fa7b6
> # Parent e6e7ef68c879b55c1b2c0ebe00d8cbdbc929dbed
> bundle2: rename functions that have the same name
good catch! queued thanks
>
> diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
> --- a/mercurial/bundle2.py
> +++ b/mercurial/bundle2.py
> @@ -827,23 +827,23 @@ def handlechangegroup(op, inpart):
> # This is definitly not the final form of this
> # return. But one need to start somewhere.
> part = op.reply.newpart('b2x:reply:changegroup')
> part.addparam('in-reply-to', str(inpart.id), mandatory=False)
> part.addparam('return', '%i' % ret, mandatory=False)
> assert not inpart.read()
>
> @parthandler('b2x:reply:changegroup', ('return', 'in-reply-to'))
> -def handlechangegroup(op, inpart):
> +def handlereplychangegroup(op, inpart):
> ret = int(inpart.params['return'])
> replyto = int(inpart.params['in-reply-to'])
> op.records.add('changegroup', {'return': ret}, replyto)
>
> @parthandler('b2x:check:heads')
> -def handlechangegroup(op, inpart):
> +def handlecheckheads(op, inpart):
> """check that head of the repo did not change
>
> This is used to detect a push race when using unbundle.
> This replaces the "heads" argument of unbundle."""
> h = inpart.read(20)
> heads = []
> while len(h) == 20:
> heads.append(h)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list