1c8c54cf9725 — Martin von Zweigbergk 4.8.1 5 years ago 
rebase: fix path auditing to audit path relative to repo root (issue5818)

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.

Differential Revision: https://phab.mercurial-scm.org/D5361
patch browse 
2 files changed, 3 insertions(+), 4 deletions(-)

M mercurial/context.py
M tests/test-rebase-inmemory.t

M mercurial/context.py +2 -2
@@ 1848,8 1848,8 @@ class overlayworkingctx(committablectx):
                 fail(path, component)
 
         # 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'path')
         matches = self.p1().manifest().matches(match)
         mfiles = matches.keys()
         if len(mfiles) > 0:

          
M tests/test-rebase-inmemory.t +1 -2
@@ 279,8 279,7 @@ Test path auditing (issue5818)
   created new head
   $ hg rebase -s 1 -d .
   rebasing 1:* "b" (glob)
-  abort: path '*/lib/b' traverses symbolic link '*/lib' (glob)
-  [255]
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-rebase.hg (glob)
   $ cd ..
 
 Test dry-run rebasing