--- a/mercurial/discovery.py Thu May 12 06:13:59 2016 -0700
+++ b/mercurial/discovery.py Tue May 24 23:36:27 2016 +0200
@@ -240,15 +240,16 @@
def _nowarnheads(pushop):
# Compute newly pushed bookmarks. We don't warn about bookmarked heads.
-
- # internal config: bookmarks.pushing
- newbookmarks = pushop.ui.configlist('bookmarks', 'pushing')
-
repo = pushop.repo.unfiltered()
remote = pushop.remote
localbookmarks = repo._bookmarks
remotebookmarks = remote.listkeys('bookmarks')
bookmarkedheads = set()
+
+ # internal config: bookmarks.pushing
+ newbookmarks = [localbookmarks.expandname(b)
+ for b in pushop.ui.configlist('bookmarks', 'pushing')]
+
for bm in localbookmarks:
rnode = remotebookmarks.get(bm)
if rnode and rnode in repo: