diff mercurial/localrepo.py @ 26448:e05fd574c922

exchange: teach pull about requested stream clones An upcoming patch will move the invocation of stream cloning logic to the normal pull code path (from localrepository.clone). In preparation for this, we teach pull() and pulloperation about whether a streaming clone is requested. The return logic in localrepository.clone() has been reformatted slightly because of line length issues.
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 02 Oct 2015 22:16:34 -0700
parents f134fb33c906
children 89b7a7883aee
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Oct 02 21:53:25 2015 -0700
+++ b/mercurial/localrepo.py	Fri Oct 02 22:16:34 2015 -0700
@@ -1800,10 +1800,11 @@
         quiet = self.ui.backupconfig('ui', 'quietbookmarkmove')
         try:
             self.ui.setconfig('ui', 'quietbookmarkmove', True, 'clone')
-            ret = exchange.pull(self, remote, heads).cgresult
+            pullop = exchange.pull(self, remote, heads,
+                                   streamclonerequested=stream)
+            return pullop.cgresult
         finally:
             self.ui.restoreconfig(quiet)
-        return ret
 
     def pushkey(self, namespace, key, old, new):
         try: