Mercurial > hg-git

diff hggit/git_handler.py @ 629:3ff09f0fac7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git_handler.py: less cryptic error message when push fails
author anatoly techtonik <techtonik@gmail.com>
date Sun, 15 Dec 2013 15:19:22 -0500
parents 09028a1e9895
children a836fc8f6c76
line wrap: on
line diff
--- a/hggit/git_handler.py	Sat Dec 14 12:05:15 2013 -0500
+++ b/hggit/git_handler.py	Sun Dec 15 15:19:22 2013 -0500
@@ -977,8 +977,9 @@
                     # we already have the annotated tag.
                     pass
                 else:
-                    raise hgutil.Abort("%s changed on the server, please pull "
-                                       "and merge before pushing" % ref)
+                    raise hgutil.Abort(
+                        "branch '%s' changed on the server, "
+                        "please pull and merge before pushing" % ref)
 
         return new_refs