Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 13646:31eac42d9123

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7e6c2f58ad56
children d16c99f16f00
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Mar 13 14:35:17 2011 +0100
+++ b/mercurial/commands.py	Mon Mar 14 00:10:43 2011 +0100
@@ -2977,6 +2977,7 @@
             raise util.Abort(err)
 
     modheads = repo.pull(other, heads=revs, force=opts.get('force'))
+    bookmarks.updatefromremote(ui, repo, other)
     if checkout:
         checkout = str(repo.changelog.rev(other.lookup(checkout)))
     repo._subtoppath = source