Mercurial > public > mercurial-scm > hg-stable
diff mercurial/treediscovery.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 | c6d049a5de43 |
| children | 0ed11f9368fd |
line wrap: on
line diff
--- a/mercurial/treediscovery.py Mon Oct 05 22:49:24 2015 -0700 +++ b/mercurial/treediscovery.py Thu Oct 08 12:55:45 2015 -0700 @@ -16,7 +16,6 @@ ) from . import ( error, - util, ) def findcommonincoming(repo, remote, heads=None, force=False): @@ -149,7 +148,7 @@ if force: repo.ui.warn(_("warning: repository is unrelated\n")) else: - raise util.Abort(_("repository is unrelated")) + raise error.Abort(_("repository is unrelated")) repo.ui.debug("found new changesets starting at " + " ".join([short(f) for f in fetch]) + "\n")