Mercurial > public > mercurial-scm > hg
diff mercurial/discovery.py @ 26587:56b2bcea2529
error: get Abort from 'error' instead of 'util'
The home of 'Abort' is 'error' not 'util' however, a lot of code seems to be
confused about that and gives all the credit to 'util' instead of the
hardworking 'error'. In a spirit of equity, we break the cycle of injustice and
give back to 'error' the respect it deserves. And screw that 'util' poser.
For great justice.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 08 Oct 2015 12:55:45 -0700 |
| parents | b38d93735a4f |
| children | 8688590ca03c |
line wrap: on
line diff
--- a/mercurial/discovery.py Mon Oct 05 22:49:24 2015 -0700 +++ b/mercurial/discovery.py Thu Oct 08 12:55:45 2015 -0700 @@ -16,6 +16,7 @@ from . import ( bookmarks, branchmap, + error, obsolete, phases, setdiscovery, @@ -262,7 +263,7 @@ # 1. Check for new branches on the remote. if newbranches and not newbranch: # new branch requires --new-branch branchnames = ', '.join(sorted(newbranches)) - raise util.Abort(_("push creates new remote branches: %s!") + raise error.Abort(_("push creates new remote branches: %s!") % branchnames, hint=_("use 'hg push --new-branch' to create" " new remote branches")) @@ -390,4 +391,4 @@ for h in dhs: repo.ui.note((" %s\n") % short(h)) if errormsg: - raise util.Abort(errormsg, hint=hint) + raise error.Abort(errormsg, hint=hint)