Patchwork D6223: overlayworkingctx: fix file/dir audit to be repo-relative

login
register
mail settings
Submitter phabricator
Date April 12, 2019, 12:38 p.m.
Message ID <5c1114faa277ffb7a45c4fe1c13e9692@localhost.localdomain>
Download mbox | patch
Permalink /patch/39559/
State Not Applicable
Headers show

Comments

phabricator - April 12, 2019, 12:38 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf4b1f5537d4c: overlayworkingctx: fix file/dir audit to be repo-relative (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6223?vs=14706&id=14709

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

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -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: