mercurial-scm/hg: comparison mercurial/localrepo.py

equal deleted inserted replaced

-:5c5d23d93447
+:126f527b3ba3
 self.ui.warn(_("no interrupted transaction available\n"))
 return False
 finally:
 del l
-def rollback(self, wlock=None, lock=None):
+def rollback(self):
-try:
+wlock = lock = None
-if not wlock:
+try:
 wlock = self.wlock()
-if not lock:
+lock = self.lock()
-lock = self.lock()
 if os.path.exists(self.sjoin("undo")):
 self.ui.status(_("rolling back last transaction\n"))
 transaction.rollback(self.sopener, self.sjoin("undo"))
 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
 self.invalidate()
 if acquirefn:
 acquirefn()
 return l
 def lock(self, wait=True):
-return self._lock(self.sjoin("lock"), wait, None, self.invalidate,
+if self._lockref and self._lockref():
-_('repository %s') % self.origroot)
+return self._lockref()
+l = self._lock(self.sjoin("lock"), wait, None, self.invalidate,
+_('repository %s') % self.origroot)
+self._lockref = weakref.ref(l)
+return l
 def wlock(self, wait=True):
-return self._lock(self.join("wlock"), wait, self.dirstate.write,
+if self._wlockref and self._wlockref():
-self.dirstate.invalidate,
+return self._wlockref()
-_('working directory of %s') % self.origroot)
+l = self._lock(self.join("wlock"), wait, self.dirstate.write,
+self.dirstate.invalidate, _('working directory of %s') %
+self.origroot)
+self._wlockref = weakref.ref(l)
+return l
 def filecommit(self, fn, manifest1, manifest2, linkrev, transaction, changelist):
 """
 commit an individual file as part of a larger transaction
 """
 return fp1
 changelist.append(fn)
 return fl.add(t, meta, transaction, linkrev, fp1, fp2)
-def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None, extra={}):
+def rawcommit(self, files, text, user, date, p1=None, p2=None, extra={}):
 if p1 is None:
 p1, p2 = self.dirstate.parents()
 return self.commit(files=files, text=text, user=user, date=date,
-p1=p1, p2=p2, wlock=wlock, extra=extra)
+p1=p1, p2=p2, extra=extra)
 def commit(self, files=None, text="", user=None, date=None,
-match=util.always, force=False, lock=None, wlock=None,
+match=util.always, force=False, force_editor=False,
-force_editor=False, p1=None, p2=None, extra={}):
+p1=None, p2=None, extra={}):
-tr = None
+wlock = lock = tr = None
 try:
 commit = []
 remove = []
 changed = []
 use_dirstate = (p1 is None) # not rawcommit
 if p2 == nullid: xp2 = ''
 else: xp2 = hex(p2)
 self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)
-if not wlock:
+wlock = self.wlock()
-wlock = self.wlock()
+lock = self.lock()
-if not lock:
-lock = self.lock()
 tr = self.transaction()
 # check in files
 new = {}
 linkrev = self.changelog.count()
 else:
 for src, fn in self.dirstate.walk(files, match, badmatch=badmatch):
 yield src, fn
 def status(self, node1=None, node2=None, files=[], match=util.always,
-wlock=None, list_ignored=False, list_clean=False):
+list_ignored=False, list_clean=False):
 """return status of files 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.
 """
 if list_clean:
 clean.append(f)
 # update dirstate for files that are actually clean
 if fixup:
-fixlock = wlock
+wlock = None
 try:
-if not fixlock:
+try:
-try:
+wlock = self.wlock(False)
-fixlock = self.wlock(False)
+except lock.LockException:
-except lock.LockException:
+pass
-pass
+if wlock:
-if fixlock:
 for f in fixup:
 self.dirstate.normal(f)
 finally:
-del fixlock
+del wlock
 else:
 # we are comparing working dir against non-parent
 # generate a pseudo-manifest for the working dir
 # XXX: create it in dirstate.py ?
 mf2 = mfmatches(self.dirstate.parents()[0])
 # sort and return results:
 for l in modified, added, removed, deleted, unknown, ignored, clean:
 l.sort()
 return (modified, added, removed, deleted, unknown, ignored, clean)
-def add(self, list, wlock=None):
+def add(self, list):
-try:
+wlock = self.wlock()
-if not wlock:
+try:
-wlock = self.wlock()
 for f in list:
 p = self.wjoin(f)
 try:
 st = os.lstat(p)
 except:
 else:
 self.dirstate.add(f)
 finally:
 del wlock
-def forget(self, list, wlock=None):
+def forget(self, list):
-try:
+wlock = self.wlock()
-if not wlock:
+try:
-wlock = self.wlock()
 for f in list:
 if self.dirstate[f] != 'a':
 self.ui.warn(_("%s not added!\n") % f)
 else:
 self.dirstate.forget(f)
 finally:
 del wlock
-def remove(self, list, unlink=False, wlock=None):
+def remove(self, list, unlink=False):
+wlock = None
 try:
 if unlink:
 for f in list:
 try:
 util.unlink(self.wjoin(f))
 except OSError, inst:
 if inst.errno != errno.ENOENT:
 raise
-if not wlock:
+wlock = self.wlock()
-wlock = self.wlock()
 for f in list:
 if unlink and os.path.exists(self.wjoin(f)):
 self.ui.warn(_("%s still exists!\n") % f)
 elif self.dirstate[f] == 'a':
 self.dirstate.forget(f)
 else:
 self.dirstate.remove(f)
 finally:
 del wlock
-def undelete(self, list, wlock=None):
+def undelete(self, list):
+wlock = None
 try:
 p = self.dirstate.parents()[0]
 mn = self.changelog.read(p)[0]
 m = self.manifest.read(mn)
-if not wlock:
+wlock = self.wlock()
-wlock = self.wlock()
 for f in list:
 if self.dirstate[f] != 'r':
 self.ui.warn("%s not removed!\n" % f)
 else:
 t = self.file(f).read(m[f])
 self.wwrite(f, t, m.flags(f))
 self.dirstate.normal(f)
 finally:
 del wlock
-def copy(self, source, dest, wlock=None):
+def copy(self, source, dest):
+wlock = None
 try:
 p = self.wjoin(dest)
 if not (os.path.exists(p) or os.path.islink(p)):
 self.ui.warn(_("%s does not exist!\n") % dest)
 elif not (os.path.isfile(p) or os.path.islink(p)):
 self.ui.warn(_("copy failed: %s is not a file or a "
 "symbolic link\n") % dest)
 else:
-if not wlock:
+wlock = self.wlock()
-wlock = self.wlock()
 if dest not in self.dirstate:
 self.dirstate.add(dest)
 self.dirstate.copy(source, dest)
 finally:
 del wlock
 if heads:
 return subset, updated_heads.keys()
 else:
 return subset
-def pull(self, remote, heads=None, force=False, lock=None):
+def pull(self, remote, heads=None, force=False):
-try:
+lock = self.lock()
-if not lock:
+try:
-lock = self.lock()
 fetch = self.findincoming(remote, force=force)
 if fetch == [nullid]:
 self.ui.status(_("requesting all changes\n"))
 if not fetch:

changeset 4917	126f527b3ba3
parent 4916	5c5d23d93447
child 4970	30d4d8985dd8