Fix transaction handling bug by reverting fileopener change
authormpm@selenic.com
Mon, 23 May 2005 22:14:41 -0800
changeset 144 ea9188538222
parent 143 bf325dce498e
child 145 fbce9fc531d2
child 152 67b8d24d2dbe
Fix transaction handling bug by reverting fileopener change
mercurial/hg.py
--- a/mercurial/hg.py	Mon May 23 21:15:36 2005 -0800
+++ b/mercurial/hg.py	Mon May 23 22:14:41 2005 -0800
@@ -14,7 +14,9 @@
 
 class filelog(revlog):
     def __init__(self, opener, path):
-        revlog.__init__(self, opener, path + ".i", path + ".d")
+        revlog.__init__(self, opener,
+                        os.path.join("data", path + ".i"),
+                        os.path.join("data", path + ".d"))
 
     def read(self, node):
         return self.revision(node)
@@ -241,7 +243,6 @@
             os.mkdir(self.join("data"))
 
         self.opener = opener(self.path)
-        self.fileopener = opener(self.join("data"))
         self.manifest = manifest(self.opener)
         self.changelog = changelog(self.opener)
         self.ignorelist = None
@@ -290,7 +291,7 @@
         return os.path.join(self.path, f)
 
     def file(self, f):
-        return filelog(self.fileopener, f)
+        return filelog(self.opener, f)
 
     def transaction(self):
         return transaction(self.opener, self.join("journal"),