--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -5,7 +5,6 @@
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
-import util
from node import *
from repo import *
from demandload import *
@@ -26,4 +25,4 @@ def repository(ui, path=None, create=0):
if path.startswith("ssh://"):
return sshrepo.sshrepository(ui, path)
- return localrepo.localrepository(ui, util.opener, path, create)
+ return localrepo.localrepository(ui, path, create)
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -12,7 +12,7 @@ from demandload import *
demandload(globals(), "re lock transaction tempfile stat mdiff")
class localrepository:
- def __init__(self, ui, opener, path=None, create=0):
+ def __init__(self, ui, path=None, create=0):
if not path:
p = os.getcwd()
while not os.path.isdir(os.path.join(p, ".hg")):
@@ -32,8 +32,8 @@ class localrepository:
os.mkdir(self.path)
os.mkdir(self.join("data"))
- self.opener = opener(self.path)
- self.wopener = opener(self.root)
+ self.opener = util.opener(self.path)
+ self.wopener = util.opener(self.root)
self.manifest = manifest.manifest(self.opener)
self.changelog = changelog.changelog(self.opener)
self.tagscache = None
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -238,8 +238,6 @@ def opener(base):
this function is used to hide the details of COW semantics and
remote file access from higher level code.
-
- todo: separate remote file access into a separate function
"""
p = base
def o(path, mode="r"):