This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11437

dirstate: drop dirstatemap.addfile
ClosedPublic

Authored by marmoute on Sep 16 2021, 10:45 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG70547a7d5930: dirstate: drop dirstatemap.addfile
Summary

All users have been migrated.

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.Sep 16 2021, 10:45 AM
Alphare accepted this revision.Sep 20 2021, 9:46 AM
This revision is now accepted and ready to land.Sep 20 2021, 9:46 AM
marmoute added a commit: rHG70547a7d5930: dirstate: drop dirstatemap.addfile.Sep 20 2021, 10:08 AM
Closed by commit rHG70547a7d5930: dirstate: drop dirstatemap.addfile (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (45 lines)

Diff 30319

mercurial/dirstatemap.py

"""mark a file as back to a clean state""" """mark a file as back to a clean state"""
entry = self[filename] entry = self[filename]
mtime = mtime & rangemask mtime = mtime & rangemask
size = size & rangemask size = size & rangemask
entry.set_clean(mode, size, mtime) entry.set_clean(mode, size, mtime)
self.copymap.pop(filename, None) self.copymap.pop(filename, None)
self.nonnormalset.discard(filename) self.nonnormalset.discard(filename)
def addfile(
self,
f,
mode=0,
size=None,
mtime=None,
added=False,
merged=False,
from_p2=False,
possibly_dirty=False,
):
"""Add a tracked file to the dirstate."""
if added:
assert not merged
assert not possibly_dirty
assert not from_p2
new_entry = DirstateItem.new_added()
self.copymap.pop(f, None)
elif merged:
assert not possibly_dirty
assert not from_p2
new_entry = DirstateItem.new_merged()
elif from_p2:
assert not possibly_dirty
new_entry = DirstateItem.new_from_p2()
elif possibly_dirty:
new_entry = DirstateItem.new_possibly_dirty()
else:
assert size is not None
assert mtime is not None
size = size & rangemask
mtime = mtime & rangemask
new_entry = DirstateItem.new_normal(mode, size, mtime)
old_entry = self.get(f)
self._dirs_incr(f, old_entry)
self._map[f] = new_entry
if new_entry.dm_nonnormal:
self.nonnormalset.add(f)
else:
self.nonnormalset.discard(f)
if new_entry.dm_otherparent:
self.otherparentset.add(f)
else:
self.otherparentset.discard(f)
def reset_state( def reset_state(
self, self,
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,