diff -r d51c658d3f04 -r 56b2bcea2529 mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/bundlerepo.py	Thu Oct 08 12:55:45 2015 -0700
@@ -282,7 +282,7 @@
                             in changegroup.packermap)]
 
             if not cgparts:
-                raise util.Abort('No changegroups found')
+                raise error.Abort('No changegroups found')
             version = cgparts[0].params.get('version', '01')
             cgparts = [p for p in cgparts
                        if p.params.get('version', '01') == version]
@@ -374,7 +374,7 @@
 
 def instance(ui, path, create):
     if create:
-        raise util.Abort(_('cannot create new bundle repository'))
+        raise error.Abort(_('cannot create new bundle repository'))
     # internal config: bundle.mainreporoot
     parentpath = ui.config("bundle", "mainreporoot", "")
     if not parentpath: