# HG changeset patch
# User Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
# Date 1567988796 14400
# Node ID 9fd7710d9ae2866f163ebffa81a18bd59a64eacc
# Parent  e0bf41b83cefc5c19743b9e009cf4187f24a19c4
exchange: convert bookmark nodes from hex to bin ASAP

Differential Revision: https://phab.mercurial-scm.org/D6831

diff -r e0bf41b83cef -r 9fd7710d9ae2 mercurial/exchange.py
--- 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)