# HG changeset patch
# User Boris Feld <boris.f...@octobus.net>
# Date 1508442614 -7200
# Thu Oct 19 21:50:14 2017 +0200
# Node ID 204165f5fc88a88ad45d5d8de1fd4631efb72166
# Parent cc977ec0b8b9302bd6ad8e3eeacabb2776161492
# EXP-Topic b2.phases.follow-up
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
204165f5fc88
exchange: propagate the subfunctions return
The parts generator can return a callback to handle server reply. We should
propagate the return for correctness.
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -813,9 +813,9 @@
hasphaseheads = 'heads' in b2caps.get('phases', ())
if hasphaseheads and not legacyphase:
- _pushb2phaseheads(pushop, bundler)
+ return _pushb2phaseheads(pushop, bundler)
elif haspushkey:
- _pushb2phasespushkey(pushop, bundler)
+ return _pushb2phasespushkey(pushop, bundler)
def _pushb2phaseheads(pushop, bundler):
"""push phase information through a bundle2 - binary part"""
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
