( )⚙ D11569 dirstatemap: small rework of the `set_untracked` method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11569

dirstatemap: small rework of the `set_untracked` method
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG08e04bb0bff3: dirstatemap: small rework of the `set_untracked` method
Summary

This shuffle the code a bit to have it flowing more "naturally". This will help
us to create a common version of this code in the next changesets.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (5 lines)

Diff 30557

mercurial/dirstatemap.py

"""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:
self.copymap.pop(f, None) self.copymap.pop(f, None)
if entry.added:
self._map.pop(f, None)
else:
entry.set_untracked() entry.set_untracked()
if not entry.any_tracked:
self._map.pop(f, None)
return True return True
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__(