Mercurial > hg
comparison mercurial/exchange.py @ 38604:2834ac06d5a9
py3: fix revnums in bookmark discovery to be consumable more than once
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 08 Jul 2018 18:52:28 +0900 |
parents | 7c05198cd1ca |
children | 4d5fb4062f0b |
comparison
equal
deleted
inserted
replaced
38603:4df549d0f1fd | 38604:2834ac06d5a9 |
---|---|
656 repo = pushop.repo.unfiltered() | 656 repo = pushop.repo.unfiltered() |
657 remote = pushop.remote | 657 remote = pushop.remote |
658 ui.debug("checking for updated bookmarks\n") | 658 ui.debug("checking for updated bookmarks\n") |
659 ancestors = () | 659 ancestors = () |
660 if pushop.revs: | 660 if pushop.revs: |
661 revnums = map(repo.changelog.rev, pushop.revs) | 661 revnums = pycompat.maplist(repo.changelog.rev, pushop.revs) |
662 ancestors = repo.changelog.ancestors(revnums, inclusive=True) | 662 ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
663 | 663 |
664 remotebookmark = listkeys(remote, 'bookmarks') | 664 remotebookmark = listkeys(remote, 'bookmarks') |
665 | 665 |
666 explicit = set([repo._bookmarks.expandname(bookmark) | 666 explicit = set([repo._bookmarks.expandname(bookmark) |