Mercurial > hg

changeset 22641:ffd0f6b1c29d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: use `other.url()` as the source of a bookmark pull We want to move the bookmarks movement into `exchange.pull`, for this purpose we need to stop relying on variables from `command.pull`.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 26 Sep 2014 10:59:29 -0700
parents e88a634e0195
children 45e50d8546d9
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Sep 30 17:13:54 2014 -0700
+++ b/mercurial/commands.py	Fri Sep 26 10:59:29 2014 -0700
@@ -4961,7 +4961,7 @@
                 raise util.Abort(err)
 
         modheads = repo.pull(other, heads=revs, force=opts.get('force'))
-        bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
+        bookmarks.updatefromremote(ui, repo, remotebookmarks, other.url())
         # update specified bookmarks
         if opts.get('bookmark'):
             marks = repo._bookmarks