Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 13970:d13913355390

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move opener from util to scmutil
author Adrian Buehlmann <adrian@cadifra.com>
date Wed, 20 Apr 2011 19:54:57 +0200
parents 4cdaf1adafc8
children abaacdab38f6
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Wed Apr 20 23:30:07 2011 +0200
+++ b/mercurial/simplemerge.py	Wed Apr 20 19:54:57 2011 +0200
@@ -18,7 +18,7 @@
 # s: "i hate that."
 
 from i18n import _
-import util, mdiff
+import scmutil, util, mdiff
 import sys, os
 
 class CantReprocessAndShowBase(Exception):
@@ -429,7 +429,7 @@
 
     local = os.path.realpath(local)
     if not opts.get('print'):
-        opener = util.opener(os.path.dirname(local))
+        opener = scmutil.opener(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)
     else:
         out = sys.stdout