comparison mercurial/bundle2.py @ 25506:86472038dfd2

bundle2: rename duplicate handlepushkeyreply to handleobsmarkerreply The function was only called through the parthandlermapping dict, so it was confusing but safe in practice.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 10 Jun 2015 14:47:24 -0700
parents d8e7b0781ad7
children 5bee483705e8
comparison
equal deleted inserted replaced
25505:19717d3c8f94 25506:86472038dfd2
1376 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False) 1376 rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)
1377 rpart.addparam('new', '%i' % new, mandatory=False) 1377 rpart.addparam('new', '%i' % new, mandatory=False)
1378 1378
1379 1379
1380 @parthandler('reply:obsmarkers', ('new', 'in-reply-to')) 1380 @parthandler('reply:obsmarkers', ('new', 'in-reply-to'))
1381 def handlepushkeyreply(op, inpart): 1381 def handleobsmarkerreply(op, inpart):
1382 """retrieve the result of a pushkey request""" 1382 """retrieve the result of a pushkey request"""
1383 ret = int(inpart.params['new']) 1383 ret = int(inpart.params['new'])
1384 partid = int(inpart.params['in-reply-to']) 1384 partid = int(inpart.params['in-reply-to'])
1385 op.records.add('obsmarkers', {'new': ret}, partid) 1385 op.records.add('obsmarkers', {'new': ret}, partid)
1386 1386