Mercurial > hg

changeset 22693:68439b154063

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: have `pull` return the pulloperation object We mimic what was done for `push` for similar reason. We are about to drop `localrepo.pull` (for consistency with dropping `localrepo.push` and we better have an API as extensible as `push` is. Find explanations about localrepo.push removal in 4d52e6eb98ea.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 03 Oct 2014 11:07:47 -0500
parents 78c916f24dd9
children 21d5416b8a8a
files mercurial/exchange.py mercurial/localrepo.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Wed Oct 01 15:14:36 2014 -0500
+++ b/mercurial/exchange.py	Fri Oct 03 11:07:47 2014 -0500
@@ -866,7 +866,7 @@
         pullop.releasetransaction()
         lock.release()
 
-    return pullop.cgresult
+    return pullop
 
 def _pulldiscovery(pullop):
     """discovery phase for the pull
--- a/mercurial/localrepo.py	Wed Oct 01 15:14:36 2014 -0500
+++ b/mercurial/localrepo.py	Fri Oct 03 11:07:47 2014 -0500
@@ -1575,7 +1575,7 @@
         return r
 
     def pull(self, remote, heads=None, force=False, **kwargs):
-        return exchange.pull(self, remote, heads, force, **kwargs)
+        return exchange.pull(self, remote, heads, force, **kwargs).cgresult
 
     def checkpush(self, pushop):
         """Extensions can override this function if additional checks have