Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/hbisect.py
changeset 26587 56b2bcea2529
parent 25952 f0ad094db832
child 27525 cba62f996780 
--- a/mercurial/hbisect.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/hbisect.py	Thu Oct 08 12:55:45 2015 -0700
@@ -20,7 +20,6 @@
 )
 from . import (
     error,
-    util,
 )
 
 def bisect(changelog, state):
@@ -74,8 +73,8 @@
     if not ancestors: # now we're confused
         if (len(state['bad']) == 1 and len(state['good']) == 1 and
             state['bad'] != state['good']):
-            raise util.Abort(_("starting revisions are not directly related"))
-        raise util.Abort(_("inconsistent state, %s:%s is good and bad")
+            raise error.Abort(_("starting revisions are not directly related"))
+        raise error.Abort(_("inconsistent state, %s:%s is good and bad")
                          % (badrev, short(bad)))
 
     # build children dict
@@ -149,7 +148,7 @@
             kind, node = l[:-1].split()
             node = repo.lookup(node)
             if kind not in state:
-                raise util.Abort(_("unknown bisect kind %s") % kind)
+                raise error.Abort(_("unknown bisect kind %s") % kind)
             state[kind].append(node)
     return state
mercurial