overlayworkingctx: fix file/dir audit to be repo-relative
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 10 Apr 2019 17:31:32 -0700
changeset 42101 f4b1f5537d4c
parent 42100 b63b8b7ca5fa
child 42102 976f069e0ad6
overlayworkingctx: fix file/dir audit to be repo-relative 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. Differential Revision: https://phab.mercurial-scm.org/D6223
mercurial/context.py
--- a/mercurial/context.py	Wed Apr 10 16:26:40 2019 -0700
+++ b/mercurial/context.py	Wed Apr 10 17:31:32 2019 -0700
@@ -1954,7 +1954,7 @@
 
         # 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/*`).
-        match = self.match(include=[path + '/'], default=b'path')
+        match = self.match([path + '/'], default=b'path')
         matches = self.p1().manifest().matches(match)
         mfiles = matches.keys()
         if len(mfiles) > 0: