Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 22645:6e431e1635b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: move bookmark movements inside the `exchange.pull` There is no reason for bookmarks to get a special treatment. As a first step we move the code as is in the `exchange.pull` function. Integration with the rest of the flow will come later. Adding bookmarks to pull means that most clone paths are now pulling bookmarks through pull. We ensure that bookmark-update messages are properly suppressed in that case. In test-pull-http.t the 'requesting all changes' message disappear because we now get the authentication error on the `listkeys`command before such message is printed.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 26 Sep 2014 17:44:00 -0700
parents 45e50d8546d9
children bf0b5bfc24b9
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Oct 02 12:16:07 2014 -0500
+++ b/mercurial/localrepo.py	Fri Sep 26 17:44:00 2014 -0700
@@ -1724,7 +1724,14 @@
                 # if we support it, stream in and adjust our requirements
                 if not streamreqs - self.supportedformats:
                     return self.stream_in(remote, streamreqs)
-        return self.pull(remote, heads)
+
+        quiet = self.ui.backupconfig('ui', 'quietbookmarkmove')
+        try:
+            self.ui.setconfig('ui', 'quietbookmarkmove', True, 'clone')
+            ret = self.pull(remote, heads)
+        finally:
+            self.ui.restoreconfig(quiet)
+        return ret
 
     def pushkey(self, namespace, key, old, new):
         self.hook('prepushkey', throw=True, namespace=namespace, key=key,