This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6223

overlayworkingctx: fix file/dir audit to be repo-relative
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf4b1f5537d4c: overlayworkingctx: fix file/dir audit to be repo-relative
Summary

Before this patch, test-rebase-inmemory.t would stop erroring out
about the conflict if you added a "cd a" before line 252. That was
because a glob matcher (which are relative) was unintentionally
used. That happened because the matcher was given "include" patterns
(not regular patterns), and "include" patterns are always glob by
default (i.e. unless you write them including the kind prefix). IOW,
the "default='path'" argument passed to ctx.match() was ignored.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)

Diff 14706

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(include=[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: