Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 33037:d765ad56081f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle: make combinechangegroupresults() take a bundleoperation Both callers have a bundleoperation. Passing it in lets us share a bit more code.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 22 Jun 2017 14:04:13 -0700
parents 52c7060b707a
children b82615afde65
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Jun 22 13:58:20 2017 -0700
+++ b/mercurial/commands.py	Thu Jun 22 14:04:13 2017 -0700
@@ -5214,9 +5214,7 @@
                             hint=_("see https://mercurial-scm.org/"
                                    "wiki/BundleFeature for more "
                                    "information"))
-                changes = [r.get('return', 0)
-                           for r in op.records['changegroup']]
-                modheads = bundle2.combinechangegroupresults(changes)
+                modheads = bundle2.combinechangegroupresults(op)
             else:
                 txnname = 'unbundle\n%s' % util.hidepassword(url)
                 with repo.transaction(txnname) as tr: