comparison mercurial/bundle2.py @ 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 e2806b8613ca
children 9ea2913e7c41
comparison
equal deleted inserted replaced
22547:3d616d27a422 22548:8a1ae133770a
830 part.addparam('in-reply-to', str(inpart.id), mandatory=False) 830 part.addparam('in-reply-to', str(inpart.id), mandatory=False)
831 part.addparam('return', '%i' % ret, mandatory=False) 831 part.addparam('return', '%i' % ret, mandatory=False)
832 assert not inpart.read() 832 assert not inpart.read()
833 833
834 @parthandler('b2x:reply:changegroup', ('return', 'in-reply-to')) 834 @parthandler('b2x:reply:changegroup', ('return', 'in-reply-to'))
835 def handlechangegroup(op, inpart): 835 def handlereplychangegroup(op, inpart):
836 ret = int(inpart.params['return']) 836 ret = int(inpart.params['return'])
837 replyto = int(inpart.params['in-reply-to']) 837 replyto = int(inpart.params['in-reply-to'])
838 op.records.add('changegroup', {'return': ret}, replyto) 838 op.records.add('changegroup', {'return': ret}, replyto)
839 839
840 @parthandler('b2x:check:heads') 840 @parthandler('b2x:check:heads')
841 def handlechangegroup(op, inpart): 841 def handlecheckheads(op, inpart):
842 """check that head of the repo did not change 842 """check that head of the repo did not change
843 843
844 This is used to detect a push race when using unbundle. 844 This is used to detect a push race when using unbundle.
845 This replaces the "heads" argument of unbundle.""" 845 This replaces the "heads" argument of unbundle."""
846 h = inpart.read(20) 846 h = inpart.read(20)