Mercurial > public > mercurial-scm > hg
diff mercurial/setdiscovery.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 | fb5664eb8414 |
| children | c3eacee01c7e |
line wrap: on
line diff
--- a/mercurial/setdiscovery.py Mon Oct 05 22:49:24 2015 -0700 +++ b/mercurial/setdiscovery.py Thu Oct 08 12:55:45 2015 -0700 @@ -52,7 +52,7 @@ ) from . import ( dagutil, - util, + error, ) def _updatesample(dag, nodes, sample, quicksamplesize=0): @@ -241,7 +241,7 @@ if not result and srvheadhashes != [nullid]: if abortwhenunrelated: - raise util.Abort(_("repository is unrelated")) + raise error.Abort(_("repository is unrelated")) else: ui.warn(_("warning: repository is unrelated\n")) return (set([nullid]), True, srvheadhashes,)