pull: store binary node in pullop.remotebookmarks
The internal representation of bookmark value is binary. The fact we stored
'hex' was an implementation detail from using pushkey.
We move the values in 'pullop.remotebookmarks' to binary before adding a way to
exchange bookmarks not based on pushkey.
--- a/mercurial/commands.py Thu Oct 19 11:46:41 2017 +0200
+++ b/mercurial/commands.py Tue Oct 17 11:01:45 2017 +0200
@@ -3973,12 +3973,13 @@
# not ending up with the name of the bookmark because of a race
# condition on the server. (See issue 4689 for details)
remotebookmarks = other.listkeys('bookmarks')
+ remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
pullopargs['remotebookmarks'] = remotebookmarks
for b in opts['bookmark']:
b = repo._bookmarks.expandname(b)
if b not in remotebookmarks:
raise error.Abort(_('remote bookmark %s not found!') % b)
- revs.append(remotebookmarks[b])
+ revs.append(hex(remotebookmarks[b]))
if revs:
try:
--- a/mercurial/exchange.py Thu Oct 19 11:46:41 2017 +0200
+++ b/mercurial/exchange.py Tue Oct 17 11:01:45 2017 +0200
@@ -1348,7 +1348,8 @@
# all known bundle2 servers now support listkeys, but lets be nice with
# new implementation.
return
- pullop.remotebookmarks = pullop.remote.listkeys('bookmarks')
+ books = pullop.remote.listkeys('bookmarks')
+ pullop.remotebookmarks = bookmod.unhexlifybookmarks(books)
@pulldiscovery('changegroup')
@@ -1459,7 +1460,7 @@
# processing bookmark update
for namespace, value in op.records['listkeys']:
if namespace == 'bookmarks':
- pullop.remotebookmarks = value
+ pullop.remotebookmarks = bookmod.unhexlifybookmarks(value)
# bookmark data were either already there or pulled in the bundle
if pullop.remotebookmarks is not None:
@@ -1552,7 +1553,6 @@
pullop.stepsdone.add('bookmarks')
repo = pullop.repo
remotebookmarks = pullop.remotebookmarks
- remotebookmarks = bookmod.unhexlifybookmarks(remotebookmarks)
bookmod.updatefromremote(repo.ui, repo, remotebookmarks,
pullop.remote.url(),
pullop.gettransaction,