--- a/mercurial/exchange.py Fri Jun 16 10:25:11 2017 -0700
+++ b/mercurial/exchange.py Wed Jun 21 21:08:48 2017 -0700
@@ -1448,8 +1448,9 @@
"changegroupsubset."))
else:
cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull')
- pullop.cgresult = bundle2.applybundle1(pullop.repo, cg, tr, 'pull',
- pullop.remote.url())
+ bundleop = bundle2.applybundle1(pullop.repo, cg, tr, 'pull',
+ pullop.remote.url())
+ pullop.cgresult = bundle2.combinechangegroupresults(bundleop)
def _pullphase(pullop):
# Get remote phases data from remote
@@ -1737,7 +1738,8 @@
# legacy case: bundle1 (changegroup 01)
txnname = "\n".join([source, util.hidepassword(url)])
with repo.lock(), repo.transaction(txnname) as tr:
- r = bundle2.applybundle1(repo, cg, tr, source, url)
+ op = bundle2.applybundle1(repo, cg, tr, source, url)
+ r = bundle2.combinechangegroupresults(op)
else:
r = None
try: