Mercurial > hg
comparison mercurial/context.py @ 21971:412ac613fd89 stable
status: explicitly exclude removed file from unknown and ignored
Changeset 64fe488b5179 introduced a test to validate that file were not reported
twice when both unknown and removed. This behavior change was introduced by
65cdc6bab91e alongside a bug that dropped ignored and unknown completely
(issue4321). As we are going to fix the bug, we need a proper implementation of
the behavior tested in 64fe488b5179.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 01 Aug 2014 13:13:24 -0700 |
| parents | c8411fb5dfef |
| children | 8864528874f7 |
comparison
equal
deleted
inserted
replaced
| 21970:27205c8335b0 | 21971:412ac613fd89 |
|---|---|
| 133 clean.append(fn) | 133 clean.append(fn) |
| 134 del mf1[fn] | 134 del mf1[fn] |
| 135 elif fn not in deleted: | 135 elif fn not in deleted: |
| 136 added.append(fn) | 136 added.append(fn) |
| 137 removed = mf1.keys() | 137 removed = mf1.keys() |
| 138 if removed: | |
| 139 # need to filter files if they are already reported as removed | |
| 140 unknown = [fn for fn in unknown if fn not in mf1] | |
| 141 ignored = [fn for fn in ignored if fn not in mf1] | |
| 138 | 142 |
| 139 return [modified, added, removed, deleted, unknown, ignored, clean] | 143 return [modified, added, removed, deleted, unknown, ignored, clean] |
| 140 | 144 |
| 141 @propertycache | 145 @propertycache |
| 142 def substate(self): | 146 def substate(self): |