mercurial/setdiscovery.py

--- 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,)