This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8997

git: make dirstate status() respect matcher
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0c6b2cc9a7bb: git: make dirstate status() respect matcher
rHGabb6feb38447: git: make dirstate status() respect matcher
Summary

As with other changes in this stack, we appear to have been getting
lucky in the past. An upcoming change behaved _very_ oddly without
this fix.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mhgext/git/dirstate.py (2 lines)

Diff 22562

hgext/git/dirstate.py

[], [],
[], [],
[], [],
[], [],
) )
gstatus = self.git.status() gstatus = self.git.status()
for path, status in gstatus.items(): for path, status in gstatus.items():
path = pycompat.fsencode(path) path = pycompat.fsencode(path)
if not match(path):
continue
if status == pygit2.GIT_STATUS_IGNORED: if status == pygit2.GIT_STATUS_IGNORED:
if path.endswith(b'/'): if path.endswith(b'/'):
continue continue
ignored.append(path) ignored.append(path)
elif status in ( elif status in (
pygit2.GIT_STATUS_WT_MODIFIED, pygit2.GIT_STATUS_WT_MODIFIED,
pygit2.GIT_STATUS_INDEX_MODIFIED, pygit2.GIT_STATUS_INDEX_MODIFIED,
pygit2.GIT_STATUS_WT_MODIFIED pygit2.GIT_STATUS_WT_MODIFIED