| Alphare |
| hg-reviewers |
This conclude the refactoring of this API. We can now finalize the dirstate v2
on disk format.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/lfutil.py (26 lines) | |||
| M | mercurial/dirstate.py (14 lines) | |||
| M | mercurial/mergestate.py (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Abandoned | pulkit | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute |
| return standins | return standins | ||||
| def synclfdirstate(repo, lfdirstate, lfile, normallookup): | def synclfdirstate(repo, lfdirstate, lfile, normallookup): | ||||
| lfstandin = standin(lfile) | lfstandin = standin(lfile) | ||||
| if lfstandin not in repo.dirstate: | if lfstandin not in repo.dirstate: | ||||
| lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=False) | lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=False) | ||||
| else: | else: | ||||
| stat = repo.dirstate.get_entry(lfstandin) | entry = repo.dirstate.get_entry(lfstandin) | ||||
| state, mtime = stat.state, stat.mtime | |||||
| if state == b'n': | |||||
| if normallookup or mtime < 0 or not repo.wvfs.exists(lfile): | |||||
| # state 'n' doesn't ensure 'clean' in this case | |||||
| lfdirstate.update_file( | lfdirstate.update_file( | ||||
| lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True | lfile, | ||||
| ) | wc_tracked=entry.tracked, | ||||
| else: | p1_tracked=entry.p1_tracked, | ||||
| lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) | p2_info=entry.p2_info, | ||||
| elif state == b'm': | possibly_dirty=True, | ||||
| lfdirstate.update_file( | |||||
| lfile, p1_tracked=True, wc_tracked=True, merged=True | |||||
| ) | ) | ||||
| elif state == b'r': | |||||
| lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False) | |||||
| elif state == b'a': | |||||
| lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True) | |||||
| def markcommitted(orig, ctx, node): | def markcommitted(orig, ctx, node): | ||||
| repo = ctx.repo() | repo = ctx.repo() | ||||
| lfdirstate = openlfdirstate(repo.ui, repo) | lfdirstate = openlfdirstate(repo.ui, repo) | ||||
| with lfdirstate.parentchange(): | with lfdirstate.parentchange(): | ||||
| orig(node) | orig(node) | ||||
| self._lastnormaltime = parentfiledata[2] | self._lastnormaltime = parentfiledata[2] | ||||
| @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_info=False, | ||||
| merged=False, | |||||
| clean_p1=False, | |||||
| clean_p2=False, | |||||
| possibly_dirty=False, | possibly_dirty=False, | ||||
| parentfiledata=None, | 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. | ||||
| note: the API is at an early stage and we might need to adjust it | note: the API is at an early stage and we might need to adjust 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 merged and (clean_p1 or clean_p2): | |||||
| msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | |||||
| raise error.ProgrammingError(msg) | |||||
| # note: I do not think we need to double check name clash here since we | # note: I do not think we need to double check name clash here since we | ||||
| # are in a update/merge case that should already have taken care of | # are in a update/merge case that should already have taken care of | ||||
| # this. The test agrees | # this. The test agrees | ||||
| self._dirty = True | self._dirty = True | ||||
| need_parent_file_data = ( | need_parent_file_data = ( | ||||
| not (possibly_dirty or clean_p2 or merged) | not possibly_dirty and not p2_info and wc_tracked and p1_tracked | ||||
| and wc_tracked | |||||
| and p1_tracked | |||||
| ) | ) | ||||
| # this mean we are doing call for file we do not really care about the | # 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 | # data (eg: added or removed), however this should be a minor overhead | ||||
| # compared to the overall update process calling this. | # compared to the overall update process calling this. | ||||
| if need_parent_file_data: | if need_parent_file_data: | ||||
| if parentfiledata is None: | if parentfiledata is None: | ||||
| parentfiledata = self._get_filedata(filename) | parentfiledata = self._get_filedata(filename) | ||||
| mtime = parentfiledata[2] | mtime = parentfiledata[2] | ||||
| if mtime > self._lastnormaltime: | if mtime > self._lastnormaltime: | ||||
| # Remember the most recent modification timeslot for | # Remember the most recent modification timeslot for | ||||
| # status(), to make sure we won't miss future | # status(), to make sure we won't miss future | ||||
| # size-preserving file content modifications that happen | # size-preserving file content modifications that happen | ||||
| # within the same timeslot. | # within the same timeslot. | ||||
| self._lastnormaltime = mtime | self._lastnormaltime = mtime | ||||
| self._map.reset_state( | self._map.reset_state( | ||||
| filename, | filename, | ||||
| wc_tracked, | wc_tracked, | ||||
| p1_tracked, | p1_tracked, | ||||
| p2_info=merged or clean_p2, | p2_info=p2_info, | ||||
| has_meaningful_mtime=not possibly_dirty, | has_meaningful_mtime=not possibly_dirty, | ||||
| parentfiledata=parentfiledata, | parentfiledata=parentfiledata, | ||||
| ) | ) | ||||
| if ( | if ( | ||||
| parentfiledata is not None | parentfiledata is not None | ||||
| and parentfiledata[2] > self._lastnormaltime | and parentfiledata[2] > self._lastnormaltime | ||||
| ): | ): | ||||
| # Remember the most recent modification timeslot for status(), | # Remember the most recent modification timeslot for status(), | ||||
| for f, args, msg in actions.get(ACTION_GET, []): | for f, args, msg in actions.get(ACTION_GET, []): | ||||
| if branchmerge: | if branchmerge: | ||||
| # tracked in p1 can be True also but update_file should not care | # tracked in p1 can be True also but update_file should not care | ||||
| old_entry = repo.dirstate.get_entry(f) | old_entry = repo.dirstate.get_entry(f) | ||||
| p1_tracked = old_entry.any_tracked and not old_entry.added | p1_tracked = old_entry.any_tracked and not old_entry.added | ||||
| repo.dirstate.update_file( | repo.dirstate.update_file( | ||||
| f, | f, | ||||
| p1_tracked=p1_tracked, | p1_tracked=p1_tracked, | ||||
| p2_tracked=True, | |||||
| wc_tracked=True, | wc_tracked=True, | ||||
| clean_p2=not p1_tracked, | p2_info=True, | ||||
| merged=p1_tracked, | |||||
| ) | ) | ||||
| else: | else: | ||||
| parentfiledata = getfiledata[f] if getfiledata else None | parentfiledata = getfiledata[f] if getfiledata else None | ||||
| repo.dirstate.update_file( | repo.dirstate.update_file( | ||||
| f, | f, | ||||
| p1_tracked=True, | p1_tracked=True, | ||||
| wc_tracked=True, | wc_tracked=True, | ||||
| parentfiledata=parentfiledata, | 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 | ||||
| p1_tracked = f1 == f | p1_tracked = f1 == f | ||||
| p2_tracked = f2 == f | |||||
| repo.dirstate.update_file( | repo.dirstate.update_file( | ||||
| f, | f, | ||||
| p1_tracked=p1_tracked, | p1_tracked=p1_tracked, | ||||
| p2_tracked=p2_tracked, | |||||
| wc_tracked=True, | wc_tracked=True, | ||||
| merged=p1_tracked, | p2_info=True, | ||||
| clean_p2=not p1_tracked, | |||||
| ) | ) | ||||
| if f1 != f2: # copy/rename | if f1 != f2: # copy/rename | ||||
| if move: | if move: | ||||
| repo.dirstate.update_file( | repo.dirstate.update_file( | ||||
| f1, p1_tracked=True, wc_tracked=False | f1, p1_tracked=True, wc_tracked=False | ||||
| ) | ) | ||||
| if f1 != f: | if f1 != f: | ||||
| repo.dirstate.copy(f1, f) | repo.dirstate.copy(f1, f) | ||||