Mercurial > public > mercurial-scm > hg-stable

diff mercurial/exchange.py @ 26935:c4a7bbc78c74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: pass pushop to discovery.checkheads Previously, we passed a bunch of parameters to discovery.checkheads, but all of the arguments can be fetched out of pushop, which may contain a lot more useful information for extensions now that pushop is extensible.
author Ryan McElroy <rmcelroy@fb.com>
date Tue, 10 Nov 2015 11:13:21 -0800
parents 9350f00a7b23
children 709977a4fc9d
line wrap: on
line diff
--- a/mercurial/exchange.py	Thu Nov 12 15:26:30 2015 -0600
+++ b/mercurial/exchange.py	Tue Nov 10 11:13:21 2015 -0800
@@ -571,13 +571,7 @@
                 elif ctx.troubled():
                     raise error.Abort(mst[ctx.troubles()[0]] % ctx)
 
-        # internal config: bookmarks.pushing
-        newbm = pushop.ui.configlist('bookmarks', 'pushing')
-        discovery.checkheads(unfi, pushop.remote, outgoing,
-                             pushop.remoteheads,
-                             pushop.newbranch,
-                             bool(pushop.incoming),
-                             newbm)
+        discovery.checkheads(pushop)
     return True
 
 # List of names of steps to perform for an outgoing bundle2, order matters.