D5361: rebase: fix path auditing to audit path relative to repo root

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Tue Dec 4 12:00:12 EST 2018


martinvonz added a comment.


  In https://phab.mercurial-scm.org/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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5361

To: martinvonz, #hg-reviewers
Cc: yuja, mercurial-devel


More information about the Mercurial-devel mailing list