Mercurial > hg-stable

changeset 22657:f4e39ceb064a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: stop pulling bookmark manually Bookmark pulling is now done with all the other pull steps in the `exchange.pull` function.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 28 Sep 2014 12:47:25 -0700
parents c9276945eba3
children a8f0d8e4c80a
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Sat Sep 27 01:59:56 2014 -0700
+++ b/mercurial/subrepo.py	Sun Sep 28 12:47:25 2014 -0700
@@ -9,7 +9,7 @@
 import xml.dom.minidom
 import stat, subprocess, tarfile
 from i18n import _
-import config, util, node, error, cmdutil, bookmarks, match as matchmod
+import config, util, node, error, cmdutil, match as matchmod
 import phases
 import pathutil
 import exchange
@@ -743,10 +743,7 @@
             self._repo.ui.status(_('pulling subrepo %s from %s\n')
                                  % (subrelpath(self), srcurl))
             cleansub = self.storeclean(srcurl)
-            remotebookmarks = other.listkeys('bookmarks')
             self._repo.pull(other)
-            bookmarks.updatefromremote(self._repo.ui, self._repo,
-                                       remotebookmarks, srcurl)
             if cleansub:
                 # keep the repo clean after pull
                 self._cachestorehash(srcurl)