Mercurial > hg

changeset 18663:05cf40f9b0ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: fix generator/list error when using python 2.7 util.statfiles returns a generator on python 2.7 with c extensions disabled. This caused util.statfiles(...) [0] to break in tests. Since we're only stat'ing one file, I just changed it to call lstat directly.
author Durham Goode <durham@fb.com>
date Sun, 10 Feb 2013 12:23:39 -0800
parents c5f7e83d47cd
children 30d899febef8
files mercurial/dirstate.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Mon Feb 11 16:21:48 2013 +0100
+++ b/mercurial/dirstate.py	Sun Feb 10 12:23:39 2013 -0800
@@ -703,7 +703,11 @@
                     # Report ignored items in the dmap as long as they are not
                     # under a symlink directory.
                     if ignore(nf) and audit_path.check(nf):
-                        results[nf] = util.statfiles([join(nf)])[0]
+                        try:
+                            results[nf] = lstat(join(nf))
+                        except OSError:
+                            # file doesn't exist
+                            results[nf] = None
                     else:
                         # It's either missing or under a symlink directory
                         results[nf] = None