This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7437

commit: rewrite check for `hg ci <path>` being a directory
ClosedPublic

Authored by martinvonz on Nov 15 2019, 7:34 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7f443cce2972: commit: rewrite check for `hg ci <path>` being a directory
Summary

The matcher API is complicated by match.bad, match.explicitdir, and
match.traversedir. We already have very few users of
match.explicitdir. By rewriting this check we get close to being able
to remove match.explicitdir.

This may make the check slower, but I think that will be very
marginal.

Disclosure: I actually wrote this patch to solve a bug we've seen with
an internal extension. The internal extension overrides the dirstate
walk to only walk the files that our FUSE tells us are modified. That
led to "vdirs" not getting populated as this code expected. I have
wanted to get rid of match.explicitdir for a very long time, though.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (3 lines)

Diff 18172

mercurial/localrepo.py

matched = set(status.modified + status.added + status.removed) matched = set(status.modified + status.added + status.removed)
for f in match.files(): for f in match.files():
f = self.dirstate.normalize(f) f = self.dirstate.normalize(f)
if f == b'.' or f in matched or f in wctx.substate: if f == b'.' or f in matched or f in wctx.substate:
continue continue
if f in status.deleted: if f in status.deleted:
fail(f, _(b'file not found!')) fail(f, _(b'file not found!'))
if f in vdirs: # visited directory # Is it a directory that exists or used to exist?
if self.wvfs.isdir(f) or wctx.p1().hasdir(f):
d = f + b'/' d = f + b'/'
for mf in matched: for mf in matched:
if mf.startswith(d): if mf.startswith(d):
break break
else: else:
fail(f, _(b"no match under directory!")) fail(f, _(b"no match under directory!"))
elif f not in self.dirstate: elif f not in self.dirstate:
fail(f, _(b"file not tracked!")) fail(f, _(b"file not tracked!"))