Mercurial > hg-stable
changeset 22548:8a1ae133770a
bundle2: rename functions that have the same name
author | Mike Hommey <mh@glandium.org> |
---|---|
date | Tue, 23 Sep 2014 16:22:52 +0900 |
parents | 3d616d27a422 |
children | b1fc7ea5bb01 |
files | mercurial/bundle2.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundle2.py Sat Sep 20 17:06:57 2014 +0200 +++ b/mercurial/bundle2.py Tue Sep 23 16:22:52 2014 +0900 @@ -832,13 +832,13 @@ 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.