Mercurial > hg > pyhgsh

changeset 1754:fdfe89a3962d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use repo.lock when cloning via copy, use lock.LockException when necessary
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 20 Feb 2006 01:12:03 +0100
parents e6e70450edb9
children a8f7791e3680
files mercurial/commands.py mercurial/localrepo.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Feb 20 01:09:40 2006 +0100
+++ b/mercurial/commands.py	Mon Feb 20 01:12:03 2006 +0100
@@ -724,8 +724,8 @@
             # can end up with extra data in the cloned revlogs that's
             # not pointed to by changesets, thus causing verify to
             # fail
-            l1 = lock.lock(os.path.join(source, ".hg", "lock"))
-        except OSError:
+            l1 = other.lock()
+        except lock.LockException:
             copy = False
 
     if copy:
--- a/mercurial/localrepo.py	Mon Feb 20 01:09:40 2006 +0100
+++ b/mercurial/localrepo.py	Mon Feb 20 01:12:03 2006 +0100
@@ -508,7 +508,7 @@
             if not wlock:
                 try:
                     wlock = self.wlock(wait=0)
-                except lock.LockHeld:
+                except lock.LockException:
                     wlock = None
             lookup, modified, added, removed, deleted, unknown = (
                 self.dirstate.changes(files, match))