Mercurial > public > mercurial-scm > hg-stable
diff mercurial/unionrepo.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 | 6b16a3538c20 |
| children | 12f727a5b434 bf86e3e87123 |
line wrap: on
line diff
--- a/mercurial/unionrepo.py Mon Oct 05 22:49:24 2015 -0700 +++ b/mercurial/unionrepo.py Thu Oct 08 12:55:45 2015 -0700 @@ -21,6 +21,7 @@ from . import ( changelog, cmdutil, + error, filelog, localrepo, manifest, @@ -231,7 +232,7 @@ def instance(ui, path, create): if create: - raise util.Abort(_('cannot create new union repository')) + raise error.Abort(_('cannot create new union repository')) parentpath = ui.config("bundle", "mainreporoot", "") if not parentpath: # try to find the correct path to the working directory repo