This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11575

dirstatemap: use common code for set_possibly_dirty
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG743808de0c03: dirstatemap: use common code for set_possibly_dirty
Summary

Same logic before 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:25 PM
This revision is now accepted and ready to land.Oct 3 2021, 4:25 PM
marmoute added a commit: rHG743808de0c03: dirstatemap: use common code for set_possibly_dirty.Oct 3 2021, 5:33 PM
Closed by commit rHG743808de0c03: dirstatemap: use common code for set_possibly_dirty (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (16 lines)

Diff 30632

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_possibly_dirty(self, filename):
"""record that the current state of the file on disk is unknown"""
entry = self[filename]
entry.set_possibly_dirty()
self._refresh_entry(filename, entry)
def set_tracked(self, filename): def set_tracked(self, filename):
new = False new = False
entry = self.get(filename) entry = self.get(filename)
if entry is None: if entry is None:
self._dirs_incr(filename) self._dirs_incr(filename)
entry = DirstateItem( entry = DirstateItem(
p1_tracked=False, p1_tracked=False,
p2_tracked=False, p2_tracked=False,
def _refresh_entry(self, f, entry): def _refresh_entry(self, f, entry):
if not entry.any_tracked: if not entry.any_tracked:
self._map.pop(f, None) self._map.pop(f, None)
def _insert_entry(self, f, entry): def _insert_entry(self, f, entry):
self._map[f] = entry self._map[f] = entry
def set_possibly_dirty(self, filename):
"""record that the current state of the file on disk is unknown"""
self[filename].set_possibly_dirty()
def set_clean(self, filename, mode, size, mtime): def set_clean(self, filename, mode, size, mtime):
"""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)
if not entry.any_tracked: if not entry.any_tracked:
self._map.drop_item_and_copy_source(f) self._map.drop_item_and_copy_source(f)
else: else:
self._map.addfile(f, entry) self._map.addfile(f, entry)
def _insert_entry(self, f, entry): def _insert_entry(self, f, entry):
self._map.addfile(f, entry) self._map.addfile(f, entry)
def set_possibly_dirty(self, filename):
"""record that the current state of the file on disk is unknown"""
entry = self[filename]
entry.set_possibly_dirty()
self._map.set_dirstate_item(filename, entry)
def set_clean(self, filename, mode, size, mtime): def set_clean(self, filename, mode, size, mtime):
"""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._map.set_dirstate_item(filename, entry) self._map.set_dirstate_item(filename, entry)
self._map.copymap().pop(filename, None) self._map.copymap().pop(filename, None)