Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with i18n stable 2.3.2
authorMatt Mackall <mpm@selenic.com>
Mon, 01 Oct 2012 23:06:14 -0500
branchstable
changeset 17696 b3f0f9a39c4e
parent 17695 75f25bd4c7d4 (current diff)
parent 17682 829919ef894a (diff)
child 17697 a02b2018988c
merge with i18n
tests/test-largefiles.t file | annotate | diff | comparison | revisions 
--- 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
mercurial