--- a/mercurial/patch.py Wed Apr 20 23:30:07 2011 +0200
+++ b/mercurial/patch.py Wed Apr 20 19:54:57 2011 +0200
@@ -11,7 +11,7 @@
from i18n import _
from node import hex, nullid, short
-import base85, mdiff, util, diffhelpers, copies, encoding
+import base85, mdiff, scmutil, util, diffhelpers, copies, encoding
gitre = re.compile('diff --git a/(.*) b/(.*)')
@@ -1111,7 +1111,7 @@
err = 0
current_file = None
cwd = os.getcwd()
- opener = util.opener(cwd)
+ opener = scmutil.opener(cwd)
for state, values in iterhunks(ui, fp):
if state == 'hunk':