This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11574

dirstatemap: use a common implement for set_tracked
ClosedPublic

Authored by marmoute on Oct 2 2021, 11:05 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa39192fc7c56: dirstatemap: use a common implement for set_tracked
Summary

Same logic as for set_untracked this make sure both implementation use the
same logic for this.

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, 11:05 AM
Alphare accepted this revision.Oct 3 2021, 4:23 PM
This revision is now accepted and ready to land.Oct 3 2021, 4:23 PM
marmoute added a commit: rHGa39192fc7c56: dirstatemap: use a common implement for set_tracked.Oct 3 2021, 5:33 PM
Closed by commit rHGa39192fc7c56: dirstatemap: use a common implement for set_tracked (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (76 lines)

Diff 30631

mercurial/dirstatemap.py

def _insert_entry(self, f, entry): def _insert_entry(self, f, entry):
"""add a new dirstate entry (or replace an unrelated one) """add a new dirstate entry (or replace an unrelated one)
The fact it is actually new is the responsability of the caller The fact it is actually new is the responsability of the caller
""" """
### method to manipulate the entries ### method to manipulate the entries
def set_tracked(self, filename):
new = False
entry = self.get(filename)
if entry is None:
self._dirs_incr(filename)
entry = DirstateItem(
p1_tracked=False,
p2_tracked=False,
wc_tracked=True,
merged=False,
clean_p1=False,
clean_p2=False,
possibly_dirty=False,
parentfiledata=None,
)
self._insert_entry(filename, entry)
new = True
elif not entry.tracked:
self._dirs_incr(filename, entry)
entry.set_tracked()
self._refresh_entry(filename, entry)
new = True
else:
# XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future.
entry.set_possibly_dirty()
self._refresh_entry(filename, entry)
return new
def set_untracked(self, f): def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map""" """Mark a file as no longer tracked in the dirstate map"""
entry = self.get(f) entry = self.get(f)
if entry is None: if entry is None:
return False return False
else: else:
self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added) self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
if not entry.merged: if not entry.merged:
merged=merged, merged=merged,
clean_p1=clean_p1, clean_p1=clean_p1,
clean_p2=clean_p2, clean_p2=clean_p2,
possibly_dirty=possibly_dirty, possibly_dirty=possibly_dirty,
parentfiledata=parentfiledata, parentfiledata=parentfiledata,
) )
self._map[filename] = entry self._map[filename] = entry
def set_tracked(self, filename):
new = False
entry = self.get(filename)
if entry is None:
self._dirs_incr(filename)
entry = DirstateItem(
p1_tracked=False,
p2_tracked=False,
wc_tracked=True,
merged=False,
clean_p1=False,
clean_p2=False,
possibly_dirty=False,
parentfiledata=None,
)
self._map[filename] = entry
new = True
elif not entry.tracked:
self._dirs_incr(filename, entry)
entry.set_tracked()
new = True
else:
# XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future.
self.set_possibly_dirty(filename)
return new
if rustmod is not None: if rustmod is not None:
class dirstatemap(_dirstatemapcommon): class dirstatemap(_dirstatemapcommon):
def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2): def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
super(dirstatemap, self).__init__( super(dirstatemap, self).__init__(
ui, opener, root, nodeconstants, use_dirstate_v2 ui, opener, root, nodeconstants, use_dirstate_v2
) )
msg = b'failed to pass parentfiledata for a normal file: %s' msg = b'failed to pass parentfiledata for a normal file: %s'
msg %= filename msg %= filename
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
mode, size, mtime = parentfiledata mode, size, mtime = parentfiledata
self.addfile(filename, mode=mode, size=size, mtime=mtime) self.addfile(filename, mode=mode, size=size, mtime=mtime)
else: else:
assert False, 'unreachable' assert False, 'unreachable'
def set_tracked(self, filename):
new = False
entry = self.get(filename)
if entry is None:
self.addfile(filename, added=True)
new = True
elif not entry.tracked:
entry.set_tracked()
self._map.set_dirstate_item(filename, entry)
new = True
else:
# XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future.
self.set_possibly_dirty(filename)
return new
### Legacy method we need to get rid of ### Legacy method we need to get rid of
def addfile( def addfile(
self, self,
f, f,
mode=0, mode=0,
size=None, size=None,
mtime=None, mtime=None,