This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11075

dirstate: add a `update_file` function
ClosedPublic

Authored by marmoute on Jul 11 2021, 7:38 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe2e72daac90b: dirstate: add a `update_file` function
Summary

This function is the other side of the set_tracked/set_untracked API revamp.
It is to be used when the dirstate is changing its parents during and update or
a merge. It states all the information we know about the file so that the
dirstate can update its internal data.

Unlike the set_tracked/set_untracked it has not regards for the information
previously tracked in the tristate.

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.Jul 11 2021, 7:38 AM
Alphare added a subscriber: Alphare.Jul 12 2021, 5:51 AM
Alphare added inline comments.
mercurial/dirstate.py
516

There seems to be no explanation for this in the commit message.

570

Think of how nice this would look in a match clause. ;)

marmoute planned changes to this revision.Jul 12 2021, 5:54 AM
marmoute added inline comments.
mercurial/dirstate.py
516

This shouldn't be dropped actually.

570

😇

marmoute updated this revision to Diff 29206.Jul 12 2021, 5:56 AM
Alphare requested changes to this revision.Jul 12 2021, 5:57 AM
This revision now requires changes to proceed.Jul 12 2021, 5:57 AM
Alphare accepted this revision.Jul 15 2021, 10:23 AM
This revision is now accepted and ready to land.Jul 15 2021, 10:23 AM
marmoute added a commit: rHGe2e72daac90b: dirstate: add a `update_file` function.Jul 15 2021, 12:57 PM
Closed by commit rHGe2e72daac90b: dirstate: add a `update_file` function (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (56 lines)

Diff 29289

mercurial/dirstate.py

"""Set a file as tracked in the parent (or not) """Set a file as tracked in the parent (or not)
This is to be called when adjust the dirstate to a new parent after an history This is to be called when adjust the dirstate to a new parent after an history
rewriting operation. rewriting operation.
It should not be called during a merge (p2 != nullid) and only within It should not be called during a merge (p2 != nullid) and only within
a `with dirstate.parentchange():` context. a `with dirstate.parentchange():` context.
""" """
if self.in_merge: if self.in_merge:
AlphareUnsubmitted
Not Done

There seems to be no explanation for this in the commit message.

Alphare: There seems to be no explanation for this in the commit message.
marmouteAuthorUnsubmitted
Done

This shouldn't be dropped actually.

marmoute: This shouldn't be dropped actually.
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
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) self.normallookup(filename)
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 not entry.added:
self._add(filename) self._add(filename)
elif p1_tracked and not wc_tracked: elif p1_tracked and not wc_tracked:
if entry is None or not entry.removed: if entry is None or not entry.removed:
self._remove(filename) self._remove(filename)
else: else:
assert False, 'unreachable' assert False, 'unreachable'
@requires_parents_change
def update_file(
self,
filename,
wc_tracked,
p1_tracked,
p2_tracked=False,
merged=False,
clean_p1=False,
clean_p2=False,
possibly_dirty=False,
):
"""update the information about a file in the dirstate
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.
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
depending of what information ends up being relevant and useful to
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):
msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
raise error.ProgrammingError(msg)
assert not (merged and (clean_p1 or clean_p1))
if not (p1_tracked or p2_tracked or wc_tracked):
AlphareUnsubmitted
Not Done

Think of how nice this would look in a match clause. ;)

Alphare: Think of how nice this would look in a `match` clause. ;)
marmouteAuthorUnsubmitted
Done

😇

marmoute: 😇
self._drop(filename)
elif merged:
assert wc_tracked
if not self.in_merge:
self.normallookup(filename)
self.otherparent(filename)
elif not (p1_tracked or p2_tracked) and wc_tracked:
self._addpath(filename, added=True, possibly_dirty=possibly_dirty)
self._map.copymap.pop(filename, None)
elif (p1_tracked or p2_tracked) and not wc_tracked:
self._remove(filename)
elif clean_p2 and wc_tracked:
assert p2_tracked
self.otherparent(filename)
elif not p1_tracked and p2_tracked and wc_tracked:
self._addpath(filename, from_p2=True, possibly_dirty=possibly_dirty)
self._map.copymap.pop(filename, None)
elif possibly_dirty:
self._addpath(filename, possibly_dirty=possibly_dirty)
elif wc_tracked:
self.normal(filename)
# XXX We need something for file that are dirty after an update
else:
assert False, 'unreachable'
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,