This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5361

rebase: fix path auditing to audit path relative to repo root (issue5818)
ClosedPublic

Authored by martinvonz on Dec 3 2018, 5:10 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1c8c54cf9725: rebase: fix path auditing to audit path relative to repo root (issue5818)
Summary

Before this patch, when rebasing a file called "foo/bar", we would
check e.g. if "/foo" (i.e. rooted at the file system root) was a
symlink.

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.Dec 3 2018, 5:10 PM
yuja added a subscriber: yuja.Dec 4 2018, 7:11 AM
Before this patch, when rebasing a file called "foo/bar", we would
check e.g. if "/foo" (i.e. rooted at the file system root) was a
symlink. That's clearly not what we meant to do. I haven't added a
test case because I don't know to test it.

This probably fixes the issue5818.

https://bz.mercurial-scm.org/show_bug.cgi?id=5818

    1. Test the other direction -- that this path from p2 isn't a directory
  • # in p1 (test that p1 doesn't any paths matching path/*).
  • match = matchmod.match('/', '', [path + '/'], default=b'relpath')

+ # in p1 (test that p1 doesn't have any paths matching path/*).
+ match = self.match(pats=[path + '/'], default=b'relpath')

'relpath' means relative to cwd. It should be default=b'path' or simply
scmutil.matchfiles().

martinvonz added a comment.Dec 4 2018, 12:00 PM
In D5361#79583, @yuja wrote:
Before this patch, when rebasing a file called "foo/bar", we would
check e.g. if "/foo" (i.e. rooted at the file system root) was a
symlink. That's clearly not what we meant to do. I haven't added a
test case because I don't know to test it.

This probably fixes the issue5818.

Oh, I had not noticed that issue. I should be able to create a test case based on that. Thanks!

https://bz.mercurial-scm.org/show_bug.cgi?id=5818

    1. Test the other direction -- that this path from p2 isn't a directory
  • # in p1 (test that p1 doesn't any paths matching path/*).
  • match = matchmod.match('/', '', [path + '/'], default=b'relpath')

+ # in p1 (test that p1 doesn't have any paths matching path/*).
+ match = self.match(pats=[path + '/'], default=b'relpath')

'relpath' means relative to cwd. It should be default=b'path'

Good point. I'll fix that.

or simply
scmutil.matchfiles().

I don't think that will work because we want to match files in <path>/** here, not <path> itself.

martinvonz edited the summary of this revision. (Show Details)Dec 4 2018, 12:02 PM
martinvonz retitled this revision from rebase: fix path auditing to audit path relative to repo root to rebase: fix path auditing to audit path relative to repo root (issue5818).
martinvonz updated this revision to Diff 12699.
Closed by commit rHG1c8c54cf9725: rebase: fix path auditing to audit path relative to repo root (issue5818) (authored by martinvonz). · Explain WhyDec 4 2018, 5:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (4 lines)
Mtests/test-rebase-inmemory.t (3 lines)

Diff 12704

mercurial/context.py

# is not a file in p1. # is not a file in p1.
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 any paths matching `path/*`). # in p1 (test that p1 doesn't have any paths matching `path/*`).
match = matchmod.match('/', '', [path + '/'], default=b'relpath') match = self.match(pats=[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:

tests/test-rebase-inmemory.t

$ hg up -q '.^' $ hg up -q '.^'
$ touch ".$TESTTMP/lib/c" $ touch ".$TESTTMP/lib/c"
$ hg add ".$TESTTMP/lib/c" $ hg add ".$TESTTMP/lib/c"
$ hg ci -m 'c' $ hg ci -m 'c'
created new head created new head
$ hg rebase -s 1 -d . $ hg rebase -s 1 -d .
rebasing 1:* "b" (glob) rebasing 1:* "b" (glob)
abort: path '*/lib/b' traverses symbolic link '*/lib' (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-rebase.hg (glob)
[255]
$ cd .. $ cd ..
Test dry-run rebasing Test dry-run rebasing
$ hg init repo3 $ hg init repo3
$ cd repo3 $ cd repo3
$ echo a>a $ echo a>a
$ hg ci -Aqma $ hg ci -Aqma