--- 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:
--- 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