Mercurial > evolve

changeset 5377:a267a7d3e1c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: copy an abort message (new branch) from upstream exactly This abort message already exists in core hg, so let's reuse the exact wording and quoting from there.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Jun 2020 23:28:10 +0800
parents 7681e3c2237a
children f18d2509e4f2
files hgext3rd/topic/discovery.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/discovery.py	Thu Jun 11 19:10:56 2020 +0800
+++ b/hgext3rd/topic/discovery.py	Thu Jun 11 23:28:10 2020 +0800
@@ -217,9 +217,11 @@
                     raise error.Abort(msg)
             for branch, newnb in finalheads.items():
                 if 1 < newnb:
-                    msg = _(b'push create more than 1 head on new branch "%s"'
+                    msg = _(b"push creates new branch '%s' with multiple heads"
                             % branch)
-                    raise error.Abort(msg)
+                    hint = _(b"merge or see 'hg help push' for details about "
+                             b"pushing new heads")
+                    raise error.Abort(msg, hint=hint)
 
     def validator(tr):
         _validate(tr)