| Alphare | |
| pulkit |
| hg-reviewers |
This make the dirstate API simpler.
| 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 (11 lines) | |||
| M | mercurial/mergestate.py (7 lines) |
| filename, | filename, | ||||
| wc_tracked, | wc_tracked, | ||||
| p1_tracked, | p1_tracked, | ||||
| p2_tracked=False, | p2_tracked=False, | ||||
| merged=False, | merged=False, | ||||
| clean_p1=False, | clean_p1=False, | ||||
| clean_p2=False, | clean_p2=False, | ||||
| possibly_dirty=False, | possibly_dirty=False, | ||||
| parentfiledata=None, | |||||
| ): | ): | ||||
| """update the information about a file in the dirstate | """update the information about a file in the dirstate | ||||
| This is to be called when the direstates parent changes to keep track | This is to be called when the direstates parent changes to keep track | ||||
| 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. | ||||
| assert p2_tracked | assert p2_tracked | ||||
| self.otherparent(filename) | self.otherparent(filename) | ||||
| elif not p1_tracked and p2_tracked and wc_tracked: | elif not p1_tracked and p2_tracked and wc_tracked: | ||||
| self._addpath(filename, from_p2=True, possibly_dirty=possibly_dirty) | self._addpath(filename, from_p2=True, possibly_dirty=possibly_dirty) | ||||
| self._map.copymap.pop(filename, None) | self._map.copymap.pop(filename, None) | ||||
| elif possibly_dirty: | elif possibly_dirty: | ||||
| self._addpath(filename, possibly_dirty=possibly_dirty) | self._addpath(filename, possibly_dirty=possibly_dirty) | ||||
| elif wc_tracked: | elif wc_tracked: | ||||
| self.normal(filename) | self.normal(filename, parentfiledata=parentfiledata) | ||||
| # XXX We need something for file that are dirty after an update | # XXX We need something for file that are dirty after an update | ||||
| else: | else: | ||||
| assert False, 'unreachable' | assert False, 'unreachable' | ||||
| @requires_parents_change | |||||
| def update_parent_file_data(self, f, filedata): | |||||
| """update the information about the content of a file | |||||
| This function should be called within a `dirstate.parentchange` context. | |||||
| """ | |||||
| self.normal(f, parentfiledata=filedata) | |||||
| def _addpath( | def _addpath( | ||||
| self, | self, | ||||
| f, | f, | ||||
| mode=0, | mode=0, | ||||
| size=None, | size=None, | ||||
| mtime=None, | mtime=None, | ||||
| added=False, | added=False, | ||||
| merged=False, | merged=False, | ||||
| f, | f, | ||||
| p1_tracked=False, | p1_tracked=False, | ||||
| p2_tracked=True, | p2_tracked=True, | ||||
| wc_tracked=True, | wc_tracked=True, | ||||
| clean_p2=True, | clean_p2=True, | ||||
| ) | ) | ||||
| else: | else: | ||||
| parentfiledata = getfiledata[f] if getfiledata else None | parentfiledata = getfiledata[f] if getfiledata else None | ||||
| repo.dirstate.update_parent_file_data(f, parentfiledata) | repo.dirstate.update_file( | ||||
| f, | |||||
| p1_tracked=True, | |||||
| wc_tracked=True, | |||||
| parentfiledata=parentfiledata, | |||||
| ) | |||||
| # merge | # merge | ||||
| for f, args, msg in actions.get(ACTION_MERGE, []): | for f, args, msg in actions.get(ACTION_MERGE, []): | ||||
| f1, f2, fa, move, anc = args | f1, f2, fa, move, anc = args | ||||
| if branchmerge: | if branchmerge: | ||||
| # We've done a branch merge, mark this file as merged | # We've done a branch merge, mark this file as merged | ||||
| # so that we properly record the merger later | # so that we properly record the merger later | ||||
| repo.dirstate.update_file( | repo.dirstate.update_file( | ||||