use repo.lock when cloning via copy, use lock.LockException when necessary

mercurial/commands.py

@@ -724,8 +724,8 b' def clone(ui, source, dest=None, **opts)'
             # 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:

mercurial/localrepo.py

@@ -508,7 +508,7 b' class localrepository(object):'
             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))