diff mercurial/repair.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 eb21b6679dc6
children bcace0fbb4c8
line wrap: on
line diff
--- a/mercurial/repair.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/repair.py	Thu Oct 08 12:55:45 2015 -0700
@@ -15,6 +15,7 @@
 from . import (
     bundle2,
     changegroup,
+    error,
     exchange,
     util,
 )
@@ -156,7 +157,7 @@
     if curtr is not None:
         del curtr  # avoid carrying reference to transaction for nothing
         msg = _('programming error: cannot strip from inside a transaction')
-        raise util.Abort(msg, hint=_('contact your extension maintainer'))
+        raise error.Abort(msg, hint=_('contact your extension maintainer'))
 
     tr = repo.transaction("strip")
     offset = len(tr.entries)