[PATCH] discovery: if a push would create a new head, mention the bookmark name if any
Stephen Lee
sphen.lee at gmail.com
Tue May 20 06:52:58 CDT 2014
# HG changeset patch
# User Stephen Lee <sphen.lee at gmail.com>
# Date 1394265759 -39600
# Sat Mar 08 19:02:39 2014 +1100
# Node ID d3e97c6056914731d9cb4c3b2a863b8c5f734711
# Parent d19164a018a175cda640066a1f32651834e4f011
discovery: if a push would create a new head, mention the bookmark name if any
diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -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])
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -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
More information about the Mercurial-devel
mailing list