This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6224

overlayworkingctx: remove misleading trailing slash from directory pattern
ClosedPublic

Authored by martinvonz on Apr 10 2019, 8:50 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG976f069e0ad6: overlayworkingctx: remove misleading trailing slash from directory pattern
Summary

The paths passed into the matcher are normalized (this applies to
include patterns and regular patterns, and to both glob kind and path
kind), so the regex for input "foo/" ended up being "foo(?:/|$)".

Once we have a (recursive) pattern kind only for directories, we could
switch to that here and remove the "mfiles[0] == path" check. Until
then, let's at least make it not misleading.

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.

Event Timeline

martinvonz created this revision.Apr 10 2019, 8:50 PM
pulkit accepted this revision.Apr 12 2019, 8:19 AM
Closed by commit rHG976f069e0ad6: overlayworkingctx: remove misleading trailing slash from directory pattern (authored by martinvonz). · Explain WhyApr 12 2019, 8:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)

Diff 14710

mercurial/context.py

components = path.split('/') components = path.split('/')
for i in pycompat.xrange(len(components)): for i in pycompat.xrange(len(components)):
component = "/".join(components[0:i]) component = "/".join(components[0:i])
if component in self: if component in self:
fail(path, component) fail(path, component)
# Test the other direction -- that this path from p2 isn't a directory # Test the other direction -- that this path from p2 isn't a directory
# in p1 (test that p1 doesn't have any paths matching `path/*`). # in p1 (test that p1 doesn't have any paths matching `path/*`).
match = self.match([path + '/'], default=b'path') match = self.match([path], default=b'path')
matches = self.p1().manifest().matches(match) matches = self.p1().manifest().matches(match)
mfiles = matches.keys() mfiles = matches.keys()
if len(mfiles) > 0: if len(mfiles) > 0:
if len(mfiles) == 1 and mfiles[0] == path: if len(mfiles) == 1 and mfiles[0] == path:
return return
# omit the files which are deleted in current IMM wctx # omit the files which are deleted in current IMM wctx
mfiles = [m for m in mfiles if m in self] mfiles = [m for m in mfiles if m in self]
if not mfiles: if not mfiles: