facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

dirstate: fix generator/list error when using python 2.7

Browse Source 
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.
This commit is contained in:
Durham Goode 2013-02-10 12:23:39 -08:00
parent 853b87cfc0
commit 5317973684
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/dirstate.py
View File

@ -703,7 +703,11 @@ class dirstate(object):
# 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