comparison mercurial/hg.py @ 144:ea9188538222

Fix transaction handling bug by reverting fileopener change
author mpm@selenic.com
date Mon, 23 May 2005 22:14:41 -0800
parents 30ef77113872
children 4a828422247d
comparison
equal deleted inserted replaced
143:bf325dce498e 144:ea9188538222
12 from mercurial.revlog import * 12 from mercurial.revlog import *
13 from difflib import SequenceMatcher 13 from difflib import SequenceMatcher
14 14
15 class filelog(revlog): 15 class filelog(revlog):
16 def __init__(self, opener, path): 16 def __init__(self, opener, path):
17 revlog.__init__(self, opener, path + ".i", path + ".d") 17 revlog.__init__(self, opener,
18 os.path.join("data", path + ".i"),
19 os.path.join("data", path + ".d"))
18 20
19 def read(self, node): 21 def read(self, node):
20 return self.revision(node) 22 return self.revision(node)
21 def add(self, text, transaction, link, p1=None, p2=None): 23 def add(self, text, transaction, link, p1=None, p2=None):
22 return self.addrevision(text, transaction, link, p1, p2) 24 return self.addrevision(text, transaction, link, p1, p2)
239 if create: 241 if create:
240 os.mkdir(self.path) 242 os.mkdir(self.path)
241 os.mkdir(self.join("data")) 243 os.mkdir(self.join("data"))
242 244
243 self.opener = opener(self.path) 245 self.opener = opener(self.path)
244 self.fileopener = opener(self.join("data"))
245 self.manifest = manifest(self.opener) 246 self.manifest = manifest(self.opener)
246 self.changelog = changelog(self.opener) 247 self.changelog = changelog(self.opener)
247 self.ignorelist = None 248 self.ignorelist = None
248 self.tags = None 249 self.tags = None
249 250
288 289
289 def join(self, f): 290 def join(self, f):
290 return os.path.join(self.path, f) 291 return os.path.join(self.path, f)
291 292
292 def file(self, f): 293 def file(self, f):
293 return filelog(self.fileopener, f) 294 return filelog(self.opener, f)
294 295
295 def transaction(self): 296 def transaction(self):
296 return transaction(self.opener, self.join("journal"), 297 return transaction(self.opener, self.join("journal"),
297 self.join("undo")) 298 self.join("undo"))
298 299