| SimonSapin | |
| pulkit |
| hg-reviewers |
Given that the previous conditional we can safely use tracked here.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (2 lines) |
| if not st and t.tracked: | if not st and t.tracked: | ||||
| dadd(fn) | dadd(fn) | ||||
| elif t.merged: | elif t.merged: | ||||
| madd(fn) | madd(fn) | ||||
| elif t.added: | elif t.added: | ||||
| aadd(fn) | aadd(fn) | ||||
| elif t.removed: | elif t.removed: | ||||
| radd(fn) | radd(fn) | ||||
| elif state == b'n': | elif t.tracked: | ||||
| if ( | if ( | ||||
| size >= 0 | size >= 0 | ||||
| and ( | and ( | ||||
| (size != st.st_size and size != st.st_size & _rangemask) | (size != st.st_size and size != st.st_size & _rangemask) | ||||
| or ((mode ^ st.st_mode) & 0o100 and checkexec) | or ((mode ^ st.st_mode) & 0o100 and checkexec) | ||||
| ) | ) | ||||
| or t.from_p2 | or t.from_p2 | ||||
| or fn in copymap | or fn in copymap | ||||