Patchwork D5999: context: use includematcher when checking dir/file conflicts

login
register
mail settings
Submitter phabricator
Date Feb. 22, 2019, 5:51 a.m.
Message ID <39311ce3adc324992df2d742c7f6fcd1@localhost.localdomain>
Download mbox | patch
Permalink /patch/38872/
State Not Applicable
Headers show

Comments

phabricator - Feb. 22, 2019, 5:51 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGcd7059d17cb2: context: use includematcher when checking dir/file conflicts (authored by spectral, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5999?vs=14182&id=14189

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

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1951,7 +1951,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(pats=[path + '/'], default=b'path')
+        match = self.match(include=[path + '/'], default=b'path')
         matches = self.p1().manifest().matches(match)
         mfiles = matches.keys()
         if len(mfiles) > 0: