Mercurial > hg

changeset 22694:21d5416b8a8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: directly use exchange.pull localrepo.pull is going away. See explanations in 4d52e6eb98ea.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 03 Oct 2014 11:11:12 -0500
parents 68439b154063
children 15a70ca40b22
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Oct 03 11:07:47 2014 -0500
+++ b/mercurial/commands.py	Fri Oct 03 11:11:12 2014 -0500
@@ -4960,8 +4960,9 @@
                         "so a rev cannot be specified.")
                 raise util.Abort(err)
 
-        modheads = repo.pull(other, heads=revs, force=opts.get('force'),
-                             bookmarks=opts.get('bookmark', ()))
+        modheads = exchange.pull(repo, other, heads=revs,
+                                 force=opts.get('force'),
+                                 bookmarks=opts.get('bookmark', ())).cgresult
         if checkout:
             checkout = str(repo.changelog.rev(other.lookup(checkout)))
         repo._subtoppath = source