mercurial: comparison mercurial/localrepo.py

equal deleted inserted replaced

-:8959700c2b19
+:21dcf38e5d7d
 return True
 else:
 self.ui.warn(_("no interrupted transaction available\n"))
 return False
-def undo(self):
+def undo(self, wlock=None):
-wlock = self.wlock()
+if not wlock:
+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"))
 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
 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):
+def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=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
 c1 = self.changelog.read(p1)
 c2 = self.changelog.read(p2)
 if orig_parent == p1:
 update_dirstate = 1
 else:
 update_dirstate = 0
-wlock = self.wlock()
+if not wlock:
+wlock = self.wlock()
 lock = self.lock()
 tr = self.transaction()
 mm = m1.copy()
 mfm = mf1.copy()
 linkrev = self.changelog.count()
 tr.close()
 if update_dirstate:
 self.dirstate.setparents(n, nullid)
 def commit(self, files=None, text="", user=None, date=None,
-match=util.always, force=False):
+match=util.always, force=False, wlock=None):
 commit = []
 remove = []
 changed = []
 if files:
 return None
 if not self.hook("precommit"):
 return None
-wlock = self.wlock()
+if not wlock:
+wlock = self.wlock()
 lock = self.lock()
 tr = self.transaction()
 # check in files
 new = {}
 util.pathto(self.getcwd(), fn), short(node)))
 else:
 for src, fn in self.dirstate.walk(files, match):
 yield src, fn
-def changes(self, node1=None, node2=None, files=[], match=util.always):
+def changes(self, node1=None, node2=None, files=[], match=util.always,
+wlock=None):
 """return changes between two nodes or node and working directory
 If node1 is None, use the first dirstate parent instead.
 If node2 is None, compare node1 with working directory.
 """
 del mf[fn]
 return mf
 # are we comparing the working directory?
 if not node2:
-try:
+if not wlock:
-wlock = self.wlock(wait=0)
+try:
-except lock.LockHeld:
+wlock = self.wlock(wait=0)
-wlock = None
+except lock.LockHeld:
+wlock = None
 lookup, modified, added, removed, deleted, unknown = (
 self.dirstate.changes(files, match))
 # are we comparing working dir against its parent?
 if not node1:
 # sort and return results:
 for l in modified, added, removed, deleted, unknown:
 l.sort()
 return (modified, added, removed, deleted, unknown)
-def add(self, list):
+def add(self, list, wlock=None):
-wlock = self.wlock()
+if not wlock:
+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):
 elif self.dirstate.state(f) in 'an':
 self.ui.warn(_("%s already tracked!\n") % f)
 else:
 self.dirstate.update([f], "a")
-def forget(self, list):
+def forget(self, list, wlock=None):
-wlock = self.wlock()
+if not wlock:
+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])
-def remove(self, list, unlink=False):
+def remove(self, list, unlink=False, wlock=None):
 if unlink:
 for f in list:
 try:
 util.unlink(self.wjoin(f))
 except OSError, inst:
 if inst.errno != errno.ENOENT:
 raise
-wlock = self.wlock()
+if not wlock:
+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':
 elif f not in self.dirstate:
 self.ui.warn(_("%s not tracked!\n") % f)
 else:
 self.dirstate.update([f], "r")
-def undelete(self, list):
+def undelete(self, list, wlock=None):
 p = self.dirstate.parents()[0]
 mn = self.changelog.read(p)[0]
 mf = self.manifest.readflags(mn)
 m = self.manifest.read(mn)
-wlock = self.wlock()
+if not wlock:
+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])
 self.wwrite(f, t)
 util.set_exec(self.wjoin(f), mf[f])
 self.dirstate.update([f], "n")
-def copy(self, source, dest):
+def copy(self, source, dest, wlock=None):
 p = self.wjoin(dest)
 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 not wlock:
+wlock = self.wlock()
 if self.dirstate.state(dest) == '?':
 self.dirstate.update([dest], "a")
 self.dirstate.copy(source, dest)
 def heads(self, start=None):
 self.hook("commit", node=hex(self.changelog.node(i)))
 return
 def update(self, node, allow=False, force=False, choose=None,
-moddirstate=True, forcemerge=False):
+moddirstate=True, forcemerge=False, wlock=None):
 pl = self.dirstate.parents()
 if not force and pl[1] != nullid:
 self.ui.warn(_("aborting: outstanding uncommitted merges\n"))
 return 1
 for f in added + modified + unknown:
 mw[f] = ""
 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
-if moddirstate:
+if moddirstate and not wlock:
 wlock = self.wlock()
 for f in deleted + removed:
 if f in mw:
 del mw[f]

changeset 1712	21dcf38e5d7d
parent 1709	069129d24b26
child 1713	03ee100b8c21