Mercurial > hg
changeset 42925:9fd7710d9ae2
exchange: convert bookmark nodes from hex to bin ASAP
Differential Revision: https://phab.mercurial-scm.org/D6831
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sun, 08 Sep 2019 20:26:36 -0400 |
| parents | e0bf41b83cef |
| children | 34ed651ba7e4 |
| files | mercurial/exchange.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)