# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 2012-08-15 23:33:26
# Node ID 499e284f3f32a36d19d3102f2e25dd09a7bca897
# Parent  ff3c89cf1477e558424c555f3a40fa82953b1cb3
# Parent  0cec762790ed34c469ce67b8ca8223545c57e148

Merge from crew-stable

diff --git a/mercurial/store.py b/mercurial/store.py
--- a/mercurial/store.py
+++ b/mercurial/store.py
@@ -7,7 +7,7 @@
 
 from i18n import _
 import osutil, scmutil, util
-import os, stat
+import os, stat, errno
 
 _sha = util.sha1
 
@@ -398,12 +398,14 @@ class fncachestore(basicstore):
     def datafiles(self):
         rewrite = False
         existing = []
-        for f in self.fncache:
+        for f in sorted(self.fncache):
             ef = self.encode(f)
             try:
                 yield f, ef, self.getsize(ef)
                 existing.append(f)
-            except OSError:
+            except OSError, err:
+                if err.errno != errno.ENOENT:
+                    raise
                 # nonexistent entry
                 rewrite = True
         if rewrite: