Mercurial > hg

diff mercurial/exchange.py @ 28182:e4fe4e903e97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
author liscju <piotr.listkiewicz@gmail.com>
date Fri, 19 Feb 2016 22:28:09 +0100
parents 88609cfa3745
children d9d51da7a850
line wrap: on
line diff
--- a/mercurial/exchange.py	Sat Feb 20 15:56:44 2016 -0800
+++ b/mercurial/exchange.py	Fri Feb 19 22:28:09 2016 +0100
@@ -576,7 +576,8 @@
         ancestors = repo.changelog.ancestors(revnums, inclusive=True)
     remotebookmark = remote.listkeys('bookmarks')
 
-    explicit = set(pushop.bookmarks)
+    explicit = set([repo._bookmarks.expandname(bookmark)
+                    for bookmark in pushop.bookmarks])
 
     comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex)
     addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp