D6831: exchange: convert bookmark nodes from hex to bin ASAP
valentin.gatienbaron (Valentin Gatien-Baron)
phabricator at mercurial-scm.org
Mon Sep 9 00:43:03 UTC 2019
valentin.gatienbaron created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6831
AFFECTED FILES
mercurial/exchange.py
CHANGE DETAILS
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -709,12 +709,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)
To: valentin.gatienbaron, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list