Mercurial > public > mercurial-scm > hg-stable

diff mercurial/exchange.py @ 22658:a8f0d8e4c80a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: gather explicit bookmark pulls with bookmark updates There is no reason to make them at different times. So we gather them. This is the first step toward merging them.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 28 Sep 2014 13:43:31 -0700
parents c9276945eba3
children 0f8120c1ecf5
line wrap: on
line diff
--- a/mercurial/exchange.py	Sun Sep 28 12:47:25 2014 -0700
+++ b/mercurial/exchange.py	Sun Sep 28 13:43:31 2014 -0700
@@ -1014,18 +1014,8 @@
     repo = pullop.repo
     remotebookmarks = pullop.remotebookmarks
     bookmod.updatefromremote(repo.ui, repo, remotebookmarks,
-                             pullop.remote.url())
-    # update specified bookmarks
-    if pullop.explicitbookmarks:
-        marks = repo._bookmarks
-        writer = repo.ui.status
-        if repo.ui.configbool('ui', 'quietbookmarkmove', False):
-            writer = repo.ui.debug
-        for b in pullop.explicitbookmarks:
-            # explicit pull overrides local bookmark if any
-            writer(_("importing bookmark %s\n") % b)
-            marks[b] = repo[remotebookmarks[b]].node()
-        marks.write()
+                             pullop.remote.url(),
+                             explicit=pullop.explicitbookmarks)
 
 def _pullobsolete(pullop):
     """utility function to pull obsolete markers from a remote