diff -r d51c658d3f04 -r 56b2bcea2529 mercurial/fileset.py
--- a/mercurial/fileset.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/fileset.py	Thu Oct 08 12:55:45 2015 -0700
@@ -363,7 +363,7 @@
         try:
             d.decode(enc)
         except LookupError:
-            raise util.Abort(_("unknown encoding '%s'") % enc)
+            raise error.Abort(_("unknown encoding '%s'") % enc)
         except UnicodeDecodeError:
             continue
         s.append(f)