Mercurial > hg

diff mercurial/streamclone.py @ 7640:7197812e8d44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: move lock errors rename LockException to LockError
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Jan 2009 11:09:14 -0600
parents 810ca383da9c
children 496ae1ea4698
line wrap: on
line diff
--- a/mercurial/streamclone.py	Mon Jan 12 10:59:08 2009 -0600
+++ b/mercurial/streamclone.py	Mon Jan 12 11:09:14 2009 -0600
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-import util, lock
+import util, error
 from i18n import _
 
 class StreamException(Exception):
@@ -51,7 +51,7 @@
                 total_bytes += size
         finally:
             del l
-    except (lock.LockHeld, lock.LockUnavailable):
+    except error.LockError:
         raise StreamException(2)
 
     yield '0\n'