Mercurial > hg
comparison mercurial/exchange.py @ 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 | 2372284d9457 |
comparison
equal
deleted
inserted
replaced
| 42924:e0bf41b83cef | 42925:9fd7710d9ae2 |
|---|---|
| 706 ancestors = () | 706 ancestors = () |
| 707 if pushop.revs: | 707 if pushop.revs: |
| 708 revnums = pycompat.maplist(repo.changelog.rev, pushop.revs) | 708 revnums = pycompat.maplist(repo.changelog.rev, pushop.revs) |
| 709 ancestors = repo.changelog.ancestors(revnums, inclusive=True) | 709 ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
| 710 | 710 |
| 711 remotebookmark = listkeys(remote, 'bookmarks') | 711 remotebookmark = bookmod.unhexlifybookmarks(listkeys(remote, 'bookmarks')) |
| 712 | 712 |
| 713 explicit = {repo._bookmarks.expandname(bookmark) | 713 explicit = {repo._bookmarks.expandname(bookmark) |
| 714 for bookmark in pushop.bookmarks} | 714 for bookmark in pushop.bookmarks} |
| 715 | 715 |
| 716 remotebookmark = bookmod.unhexlifybookmarks(remotebookmark) | |
| 717 comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) | 716 comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) |
| 718 return _processcompared(pushop, ancestors, explicit, remotebookmark, comp) | 717 return _processcompared(pushop, ancestors, explicit, remotebookmark, comp) |
| 719 | 718 |
| 720 def _processcompared(pushop, pushed, explicit, remotebms, comp): | 719 def _processcompared(pushop, pushed, explicit, remotebms, comp): |
| 721 """take decision on bookmarks to push to the remote repo | 720 """take decision on bookmarks to push to the remote repo |