# HG changeset patch # User Martin von Zweigbergk # Date 2015-06-10 21:47:24 # Node ID 86472038dfd2ea8450437cabfdeb31ec75dc5947 # Parent 19717d3c8f941fdd92725ef1723f39edd981e543 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 @@ -1378,7 +1378,7 @@ def handleobsmarker(op, inpart): @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'])