574 if pushop.revs: |
574 if pushop.revs: |
575 revnums = map(repo.changelog.rev, pushop.revs) |
575 revnums = map(repo.changelog.rev, pushop.revs) |
576 ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
576 ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
577 remotebookmark = remote.listkeys('bookmarks') |
577 remotebookmark = remote.listkeys('bookmarks') |
578 |
578 |
579 explicit = set(pushop.bookmarks) |
579 explicit = set([repo._bookmarks.expandname(bookmark) |
|
580 for bookmark in pushop.bookmarks]) |
580 |
581 |
581 comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) |
582 comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) |
582 addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp |
583 addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp |
583 for b, scid, dcid in advsrc: |
584 for b, scid, dcid in advsrc: |
584 if b in explicit: |
585 if b in explicit: |