Mercurial > public > mercurial-scm > hg
diff mercurial/subrepo.py @ 13646:31eac42d9123
bookmarks: separate bookmarks update code from localrepo's pull.
We explicitly want to update bookmarks from a remote. This will avoid
duplicate calls to listkeys if we clone (which calls pull) and keep
bookmark related code together.
| author | David Soria Parra <dsp@php.net> |
|---|---|
| date | Mon, 14 Mar 2011 00:10:43 +0100 |
| parents | 3ab3b892d223 |
| children | 4f5ed2bd1724 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Sun Mar 13 14:35:17 2011 +0100 +++ b/mercurial/subrepo.py Mon Mar 14 00:10:43 2011 +0100 @@ -8,7 +8,7 @@ import errno, os, re, xml.dom.minidom, shutil, urlparse, posixpath import stat, subprocess, tarfile from i18n import _ -import config, util, node, error, cmdutil +import config, util, node, error, cmdutil, bookmarks hg = None nullstate = ('', '', 'empty') @@ -441,6 +441,7 @@ % (subrelpath(self), srcurl)) other = hg.repository(self._repo.ui, srcurl) self._repo.pull(other) + bookmarks.updatefromremote(self._repo.ui, self._repo, other) def get(self, state, overwrite=False): self._get(state)