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

login
register
mail settings
Submitter phabricator
Date Sept. 11, 2019, 3:34 p.m.
Message ID <30237d302fd7b73692b12d56fe63298c@localhost.localdomain>
Download mbox | patch
Permalink /patch/41644/
State Not Applicable
Headers show

Comments

phabricator - Sept. 11, 2019, 3:34 p.m.
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




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

Patch

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)