Changeset f5d8843a249a…
Parent 5e4eea03fa1c…
by Andrew Pritchard <andrewp@fogcreek.com>
Changes to one file · Browse files at f5d8843a249a Showing diff from parent 5e4eea03fa1c Diff from another changeset...
@@ -234,14 +234,11 @@ matcher = getstandinmatcher(repo)
lfiles = []
- if rev is not None:
- cctx = repo[rev]
- for standin in cctx.walk(matcher):
- filename = splitstandin(standin)
- lfiles.append(filename)
- else:
- for standin in sorted(dirstate_walk(repo.dirstate, matcher)):
- filename = splitstandin(standin)
+ cctx = repo[rev]
+ for standin in cctx.walk(matcher):
+ filename = splitstandin(standin)
+ # ignore unknown files if we're walking the working directory
+ if rev is not None or repo.dirstate[standin] != '?':
lfiles.append(filename)
return lfiles
|
Loading...