diff -r d51c658d3f04 -r 56b2bcea2529 mercurial/store.py
--- a/mercurial/store.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/store.py	Thu Oct 08 12:55:45 2015 -0700
@@ -6,7 +6,7 @@
 # GNU General Public License version 2 or any later version.
 
 from i18n import _
-import scmutil, util, parsers
+import scmutil, util, parsers, error
 import os, stat, errno
 
 _sha = util.sha1
@@ -405,7 +405,7 @@
             for n, line in enumerate(fp):
                 if not line.rstrip('\n'):
                     t = _('invalid entry in fncache, line %s') % (n + 1)
-                    raise util.Abort(t)
+                    raise error.Abort(t)
         fp.close()
 
     def write(self, tr):