Mercurial > hg-stable
changeset 21580:32601b0b74c0
discovery: if a push would create a new head, mention the bookmark name if any
| author | Stephen Lee <sphen.lee@gmail.com> |
|---|---|
| date | Sat, 08 Mar 2014 19:02:39 +1100 |
| parents | 87a972b5c039 |
| children | 652e07debf10 |
| files | mercurial/discovery.py tests/test-bookmarks-pushpull.t |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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