Mercurial > public > mercurial-scm > hg-stable
diff mercurial/phases.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 | f14cea32e1d4 |
| children | e36118815a39 |
line wrap: on
line diff
--- a/mercurial/phases.py Mon Oct 05 22:49:24 2015 -0700 +++ b/mercurial/phases.py Thu Oct 08 12:55:45 2015 -0700 @@ -115,7 +115,6 @@ ) from . import ( error, - util, ) allphases = public, draft, secret = range(3) @@ -306,7 +305,7 @@ if self.phase(repo, repo[n].rev()) < targetphase] if newroots: if nullid in newroots: - raise util.Abort(_('cannot change null revision phase')) + raise error.Abort(_('cannot change null revision phase')) currentroots = currentroots.copy() currentroots.update(newroots) ctxs = repo.set('roots(%ln::)', currentroots)