| Alphare | |
| pulkit |
| hg-reviewers |
This is covered by the @requires_parents_change decorator that this function use.
| 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 (3 lines) |
| of what is the file situation in regards to the working copy and its parent. | of what is the file situation in regards to the working copy and its parent. | ||||
| This function must be called within a `dirstate.parentchange` context. | This function must be called within a `dirstate.parentchange` context. | ||||
| note: the API is at an early stage and we might need to ajust it | note: the API is at an early stage and we might need to ajust it | ||||
| depending of what information ends up being relevant and useful to | depending of what information ends up being relevant and useful to | ||||
| other processing. | other processing. | ||||
| """ | """ | ||||
| if not self.pendingparentchange(): | |||||
| msg = b'calling `update_file` outside of a parentchange context' | |||||
| raise error.ProgrammingError(msg) | |||||
| if merged and (clean_p1 or clean_p2): | if merged and (clean_p1 or clean_p2): | ||||
| msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | ||||
| raise error.ProgrammingError(msg) | raise error.ProgrammingError(msg) | ||||
| assert not (merged and (clean_p1 or clean_p1)) | assert not (merged and (clean_p1 or clean_p1)) | ||||
| if not (p1_tracked or p2_tracked or wc_tracked): | if not (p1_tracked or p2_tracked or wc_tracked): | ||||
| self._drop(filename) | self._drop(filename) | ||||
| elif merged: | elif merged: | ||||
| assert wc_tracked | assert wc_tracked | ||||