Show More
@@ -708,12 +708,11 b' def _pushdiscoverybookmarks(pushop):' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now