This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8998

git: make dirstate actually support listclean parameter
ClosedPublic

Authored by durin42 on Sep 7 2020, 5:31 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG601e3658216d: git: make dirstate actually support listclean parameter
rHGb30c182e7c07: git: make dirstate actually support listclean parameter
Summary

As far as I can tell listignored and listunknown should already
work. I'm vexed that there doesn't seem to be a way to get clean files
out of the pygit2 status method, but this at least makes things work
better.

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
Mhgext/git/dirstate.py (15 lines)

Diff 22573

hgext/git/dirstate.py

def __contains__(self, filename): def __contains__(self, filename):
try: try:
gs = self.git.status_file(filename) gs = self.git.status_file(filename)
return _STATUS_MAP[gs] != b'?' return _STATUS_MAP[gs] != b'?'
except KeyError: except KeyError:
return False return False
def status(self, match, subrepos, ignored, clean, unknown): def status(self, match, subrepos, ignored, clean, unknown):
listignored, listclean, listunknown = ignored, clean, unknown
# TODO handling of clean files - can we get that from git.status()? # TODO handling of clean files - can we get that from git.status()?
modified, added, removed, deleted, unknown, ignored, clean = ( modified, added, removed, deleted, unknown, ignored, clean = (
[], [],
[], [],
[], [],
[], [],
[], [],
[], [],
deleted.append(path) deleted.append(path)
elif status == pygit2.GIT_STATUS_INDEX_DELETED: elif status == pygit2.GIT_STATUS_INDEX_DELETED:
removed.append(path) removed.append(path)
else: else:
raise error.Abort( raise error.Abort(
b'unhandled case: status for %r is %r' % (path, status) b'unhandled case: status for %r is %r' % (path, status)
) )
if listclean:
observed = set(modified + added + removed + deleted + unknown + ignored)
index = self.git.index
index.read()
for entry in index:
path = pycompat.fsencode(entry.path)
if not match(path):
continue
if path in observed:
continue # already in some other set
if path[-1] == b'/':
continue # directory
clean.append(path)
# TODO are we really always sure of status here? # TODO are we really always sure of status here?
return ( return (
False, False,
scmutil.status( scmutil.status(
modified, added, removed, deleted, unknown, ignored, clean modified, added, removed, deleted, unknown, ignored, clean
), ),
) )