merge with i18n

mercurial/lock.py

@@ -97,7 +97,12 b' class lock(object):'
         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:

tests/test-largefiles.t

@@ -1622,8 +1622,8 b" Test commit's addremove option prior to "
   A large.dat
   A large2.dat
   A normal
-  $ find .hglf/ | sort
-  .hglf/
+  $ find .hglf | sort
+  .hglf
   .hglf/large.dat
   .hglf/large2.dat