| Alphare | |
| pulkit |
| hg-reviewers |
Going through the same API is more consistent and allow us to push
implementation lower down the call stack.
| 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 (26 lines) |
| if self.in_merge: | if self.in_merge: | ||||
| msg = b'update_file_reference should not be called when merging' | msg = b'update_file_reference should not be called when merging' | ||||
| raise error.ProgrammingError(msg) | raise error.ProgrammingError(msg) | ||||
| entry = self._map.get(filename) | entry = self._map.get(filename) | ||||
| if entry is None: | if entry is None: | ||||
| wc_tracked = False | wc_tracked = False | ||||
| else: | else: | ||||
| wc_tracked = entry.tracked | wc_tracked = entry.tracked | ||||
| possibly_dirty = False | |||||
| if p1_tracked and wc_tracked: | if p1_tracked and wc_tracked: | ||||
| # the underlying reference might have changed, we will have to | # the underlying reference might have changed, we will have to | ||||
| # check it. | # check it. | ||||
| self.normallookup(filename) | possibly_dirty = True | ||||
| elif not (p1_tracked or wc_tracked): | elif not (p1_tracked or wc_tracked): | ||||
| # the file is no longer relevant to anyone | # the file is no longer relevant to anyone | ||||
| self._drop(filename) | self._drop(filename) | ||||
| elif (not p1_tracked) and wc_tracked: | elif (not p1_tracked) and wc_tracked: | ||||
| if not entry.added: | if entry is not None and entry.added: | ||||
| self._add(filename) | return # avoid dropping copy information (maybe?) | ||||
| elif p1_tracked and not wc_tracked: | elif p1_tracked and not wc_tracked: | ||||
| if entry is None or not entry.removed: | pass | ||||
| self._remove(filename) | |||||
| else: | else: | ||||
| assert False, 'unreachable' | assert False, 'unreachable' | ||||
| # this mean we are doing call for file we do not really care about the | |||||
| # data (eg: added or removed), however this should be a minor overhead | |||||
| # compared to the overall update process calling this. | |||||
| parentfiledata = None | |||||
| if wc_tracked: | |||||
| parentfiledata = self._get_filedata(filename) | |||||
| self._updatedfiles.add(filename) | |||||
| self._map.reset_state( | |||||
| filename, | |||||
| wc_tracked, | |||||
| p1_tracked, | |||||
| possibly_dirty=possibly_dirty, | |||||
| parentfiledata=parentfiledata, | |||||
| ) | |||||
| @requires_parents_change | @requires_parents_change | ||||
| def update_file( | def update_file( | ||||
| self, | self, | ||||
| filename, | filename, | ||||
| wc_tracked, | wc_tracked, | ||||
| p1_tracked, | p1_tracked, | ||||
| p2_tracked=False, | p2_tracked=False, | ||||
| merged=False, | merged=False, | ||||