D6224: overlayworkingctx: remove misleading trailing slash from directory pattern
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Apr 12 08:38:09 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG976f069e0ad6: overlayworkingctx: remove misleading trailing slash from directory pattern (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6224?vs=14707&id=14710
REVISION DETAIL
https://phab.mercurial-scm.org/D6224
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
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([path + '/'], default=b'path')
+ match = self.match([path], default=b'path')
matches = self.p1().manifest().matches(match)
mfiles = matches.keys()
if len(mfiles) > 0:
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list