Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
discovery: if a push would create a new head, mention the bookmark name if any
authorStephen Lee <sphen.lee@gmail.com>
Sat, 08 Mar 2014 19:02:39 +1100
changeset 21580 32601b0b74c0
parent 21579 87a972b5c039
child 21585 652e07debf10
discovery: if a push would create a new head, mention the bookmark name if any
mercurial/discovery.py file | annotate | diff | comparison | revisions
tests/test-bookmarks-pushpull.t file | annotate | diff | comparison | revisions 
--- a/mercurial/discovery.py	Wed May 14 10:38:05 2014 -0700
+++ b/mercurial/discovery.py	Sat Mar 08 19:02:39 2014 +1100
@@ -341,6 +341,10 @@
                 if branch not in ('default', None):
                     error = _("push creates new remote head %s "
                               "on branch '%s'!") % (short(dhs[0]), branch)
+                elif repo[dhs[0]].bookmarks():
+                    error = _("push creates new remote head %s "
+                              "with bookmark '%s'!") % (
+                              short(dhs[0]), repo[dhs[0]].bookmarks()[0])
                 else:
                     error = _("push creates new remote head %s!"
                               ) % short(dhs[0])
--- a/tests/test-bookmarks-pushpull.t	Wed May 14 10:38:05 2014 -0700
+++ b/tests/test-bookmarks-pushpull.t	Sat Mar 08 19:02:39 2014 +1100
@@ -274,7 +274,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head c922c0139ca0!
+  abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
   (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg -R ../a book
@@ -290,7 +290,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head c922c0139ca0!
+  abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
   (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg -R ../a book
mercurial