Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 33036:52c7060b707a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle: move combineresults() from changegroup to bundle2 The results only need to be combined if they come from a bundle2. More importantly, we'll change its argument to a bundleoperation soon, and then it definitely will no longer belong in changegroup.py.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 22 Jun 2017 13:58:20 -0700
parents e8c8d81eb864
children d765ad56081f
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Jun 21 14:42:04 2017 -0700
+++ b/mercurial/commands.py	Thu Jun 22 13:58:20 2017 -0700
@@ -5216,7 +5216,7 @@
                                    "information"))
                 changes = [r.get('return', 0)
                            for r in op.records['changegroup']]
-                modheads = changegroup.combineresults(changes)
+                modheads = bundle2.combinechangegroupresults(changes)
             else:
                 txnname = 'unbundle\n%s' % util.hidepassword(url)
                 with repo.transaction(txnname) as tr: