diff mercurial/destutil.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.

--- a/mercurial/destutil.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/destutil.py	Thu Oct 08 12:55:45 2015 -0700
@@ -8,7 +8,6 @@
 from .i18n import _
 from . import (
     error,
-    util,
     obsolete,
 )
 
@@ -26,7 +25,7 @@
         if wc.branch() == 'default': # no default branch!
             node = repo.lookup('tip') # update to tip
         else:
-            raise util.Abort(_("branch %s not found") % wc.branch())
+            raise error.Abort(_("branch %s not found") % wc.branch())
 
     if p1.obsolete() and not p1.children():
         # allow updating to successors