diff mercurial/hg.py @ 7640:7197812e8d44

error: move lock errors

rename LockException to LockError

--- a/mercurial/hg.py	Mon Jan 12 10:59:08 2009 -0600
+++ b/mercurial/hg.py	Mon Jan 12 11:09:14 2009 -0600
@@ -8,7 +8,7 @@
 
 from i18n import _
 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
-import errno, lock, os, shutil, util, extensions
+import errno, lock, os, shutil, util, extensions, error
 import merge as _merge
 import verify as _verify
 
@@ -161,7 +161,7 @@
                 # not pointed to by changesets, thus causing verify to
                 # fail
                 src_lock = src_repo.lock()
-            except lock.LockException:
+            except error.LockError:
                 copy = False
 
         if copy: