# HG changeset patch # User Durham Goode # Date 2013-02-10 20:23:39 # Node ID 05cf40f9b0ec7eb1944639db47a0db2bea09d82e # Parent c5f7e83d47cd8e6eccc213ef507c0d5db9fc329e 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. diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -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