( )⚙ D11535 dirstate-item: use item's property instead of `state` in addremove

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11535

dirstate-item: use item's property instead of `state` in addremove
ClosedPublic

Authored by marmoute on Oct 1 2021, 5:39 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGba79d99ec1ae: dirstate-item: use item's property instead of `state` in addremove

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (12 lines)

Diff 30534

mercurial/scmutil.py

walkresults = dirstate.walk( walkresults = dirstate.walk(
matcher, matcher,
subrepos=sorted(ctx.substate), subrepos=sorted(ctx.substate),
unknown=True, unknown=True,
ignored=False, ignored=False,
full=False, full=False,
) )
for abs, st in pycompat.iteritems(walkresults): for abs, st in pycompat.iteritems(walkresults):
dstate = dirstate[abs] entry = dirstate.get_entry(abs)
if dstate == b'?' and audit_path.check(abs): if (not entry.any_tracked) and audit_path.check(abs):
unknown.append(abs) unknown.append(abs)
elif dstate != b'r' and not st: elif (not entry.removed) and not st:
deleted.append(abs) deleted.append(abs)
elif dstate == b'r' and st: elif entry.removed and st:
forgotten.append(abs) forgotten.append(abs)
# for finding renames # for finding renames
elif dstate == b'r' and not st: elif entry.removed and not st:
removed.append(abs) removed.append(abs)
elif dstate == b'a': elif entry.added:
added.append(abs) added.append(abs)
return added, unknown, deleted, removed, forgotten return added, unknown, deleted, removed, forgotten
def _findrenames(repo, matcher, added, removed, similarity, uipathfn): def _findrenames(repo, matcher, added, removed, similarity, uipathfn):
'''Find renames from removed files to added ones.''' '''Find renames from removed files to added ones.'''
renames = {} renames = {}