D6831: exchange: convert bookmark nodes from hex to bin ASAP

valentin.gatienbaron (Valentin Gatien-Baron) phabricator at mercurial-scm.org
Wed Sep 11 11:34:53 EDT 2019


Closed by commit rHG9fd7710d9ae2: exchange: convert bookmark nodes from hex to bin ASAP (authored by valentin.gatienbaron).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6831?vs=16452&id=16517

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6831/new/

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
@@ -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)
 



To: valentin.gatienbaron, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list