| SimonSapin | |
| pulkit |
| hg-reviewers |
This is easier to read and will make this simpler to update in the next
changeset.
| 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 (12 lines) |
| t = dget(fn) | t = dget(fn) | ||||
| state = t.state | state = t.state | ||||
| mode = t[1] | mode = t[1] | ||||
| size = t[2] | size = t[2] | ||||
| time = t[3] | time = t[3] | ||||
| if not st and t.tracked: | if not st and t.tracked: | ||||
| dadd(fn) | dadd(fn) | ||||
| elif t.merged: | |||||
| madd(fn) | |||||
| elif t.added: | |||||
| aadd(fn) | |||||
| elif t.removed: | |||||
| radd(fn) | |||||
| elif state == b'n': | elif state == b'n': | ||||
| 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 | ||||
| elif st[stat.ST_MTIME] == lastnormaltime: | elif st[stat.ST_MTIME] == lastnormaltime: | ||||
| # fn may have just been marked as normal and it may have | # fn may have just been marked as normal and it may have | ||||
| # changed in the same second without changing its size. | # changed in the same second without changing its size. | ||||
| # This can happen if we quickly do multiple commits. | # This can happen if we quickly do multiple commits. | ||||
| # Force lookup, so we don't miss such a racy file change. | # Force lookup, so we don't miss such a racy file change. | ||||
| ladd(fn) | ladd(fn) | ||||
| elif listclean: | elif listclean: | ||||
| cadd(fn) | cadd(fn) | ||||
| elif t.merged: | |||||
| madd(fn) | |||||
| elif t.added: | |||||
| aadd(fn) | |||||
| elif t.removed: | |||||
| radd(fn) | |||||
| status = scmutil.status( | status = scmutil.status( | ||||
| modified, added, removed, deleted, unknown, ignored, clean | modified, added, removed, deleted, unknown, ignored, clean | ||||
| ) | ) | ||||
| return (lookup, status) | return (lookup, status) | ||||
| def matches(self, match): | def matches(self, match): | ||||
| """ | """ | ||||
| return files in the dirstate (in whatever state) filtered by match | return files in the dirstate (in whatever state) filtered by match | ||||