--- a/tests/autodiff.py Mon Oct 05 22:49:24 2015 -0700
+++ b/tests/autodiff.py Thu Oct 08 12:55:45 2015 -0700
@@ -1,7 +1,7 @@
# Extension dedicated to test patch.diff() upgrade modes
#
#
-from mercurial import cmdutil, scmutil, patch, util
+from mercurial import cmdutil, scmutil, patch, error
cmdtable = {}
command = cmdutil.command(cmdtable)
@@ -30,9 +30,9 @@
diffopts.git = False
diffopts.upgrade = True
def losedatafn(fn=None, **kwargs):
- raise util.Abort('losing data for %s' % fn)
+ raise error.Abort('losing data for %s' % fn)
else:
- raise util.Abort('--git must be yes, no or auto')
+ raise error.Abort('--git must be yes, no or auto')
node1, node2 = scmutil.revpair(repo, [])
m = scmutil.match(repo[node2], pats, opts)