# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1554942692 25200
# Node ID f4b1f5537d4cfa1d19d9afb1a22d463122cc0e1c
# Parent  b63b8b7ca5fad19a756045e49028463595de0560
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

diff -r b63b8b7ca5fa -r f4b1f5537d4c 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: