# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1349150774 18000
# Node ID b3f0f9a39c4e1d0250048cd803ab03542d6f140a
# Parent  75f25bd4c7d43cce38b9da91aa17b8f685adc79c# Parent  829919ef894acb189c8ec0431e59f36338eb038f
merge with i18n

diff -r 75f25bd4c7d4 -r b3f0f9a39c4e mercurial/lock.py
--- a/mercurial/lock.py	Sun Sep 23 00:08:13 2012 -0400
+++ b/mercurial/lock.py	Mon Oct 01 23:06:14 2012 -0500
@@ -97,7 +97,12 @@
         The lock file is only deleted when None is returned.
 
         """
-        locker = util.readlock(self.f)
+        try:
+            locker = util.readlock(self.f)
+        except OSError, why:
+            if why.errno == errno.ENOENT:
+                return None
+            raise
         try:
             host, pid = locker.split(":", 1)
         except ValueError:
diff -r 75f25bd4c7d4 -r b3f0f9a39c4e tests/test-largefiles.t
--- a/tests/test-largefiles.t	Sun Sep 23 00:08:13 2012 -0400
+++ b/tests/test-largefiles.t	Mon Oct 01 23:06:14 2012 -0500
@@ -1622,8 +1622,8 @@
   A large.dat
   A large2.dat
   A normal
-  $ find .hglf/ | sort
-  .hglf/
+  $ find .hglf | sort
+  .hglf
   .hglf/large.dat
   .hglf/large2.dat