--- a/mercurial/exchange.py Fri Aug 15 16:31:06 2014 -0700
+++ b/mercurial/exchange.py Fri Aug 15 17:58:15 2014 -0700
@@ -617,8 +617,10 @@
repo = pushop.repo.unfiltered()
remote = pushop.remote
ui.debug("checking for updated bookmarks\n")
- revnums = map(repo.changelog.rev, pushop.revs or [])
- ancestors = repo.changelog.ancestors(revnums, inclusive=True)
+ ancestors = ()
+ if pushop.revs:
+ revnums = map(repo.changelog.rev, pushop.revs)
+ ancestors = repo.changelog.ancestors(revnums, inclusive=True)
(addsrc, adddst, advsrc, advdst, diverge, differ, invalid
) = bookmarks.compare(repo, repo._bookmarks, remote.listkeys('bookmarks'),
srchex=hex)