mercurial: comparison mercurial/localrepo.py

equal deleted inserted replaced

-:abfab59fce79
+:2ba8bf7defda
 else:
 self.ui.warn(_("no interrupted transaction available\n"))
 return False
 def undo(self):
+wlock = self.wlock()
 lock = self.lock()
 if os.path.exists(self.join("undo")):
 self.ui.status(_("rolling back last transaction\n"))
 transaction.rollback(self.opener, self.join("undo"))
-self.dirstate = None
 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
-self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
+self.dirstate.read()
 else:
 self.ui.warn(_("no undo information available\n"))
 def lock(self, wait=1):
 try:
 except lock.LockHeld, inst:
 if wait:
 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
 return lock.lock(self.join("lock"), wait)
 raise inst
+def wlock(self, wait=1):
+try:
+wlock = lock.lock(self.join("wlock"), 0, self.dirstate.write)
+except lock.LockHeld, inst:
+if not wait:
+raise inst
+self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
+wlock = lock.lock(self.join("wlock"), wait, self.dirstate.write)
+self.dirstate.read()
+return wlock
 def rawcommit(self, files, text, user, date, p1=None, p2=None):
 orig_parent = self.dirstate.parents()[0] or nullid
 p1 = p1 or self.dirstate.parents()[0] or nullid
 p2 = p2 or self.dirstate.parents()[1] or nullid
 if orig_parent == p1:
 update_dirstate = 1
 else:
 update_dirstate = 0
+wlock = self.wlock()
+lock = self.lock()
 tr = self.transaction()
 mm = m1.copy()
 mfm = mf1.copy()
 linkrev = self.changelog.count()
 for f in files:
 return None
 if not self.hook("precommit"):
 return None
+wlock = self.wlock()
 lock = self.lock()
 tr = self.transaction()
 # check in files
 new = {}
 l.sort()
 return (c, a, d, u)
 def add(self, list):
+wlock = self.wlock()
 for f in list:
 p = self.wjoin(f)
 if not os.path.exists(p):
 self.ui.warn(_("%s does not exist!\n") % f)
 elif not os.path.isfile(p):
 self.ui.warn(_("%s already tracked!\n") % f)
 else:
 self.dirstate.update([f], "a")
 def forget(self, list):
+wlock = self.wlock()
 for f in list:
 if self.dirstate.state(f) not in 'ai':
 self.ui.warn(_("%s not added!\n") % f)
 else:
 self.dirstate.forget([f])
 for f in list:
 try:
 util.unlink(self.wjoin(f))
 except OSError, inst:
 if inst.errno != errno.ENOENT: raise
+wlock = self.wlock()
 for f in list:
 p = self.wjoin(f)
 if os.path.exists(p):
 self.ui.warn(_("%s still exists!\n") % f)
 elif self.dirstate.state(f) == 'a':
 def undelete(self, list):
 p = self.dirstate.parents()[0]
 mn = self.changelog.read(p)[0]
 mf = self.manifest.readflags(mn)
 m = self.manifest.read(mn)
+wlock = self.wlock()
 for f in list:
 if self.dirstate.state(f) not in  "r":
 self.ui.warn("%s not removed!\n" % f)
 else:
 t = self.file(f).read(m[f])
 if not os.path.exists(p):
 self.ui.warn(_("%s does not exist!\n") % dest)
 elif not os.path.isfile(p):
 self.ui.warn(_("copy failed: %s is not a file\n") % dest)
 else:
+wlock = self.wlock()
 if self.dirstate.state(dest) == '?':
 self.dirstate.update([dest], "a")
 self.dirstate.copy(source, dest)
 def heads(self):
 for f in a + c + u:
 mw[f] = ""
 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
+if moddirstate:
+wlock = self.wlock()
 for f in d:
 if f in mw: del mw[f]
 # If we're jumping between revisions (as opposed to merging),
 # and if neither the working directory nor the target rev has

changeset 1531	2ba8bf7defda
parent 1516	0b1b029b4de3
child 1532	27077812fffb