Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: convert bookmark nodes from hex to bin ASAP
authorValentin Gatien-Baron <valentin.gatienbaron@gmail.com>
Sun, 08 Sep 2019 20:26:36 -0400
changeset 42925 9fd7710d9ae2
parent 42924 e0bf41b83cef
child 42926 34ed651ba7e4
exchange: convert bookmark nodes from hex to bin ASAP Differential Revision: https://phab.mercurial-scm.org/D6831
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- a/mercurial/exchange.py	Sun Sep 08 20:10:32 2019 -0400
+++ b/mercurial/exchange.py	Sun Sep 08 20:26:36 2019 -0400
@@ -708,12 +708,11 @@
         revnums = pycompat.maplist(repo.changelog.rev, pushop.revs)
         ancestors = repo.changelog.ancestors(revnums, inclusive=True)
 
-    remotebookmark = listkeys(remote, 'bookmarks')
+    remotebookmark = bookmod.unhexlifybookmarks(listkeys(remote, 'bookmarks'))
 
     explicit = {repo._bookmarks.expandname(bookmark)
                 for bookmark in pushop.bookmarks}
 
-    remotebookmark = bookmod.unhexlifybookmarks(remotebookmark)
     comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark)
     return _processcompared(pushop, ancestors, explicit, remotebookmark, comp)
Mercurial