[PATCH 1 of 2] bundle2: rename duplicate handlepushkeyreply to handleobsmarkerreply

Martin von Zweigbergk martinvonz at google.com
Wed Jun 10 16:50:26 CDT 2015


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1433972844 25200
#      Wed Jun 10 14:47:24 2015 -0700
# Node ID 35f10d65ed455063d043e83355d6536d480cfcb9
# Parent  ad14fb602e5e54e5432fbc776dd5d1bad63f1f68
bundle2: rename duplicate handlepushkeyreply to handleobsmarkerreply

The function was only called through the parthandlermapping dict, so
it was confusing but safe in practice.

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -1362,7 +1362,7 @@
 
 
 @parthandler('reply:obsmarkers', ('new', 'in-reply-to'))
-def handlepushkeyreply(op, inpart):
+def handleobsmarkerreply(op, inpart):
     """retrieve the result of a pushkey request"""
     ret = int(inpart.params['new'])
     partid = int(inpart.params['in-reply-to'])


More information about the Mercurial-devel mailing list