| Alphare | |
| pulkit |
| hg-reviewers |
There is some usecase (like hg revert) that requires more agressive
possibly_dirty setting. So we take a safe path and enforce it in one of the
main normallookup replacement.
| 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 (4 lines) |
| """ | """ | ||||
| entry = self._map.get(filename) | entry = self._map.get(filename) | ||||
| if entry is None: | if entry is None: | ||||
| self._add(filename) | self._add(filename) | ||||
| return True | return True | ||||
| elif not entry.tracked: | elif not entry.tracked: | ||||
| self.normallookup(filename) | self.normallookup(filename) | ||||
| return True | return True | ||||
| # XXX This is probably overkill for more case, but we need this to | |||||
| # fully replace the `normallookup` call with `set_tracked` one. | |||||
| # Consider smoothing this in the future. | |||||
| self.set_possibly_dirty(filename) | |||||
| return False | return False | ||||
| @requires_no_parents_change | @requires_no_parents_change | ||||
| def set_untracked(self, filename): | def set_untracked(self, filename): | ||||
| """a "public" method for generic code to mark a file as untracked | """a "public" method for generic code to mark a file as untracked | ||||
| This function is to be called outside of "update/merge" case. For | This function is to be called outside of "update/merge" case. For | ||||
| example by a command like `hg remove X`. | example by a command like `hg remove X`. | ||||