--- a/mercurial/commands.py Sat Jul 21 16:02:09 2007 -0500
+++ b/mercurial/commands.py Sat Jul 21 16:02:09 2007 -0500
@@ -675,7 +675,7 @@
This command takes effect in the next commit. To undo a copy
before that, see hg revert.
"""
- wlock = repo.wlock(0)
+ wlock = repo.wlock(False)
errs, copied = docopy(ui, repo, pats, opts, wlock)
return errs
@@ -2247,7 +2247,7 @@
This command takes effect in the next commit. To undo a rename
before that, see hg revert.
"""
- wlock = repo.wlock(0)
+ wlock = repo.wlock(False)
errs, copied = docopy(ui, repo, pats, opts, wlock)
names = []
for abs, rel, exact in copied:
--- a/mercurial/localrepo.py Sat Jul 21 16:02:09 2007 -0500
+++ b/mercurial/localrepo.py Sat Jul 21 16:02:09 2007 -0500
@@ -561,11 +561,11 @@
acquirefn()
return l
- def lock(self, wait=1):
+ def lock(self, wait=True):
return self._lock(self.sjoin("lock"), wait, None, self.invalidate,
_('repository %s') % self.origroot)
- def wlock(self, wait=1):
+ def wlock(self, wait=True):
return self._lock(self.join("wlock"), wait, self.dirstate.write,
self.dirstate.invalidate,
_('working directory of %s') % self.origroot)
@@ -898,7 +898,7 @@
cleanup = False
if not wlock:
try:
- wlock = self.wlock(wait=0)
+ wlock = self.wlock(False)
cleanup = True
except lock.LockException:
pass