--- a/tests/autodiff.py	Fri May 13 12:57:27 2011 -0500
+++ b/tests/autodiff.py	Fri May 13 14:06:28 2011 -0500
@@ -1,7 +1,7 @@
 # Extension dedicated to test patch.diff() upgrade modes
 #
 #
-from mercurial import cmdutil, patch, util
+from mercurial import cmdutil, scmutil, patch, util
 
 def autodiff(ui, repo, *pats, **opts):
     diffopts = patch.diffopts(ui, opts)
@@ -28,7 +28,7 @@
     else:
         raise util.Abort('--git must be yes, no or auto')
 
-    node1, node2 = cmdutil.revpair(repo, [])
+    node1, node2 = scmutil.revpair(repo, [])
     m = cmdutil.match(repo, pats, opts)
     it = patch.diff(repo, node1, node2, match=m, opts=diffopts,
                     losedatafn=losedatafn)