Mercurial > hg-stable
changeset 4913:46e39935ce33
rename and simplify do_lock
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 21 Jul 2007 16:02:09 -0500 |
| parents | 312c845edef5 |
| children | 9a2a73ea6135 |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sat Jul 21 16:02:09 2007 -0500 +++ b/mercurial/localrepo.py Sat Jul 21 16:02:09 2007 -0500 @@ -546,8 +546,7 @@ self.tagscache = None self.nodetagscache = None - def do_lock(self, lockname, wait, releasefn=None, acquirefn=None, - desc=None): + def _lock(self, lockname, wait, releasefn, acquirefn, desc): try: l = lock.lock(lockname, 0, releasefn, desc=desc) except lock.LockHeld, inst: @@ -563,14 +562,13 @@ return l def lock(self, wait=1): - return self.do_lock(self.sjoin("lock"), wait, - acquirefn=self.invalidate, - desc=_('repository %s') % self.origroot) + return self._lock(self.sjoin("lock"), wait, None, self.invalidate, + _('repository %s') % self.origroot) def wlock(self, wait=1): - return self.do_lock(self.join("wlock"), wait, self.dirstate.write, - self.dirstate.invalidate, - desc=_('working directory of %s') % self.origroot) + return self._lock(self.join("wlock"), wait, self.dirstate.write, + self.dirstate.invalidate, + _('working directory of %s') % self.origroot) def filecommit(self, fn, manifest1, manifest2, linkrev, transaction, changelist): """