( )⚙ D11584 dirstate: narrow gathering of parent data

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11584

dirstate: narrow gathering of parent data
ClosedPublic

Authored by marmoute on Oct 2 2021, 8:25 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG42ab0bcb6ded: dirstate: narrow gathering of parent data
Summary

The parent data are only going to be useful is the file might be clean. And it
might only be clean if it is tracked in both p1 and the working copy.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Oct 2 2021, 8:25 PM
Alphare accepted this revision.Oct 3 2021, 5:09 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:09 PM
marmoute added a commit: rHG42ab0bcb6ded: dirstate: narrow gathering of parent data.Oct 3 2021, 5:33 PM
Closed by commit rHG42ab0bcb6ded: dirstate: narrow gathering of parent data (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (5 lines)

Diff 30643

mercurial/dirstate.py

# the file is no longer relevant to anyone # the file is no longer relevant to anyone
if self._map.get(filename) is not None: if self._map.get(filename) is not None:
self._map.reset_state(filename) self._map.reset_state(filename)
self._dirty = True self._dirty = True
elif (not p1_tracked) and wc_tracked: elif (not p1_tracked) and wc_tracked:
if entry is not None and entry.added: if entry is not None and entry.added:
return # avoid dropping copy information (maybe?) return # avoid dropping copy information (maybe?)
# 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 parentfiledata = None
if wc_tracked: if wc_tracked and p1_tracked:
parentfiledata = self._get_filedata(filename) parentfiledata = self._get_filedata(filename)
self._map.reset_state( self._map.reset_state(
filename, filename,
wc_tracked, wc_tracked,
p1_tracked, p1_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.