# HG changeset patch # User Pierre-Yves David # Date 1411754369 25200 # Node ID ffd0f6b1c29dc3891ab3ec39b25b755b6b2ae8c8 # Parent e88a634e0195ef2b260f40786505727c80dbdbd5 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`. diff -r e88a634e0195 -r ffd0f6b1c29d mercurial/commands.py --- 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