--- a/mercurial/localrepo.py Wed Apr 20 23:30:07 2011 +0200
+++ b/mercurial/localrepo.py Wed Apr 20 19:54:57 2011 +0200
@@ -10,7 +10,7 @@
import repo, changegroup, subrepo, discovery, pushkey
import changelog, dirstate, filelog, manifest, context, bookmarks
import lock, transaction, store, encoding
-import util, extensions, hook, error
+import scmutil, util, extensions, hook, error
import match as matchmod
import merge as mergemod
import tags as tagsmod
@@ -32,8 +32,8 @@
self.path = os.path.join(self.root, ".hg")
self.origroot = path
self.auditor = util.path_auditor(self.root, self._checknested)
- self.opener = util.opener(self.path)
- self.wopener = util.opener(self.root)
+ self.opener = scmutil.opener(self.path)
+ self.wopener = scmutil.opener(self.root)
self.baseui = baseui
self.ui = baseui.copy()
@@ -90,7 +90,7 @@
if inst.errno != errno.ENOENT:
raise
- self.store = store.store(requirements, self.sharedpath, util.opener)
+ self.store = store.store(requirements, self.sharedpath, scmutil.opener)
self.spath = self.store.path
self.sopener = self.store.opener
self.sjoin = self.store.join