# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1185051729 18000
# Node ID 9a2a73ea6135fb0c338c49a7ce73eafc9bd6a715
# Parent  46e39935ce337201ca64e3ed33bbe3b368910fd2
repo locks: use True/False

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -675,7 +675,7 @@ def copy(ui, repo, *pats, **opts):
     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 @@ def rename(ui, repo, *pats, **opts):
     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:
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -561,11 +561,11 @@ class localrepository(repo.repository):
             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 @@ class localrepository(repo.repository):
                         cleanup = False
                         if not wlock:
                             try:
-                                wlock = self.wlock(wait=0)
+                                wlock = self.wlock(False)
                                 cleanup = True
                             except lock.LockException:
                                 pass