Mercurial > hg
diff tests/test-fileset.t @ 40782:3984409e144b
match: drop unnecessary wrapping of regex in group
It seems the regexes have been wrapped in an unnamed group since
b6c42714d900 (Add locate command., 2005-07-05). In that commit, the
grouping was needed because there was a "head" ('^') added before the
group and a "tail" (os.sep) added after it. It seems the head was
moved inside the group in 1c0c413cccdd (Get add and locate to use new
repo and dirstate walk code., 2005-07-18) and the tail was moved
inside the group in 89985a1b3427 (Clean up walk and changes code to
use normalised names properly., 2005-07-31), So it seems to me that
we've carried around the unnecessary group for 13 years. This patch
removes it.
Differential Revision: https://phab.mercurial-scm.org/D5352
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 02 Dec 2018 13:09:46 -0800 |
parents | e79a69af1593 |
children | 0a0bad6d7ac0 |
line wrap: on
line diff
--- a/tests/test-fileset.t Sun Dec 02 13:45:20 2018 -0800 +++ b/tests/test-fileset.t Sun Dec 02 13:09:46 2018 -0800 @@ -19,18 +19,18 @@ $ fileset -v a1 (symbol 'a1') * matcher: - <patternmatcher patterns='(?:a1$)'> + <patternmatcher patterns='a1$'> a1 $ fileset -v 'a*' (symbol 'a*') * matcher: - <patternmatcher patterns='(?:a[^/]*$)'> + <patternmatcher patterns='a[^/]*$'> a1 a2 $ fileset -v '"re:a\d"' (string 're:a\\d') * matcher: - <patternmatcher patterns='(?:a\\d)'> + <patternmatcher patterns='a\\d'> a1 a2 $ fileset -v '!re:"a\d"' @@ -41,7 +41,7 @@ * matcher: <predicatenmatcher pred=<not - <patternmatcher patterns='(?:a\\d)'>>> + <patternmatcher patterns='a\\d'>>> b1 b2 $ fileset -v 'path:a1 or glob:b?' @@ -53,7 +53,7 @@ (symbol 'glob') (symbol 'b?'))) * matcher: - <patternmatcher patterns='(?:a1(?:/|$)|b.$)'> + <patternmatcher patterns='a1(?:/|$)|b.$'> a1 b1 b2 @@ -196,7 +196,7 @@ (string 'b')))) * matcher: <unionmatcher matchers=[ - <patternmatcher patterns='(?:a1$|a2$)'>, + <patternmatcher patterns='a1$|a2$'>, <intersectionmatcher m1=<predicatenmatcher pred=clean>, m2=<predicatenmatcher pred=grep('b')>>]> @@ -216,7 +216,7 @@ (symbol 'path') (symbol 'b1'))) * matcher: - <patternmatcher patterns='(?:a1$|a2$|b1(?:/|$))'> + <patternmatcher patterns='a1$|a2$|b1(?:/|$)'> a1 a2 b1 @@ -237,7 +237,7 @@ (string 'b'))) * matcher: <unionmatcher matchers=[ - <patternmatcher patterns='(?:a1$|b2$)'>, + <patternmatcher patterns='a1$|b2$'>, <predicatenmatcher pred=grep('a')>, <predicatenmatcher pred=grep('b')>]> a1 @@ -254,8 +254,8 @@ (symbol 'a1')) * matcher: <differencematcher - m1=<patternmatcher patterns='(?:a[^/]*$)'>, - m2=<patternmatcher patterns='(?:a1$)'>> + m1=<patternmatcher patterns='a[^/]*$'>, + m2=<patternmatcher patterns='a1$'>> a2 $ fileset -p optimized -s '!binary() and a*' @@ -267,7 +267,7 @@ None)) * matcher: <differencematcher - m1=<patternmatcher patterns='(?:a[^/]*$)'>, + m1=<patternmatcher patterns='a[^/]*$'>, m2=<predicatenmatcher pred=binary>> a1 a2 @@ -286,8 +286,8 @@ (symbol 'a1')) * matcher: <differencematcher - m1=<patternmatcher patterns='(?:a[^/]*$)'>, - m2=<patternmatcher patterns='(?:a1$)'>> + m1=<patternmatcher patterns='a[^/]*$'>, + m2=<patternmatcher patterns='a1$'>> a2 $ fileset -p analyzed -p optimized -s 'binary() - a*' @@ -309,7 +309,7 @@ <intersectionmatcher m1=<predicatenmatcher pred=<not - <patternmatcher patterns='(?:a[^/]*$)'>>>, + <patternmatcher patterns='a[^/]*$'>>>, m2=<predicatenmatcher pred=binary>> Test files status @@ -551,7 +551,7 @@ None)) * matcher: <intersectionmatcher - m1=<patternmatcher patterns='(?:b[^/]*$)'>, + m1=<patternmatcher patterns='b[^/]*$'>, m2=<predicatenmatcher pred=binary>> bin