Show More
@@ -3973,12 +3973,13 b' def pull(ui, repo, source="default", **o' | |||
|
3973 | 3973 | # not ending up with the name of the bookmark because of a race |
|
3974 | 3974 | # condition on the server. (See issue 4689 for details) |
|
3975 | 3975 | remotebookmarks = other.listkeys('bookmarks') |
|
3976 | remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) | |
|
3976 | 3977 | pullopargs['remotebookmarks'] = remotebookmarks |
|
3977 | 3978 | for b in opts['bookmark']: |
|
3978 | 3979 | b = repo._bookmarks.expandname(b) |
|
3979 | 3980 | if b not in remotebookmarks: |
|
3980 | 3981 | raise error.Abort(_('remote bookmark %s not found!') % b) |
|
3981 | revs.append(remotebookmarks[b]) | |
|
3982 | revs.append(hex(remotebookmarks[b])) | |
|
3982 | 3983 | |
|
3983 | 3984 | if revs: |
|
3984 | 3985 | try: |
@@ -1348,7 +1348,8 b' def _pullbookmarkbundle1(pullop):' | |||
|
1348 | 1348 | # all known bundle2 servers now support listkeys, but lets be nice with |
|
1349 | 1349 | # new implementation. |
|
1350 | 1350 | return |
|
1351 |
|
|
|
1351 | books = pullop.remote.listkeys('bookmarks') | |
|
1352 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(books) | |
|
1352 | 1353 | |
|
1353 | 1354 | |
|
1354 | 1355 | @pulldiscovery('changegroup') |
@@ -1459,7 +1460,7 b' def _pullbundle2(pullop):' | |||
|
1459 | 1460 | # processing bookmark update |
|
1460 | 1461 | for namespace, value in op.records['listkeys']: |
|
1461 | 1462 | if namespace == 'bookmarks': |
|
1462 | pullop.remotebookmarks = value | |
|
1463 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(value) | |
|
1463 | 1464 | |
|
1464 | 1465 | # bookmark data were either already there or pulled in the bundle |
|
1465 | 1466 | if pullop.remotebookmarks is not None: |
@@ -1552,7 +1553,6 b' def _pullbookmarks(pullop):' | |||
|
1552 | 1553 | pullop.stepsdone.add('bookmarks') |
|
1553 | 1554 | repo = pullop.repo |
|
1554 | 1555 | remotebookmarks = pullop.remotebookmarks |
|
1555 | remotebookmarks = bookmod.unhexlifybookmarks(remotebookmarks) | |
|
1556 | 1556 | bookmod.updatefromremote(repo.ui, repo, remotebookmarks, |
|
1557 | 1557 | pullop.remote.url(), |
|
1558 | 1558 | pullop.gettransaction, |
General Comments 0
You need to be logged in to leave comments.
Login now