mirror of
https://github.com/git/git.git
synced 2024-11-18 21:23:51 +01:00
Integrate wildmatch to git
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
Junio C Hamano
parent
327f2f3ebb
commit
feabcc173b
1
.gitignore
vendored
1
.gitignore
vendored
@ -193,6 +193,7 @@
|
||||
/test-sigchain
|
||||
/test-subprocess
|
||||
/test-svn-fe
|
||||
/test-wildmatch
|
||||
/common-cmds.h
|
||||
*.tar.gz
|
||||
*.dsc
|
||||
|
||||
3
Makefile
3
Makefile
@ -503,6 +503,7 @@ TEST_PROGRAMS_NEED_X += test-sha1
|
||||
TEST_PROGRAMS_NEED_X += test-sigchain
|
||||
TEST_PROGRAMS_NEED_X += test-subprocess
|
||||
TEST_PROGRAMS_NEED_X += test-svn-fe
|
||||
TEST_PROGRAMS_NEED_X += test-wildmatch
|
||||
|
||||
TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
|
||||
|
||||
@ -674,6 +675,7 @@ LIB_H += unpack-trees.h
|
||||
LIB_H += userdiff.h
|
||||
LIB_H += utf8.h
|
||||
LIB_H += varint.h
|
||||
LIB_H += wildmatch.h
|
||||
LIB_H += xdiff-interface.h
|
||||
LIB_H += xdiff/xdiff.h
|
||||
|
||||
@ -803,6 +805,7 @@ LIB_OBJS += userdiff.o
|
||||
LIB_OBJS += utf8.o
|
||||
LIB_OBJS += varint.o
|
||||
LIB_OBJS += walker.o
|
||||
LIB_OBJS += wildmatch.o
|
||||
LIB_OBJS += wrapper.o
|
||||
LIB_OBJS += write_or_die.o
|
||||
LIB_OBJS += ws.o
|
||||
|
||||
188
t/t3070-wildmatch.sh
Executable file
188
t/t3070-wildmatch.sh
Executable file
@ -0,0 +1,188 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='wildmatch tests'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
match() {
|
||||
if [ $1 = 1 ]; then
|
||||
test_expect_success "wildmatch: match '$3' '$4'" "
|
||||
test-wildmatch wildmatch '$3' '$4'
|
||||
"
|
||||
else
|
||||
test_expect_success "wildmatch: no match '$3' '$4'" "
|
||||
! test-wildmatch wildmatch '$3' '$4'
|
||||
"
|
||||
fi
|
||||
if [ $2 = 1 ]; then
|
||||
test_expect_success "fnmatch: match '$3' '$4'" "
|
||||
test-wildmatch fnmatch '$3' '$4'
|
||||
"
|
||||
elif [ $2 = 0 ]; then
|
||||
test_expect_success "fnmatch: no match '$3' '$4'" "
|
||||
! test-wildmatch fnmatch '$3' '$4'
|
||||
"
|
||||
# else
|
||||
# test_expect_success BROKEN_FNMATCH "fnmatch: '$3' '$4'" "
|
||||
# ! test-wildmatch fnmatch '$3' '$4'
|
||||
# "
|
||||
fi
|
||||
}
|
||||
|
||||
# Basic wildmat features
|
||||
match 1 1 foo foo
|
||||
match 0 0 foo bar
|
||||
match 1 1 '' ""
|
||||
match 1 1 foo '???'
|
||||
match 0 0 foo '??'
|
||||
match 1 1 foo '*'
|
||||
match 1 1 foo 'f*'
|
||||
match 0 0 foo '*f'
|
||||
match 1 1 foo '*foo*'
|
||||
match 1 1 foobar '*ob*a*r*'
|
||||
match 1 1 aaaaaaabababab '*ab'
|
||||
match 1 1 'foo*' 'foo\*'
|
||||
match 0 0 foobar 'foo\*bar'
|
||||
match 1 1 'f\oo' 'f\\oo'
|
||||
match 1 1 ball '*[al]?'
|
||||
match 0 0 ten '[ten]'
|
||||
match 1 1 ten '**[!te]'
|
||||
match 0 0 ten '**[!ten]'
|
||||
match 1 1 ten 't[a-g]n'
|
||||
match 0 0 ten 't[!a-g]n'
|
||||
match 1 1 ton 't[!a-g]n'
|
||||
match 1 1 ton 't[^a-g]n'
|
||||
match 1 1 'a]b' 'a[]]b'
|
||||
match 1 1 a-b 'a[]-]b'
|
||||
match 1 1 'a]b' 'a[]-]b'
|
||||
match 0 0 aab 'a[]-]b'
|
||||
match 1 1 aab 'a[]a-]b'
|
||||
match 1 1 ']' ']'
|
||||
|
||||
# Extended slash-matching features
|
||||
match 0 0 'foo/baz/bar' 'foo*bar'
|
||||
match 1 0 'foo/baz/bar' 'foo**bar'
|
||||
match 0 0 'foo/bar' 'foo?bar'
|
||||
match 0 0 'foo/bar' 'foo[/]bar'
|
||||
match 0 0 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
|
||||
match 1 1 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
|
||||
match 0 0 'foo' '**/foo'
|
||||
match 1 1 '/foo' '**/foo'
|
||||
match 1 0 'bar/baz/foo' '**/foo'
|
||||
match 0 0 'bar/baz/foo' '*/foo'
|
||||
match 0 0 'foo/bar/baz' '**/bar*'
|
||||
match 1 0 'deep/foo/bar/baz' '**/bar/*'
|
||||
match 0 0 'deep/foo/bar/baz/' '**/bar/*'
|
||||
match 1 0 'deep/foo/bar/baz/' '**/bar/**'
|
||||
match 0 0 'deep/foo/bar' '**/bar/*'
|
||||
match 1 0 'deep/foo/bar/' '**/bar/**'
|
||||
match 1 0 'foo/bar/baz' '**/bar**'
|
||||
match 1 0 'foo/bar/baz/x' '*/bar/**'
|
||||
match 0 0 'deep/foo/bar/baz/x' '*/bar/**'
|
||||
match 1 0 'deep/foo/bar/baz/x' '**/bar/*/*'
|
||||
|
||||
# Various additional tests
|
||||
match 0 0 'acrt' 'a[c-c]st'
|
||||
match 1 1 'acrt' 'a[c-c]rt'
|
||||
match 0 0 ']' '[!]-]'
|
||||
match 1 1 'a' '[!]-]'
|
||||
match 0 0 '' '\'
|
||||
match 0 0 '\' '\'
|
||||
match 0 0 '/\' '*/\'
|
||||
match 1 1 '/\' '*/\\'
|
||||
match 1 1 'foo' 'foo'
|
||||
match 1 1 '@foo' '@foo'
|
||||
match 0 0 'foo' '@foo'
|
||||
match 1 1 '[ab]' '\[ab]'
|
||||
match 1 1 '[ab]' '[[]ab]'
|
||||
match 1 1 '[ab]' '[[:]ab]'
|
||||
match 0 0 '[ab]' '[[::]ab]'
|
||||
match 1 1 '[ab]' '[[:digit]ab]'
|
||||
match 1 1 '[ab]' '[\[:]ab]'
|
||||
match 1 1 '?a?b' '\??\?b'
|
||||
match 1 1 'abc' '\a\b\c'
|
||||
match 0 0 'foo' ''
|
||||
match 1 0 'foo/bar/baz/to' '**/t[o]'
|
||||
|
||||
# Character class tests
|
||||
match 1 1 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
|
||||
match 0 0 'a' '[[:digit:][:upper:][:space:]]'
|
||||
match 1 1 'A' '[[:digit:][:upper:][:space:]]'
|
||||
match 1 0 '1' '[[:digit:][:upper:][:space:]]'
|
||||
match 0 0 '1' '[[:digit:][:upper:][:spaci:]]'
|
||||
match 1 1 ' ' '[[:digit:][:upper:][:space:]]'
|
||||
match 0 0 '.' '[[:digit:][:upper:][:space:]]'
|
||||
match 1 1 '.' '[[:digit:][:punct:][:space:]]'
|
||||
match 1 1 '5' '[[:xdigit:]]'
|
||||
match 1 1 'f' '[[:xdigit:]]'
|
||||
match 1 1 'D' '[[:xdigit:]]'
|
||||
match 1 0 '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
|
||||
match 1 0 '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
|
||||
match 1 1 '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
|
||||
match 1 1 '5' '[a-c[:digit:]x-z]'
|
||||
match 1 1 'b' '[a-c[:digit:]x-z]'
|
||||
match 1 1 'y' '[a-c[:digit:]x-z]'
|
||||
match 0 0 'q' '[a-c[:digit:]x-z]'
|
||||
|
||||
# Additional tests, including some malformed wildmats
|
||||
match 1 1 ']' '[\\-^]'
|
||||
match 0 0 '[' '[\\-^]'
|
||||
match 1 1 '-' '[\-_]'
|
||||
match 1 1 ']' '[\]]'
|
||||
match 0 0 '\]' '[\]]'
|
||||
match 0 0 '\' '[\]]'
|
||||
match 0 0 'ab' 'a[]b'
|
||||
match 0 1 'a[]b' 'a[]b'
|
||||
match 0 1 'ab[' 'ab['
|
||||
match 0 0 'ab' '[!'
|
||||
match 0 0 'ab' '[-'
|
||||
match 1 1 '-' '[-]'
|
||||
match 0 0 '-' '[a-'
|
||||
match 0 0 '-' '[!a-'
|
||||
match 1 1 '-' '[--A]'
|
||||
match 1 1 '5' '[--A]'
|
||||
match 1 1 ' ' '[ --]'
|
||||
match 1 1 '$' '[ --]'
|
||||
match 1 1 '-' '[ --]'
|
||||
match 0 0 '0' '[ --]'
|
||||
match 1 1 '-' '[---]'
|
||||
match 1 1 '-' '[------]'
|
||||
match 0 0 'j' '[a-e-n]'
|
||||
match 1 1 '-' '[a-e-n]'
|
||||
match 1 1 'a' '[!------]'
|
||||
match 0 0 '[' '[]-a]'
|
||||
match 1 1 '^' '[]-a]'
|
||||
match 0 0 '^' '[!]-a]'
|
||||
match 1 1 '[' '[!]-a]'
|
||||
match 1 1 '^' '[a^bc]'
|
||||
match 1 1 '-b]' '[a-]b]'
|
||||
match 0 0 '\' '[\]'
|
||||
match 1 1 '\' '[\\]'
|
||||
match 0 0 '\' '[!\\]'
|
||||
match 1 1 'G' '[A-\\]'
|
||||
match 0 0 'aaabbb' 'b*a'
|
||||
match 0 0 'aabcaa' '*ba*'
|
||||
match 1 1 ',' '[,]'
|
||||
match 1 1 ',' '[\\,]'
|
||||
match 1 1 '\' '[\\,]'
|
||||
match 1 1 '-' '[,-.]'
|
||||
match 0 0 '+' '[,-.]'
|
||||
match 0 0 '-.]' '[,-.]'
|
||||
match 1 1 '2' '[\1-\3]'
|
||||
match 1 1 '3' '[\1-\3]'
|
||||
match 0 0 '4' '[\1-\3]'
|
||||
match 1 1 '\' '[[-\]]'
|
||||
match 1 1 '[' '[[-\]]'
|
||||
match 1 1 ']' '[[-\]]'
|
||||
match 0 0 '-' '[[-\]]'
|
||||
|
||||
# Test recursion and the abort code (use "wildtest -i" to see iteration counts)
|
||||
match 1 1 '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
|
||||
match 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
|
||||
match 0 0 '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
|
||||
match 1 1 '/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' '/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
|
||||
match 0 0 '/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' '/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
|
||||
match 1 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
|
||||
match 0 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
|
||||
|
||||
test_done
|
||||
@ -1,165 +0,0 @@
|
||||
# Input is in the following format (all items white-space separated):
|
||||
#
|
||||
# The first two items are 1 or 0 indicating if the wildmat call is expected to
|
||||
# succeed and if fnmatch works the same way as wildmat, respectively. After
|
||||
# that is a text string for the match, and a pattern string. Strings can be
|
||||
# quoted (if desired) in either double or single quotes, as well as backticks.
|
||||
#
|
||||
# MATCH FNMATCH_SAME "text to match" 'pattern to use'
|
||||
|
||||
# Basic wildmat features
|
||||
1 1 foo foo
|
||||
0 1 foo bar
|
||||
1 1 '' ""
|
||||
1 1 foo ???
|
||||
0 1 foo ??
|
||||
1 1 foo *
|
||||
1 1 foo f*
|
||||
0 1 foo *f
|
||||
1 1 foo *foo*
|
||||
1 1 foobar *ob*a*r*
|
||||
1 1 aaaaaaabababab *ab
|
||||
1 1 foo* foo\*
|
||||
0 1 foobar foo\*bar
|
||||
1 1 f\oo f\\oo
|
||||
1 1 ball *[al]?
|
||||
0 1 ten [ten]
|
||||
1 1 ten **[!te]
|
||||
0 1 ten **[!ten]
|
||||
1 1 ten t[a-g]n
|
||||
0 1 ten t[!a-g]n
|
||||
1 1 ton t[!a-g]n
|
||||
1 1 ton t[^a-g]n
|
||||
1 1 a]b a[]]b
|
||||
1 1 a-b a[]-]b
|
||||
1 1 a]b a[]-]b
|
||||
0 1 aab a[]-]b
|
||||
1 1 aab a[]a-]b
|
||||
1 1 ] ]
|
||||
|
||||
# Extended slash-matching features
|
||||
0 1 foo/baz/bar foo*bar
|
||||
1 1 foo/baz/bar foo**bar
|
||||
0 1 foo/bar foo?bar
|
||||
0 1 foo/bar foo[/]bar
|
||||
0 1 foo/bar f[^eiu][^eiu][^eiu][^eiu][^eiu]r
|
||||
1 1 foo-bar f[^eiu][^eiu][^eiu][^eiu][^eiu]r
|
||||
0 1 foo **/foo
|
||||
1 1 /foo **/foo
|
||||
1 1 bar/baz/foo **/foo
|
||||
0 1 bar/baz/foo */foo
|
||||
0 0 foo/bar/baz **/bar*
|
||||
1 1 deep/foo/bar/baz **/bar/*
|
||||
0 1 deep/foo/bar/baz/ **/bar/*
|
||||
1 1 deep/foo/bar/baz/ **/bar/**
|
||||
0 1 deep/foo/bar **/bar/*
|
||||
1 1 deep/foo/bar/ **/bar/**
|
||||
1 1 foo/bar/baz **/bar**
|
||||
1 1 foo/bar/baz/x */bar/**
|
||||
0 0 deep/foo/bar/baz/x */bar/**
|
||||
1 1 deep/foo/bar/baz/x **/bar/*/*
|
||||
|
||||
# Various additional tests
|
||||
0 1 acrt a[c-c]st
|
||||
1 1 acrt a[c-c]rt
|
||||
0 1 ] [!]-]
|
||||
1 1 a [!]-]
|
||||
0 1 '' \
|
||||
0 1 \ \
|
||||
0 1 /\ */\
|
||||
1 1 /\ */\\
|
||||
1 1 foo foo
|
||||
1 1 @foo @foo
|
||||
0 1 foo @foo
|
||||
1 1 [ab] \[ab]
|
||||
1 1 [ab] [[]ab]
|
||||
1 1 [ab] [[:]ab]
|
||||
0 1 [ab] [[::]ab]
|
||||
1 1 [ab] [[:digit]ab]
|
||||
1 1 [ab] [\[:]ab]
|
||||
1 1 ?a?b \??\?b
|
||||
1 1 abc \a\b\c
|
||||
0 1 foo ''
|
||||
1 1 foo/bar/baz/to **/t[o]
|
||||
|
||||
# Character class tests
|
||||
1 1 a1B [[:alpha:]][[:digit:]][[:upper:]]
|
||||
0 1 a [[:digit:][:upper:][:space:]]
|
||||
1 1 A [[:digit:][:upper:][:space:]]
|
||||
1 1 1 [[:digit:][:upper:][:space:]]
|
||||
0 1 1 [[:digit:][:upper:][:spaci:]]
|
||||
1 1 ' ' [[:digit:][:upper:][:space:]]
|
||||
0 1 . [[:digit:][:upper:][:space:]]
|
||||
1 1 . [[:digit:][:punct:][:space:]]
|
||||
1 1 5 [[:xdigit:]]
|
||||
1 1 f [[:xdigit:]]
|
||||
1 1 D [[:xdigit:]]
|
||||
1 1 _ [[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]
|
||||
#1 1 … [^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]
|
||||
1 1 [^[:alnum:][:alpha:][:blank:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]
|
||||
1 1 . [^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]
|
||||
1 1 5 [a-c[:digit:]x-z]
|
||||
1 1 b [a-c[:digit:]x-z]
|
||||
1 1 y [a-c[:digit:]x-z]
|
||||
0 1 q [a-c[:digit:]x-z]
|
||||
|
||||
# Additional tests, including some malformed wildmats
|
||||
1 1 ] [\\-^]
|
||||
0 1 [ [\\-^]
|
||||
1 1 - [\-_]
|
||||
1 1 ] [\]]
|
||||
0 1 \] [\]]
|
||||
0 1 \ [\]]
|
||||
0 1 ab a[]b
|
||||
0 1 a[]b a[]b
|
||||
0 1 ab[ ab[
|
||||
0 1 ab [!
|
||||
0 1 ab [-
|
||||
1 1 - [-]
|
||||
0 1 - [a-
|
||||
0 1 - [!a-
|
||||
1 1 - [--A]
|
||||
1 1 5 [--A]
|
||||
1 1 ' ' '[ --]'
|
||||
1 1 $ '[ --]'
|
||||
1 1 - '[ --]'
|
||||
0 1 0 '[ --]'
|
||||
1 1 - [---]
|
||||
1 1 - [------]
|
||||
0 1 j [a-e-n]
|
||||
1 1 - [a-e-n]
|
||||
1 1 a [!------]
|
||||
0 1 [ []-a]
|
||||
1 1 ^ []-a]
|
||||
0 1 ^ [!]-a]
|
||||
1 1 [ [!]-a]
|
||||
1 1 ^ [a^bc]
|
||||
1 1 -b] [a-]b]
|
||||
0 1 \ [\]
|
||||
1 1 \ [\\]
|
||||
0 1 \ [!\\]
|
||||
1 1 G [A-\\]
|
||||
0 1 aaabbb b*a
|
||||
0 1 aabcaa *ba*
|
||||
1 1 , [,]
|
||||
1 1 , [\\,]
|
||||
1 1 \ [\\,]
|
||||
1 1 - [,-.]
|
||||
0 1 + [,-.]
|
||||
0 1 -.] [,-.]
|
||||
1 1 2 [\1-\3]
|
||||
1 1 3 [\1-\3]
|
||||
0 1 4 [\1-\3]
|
||||
1 1 \ [[-\]]
|
||||
1 1 [ [[-\]]
|
||||
1 1 ] [[-\]]
|
||||
0 1 - [[-\]]
|
||||
|
||||
# Test recursion and the abort code (use "wildtest -i" to see iteration counts)
|
||||
1 1 -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1 -*-*-*-*-*-*-12-*-*-*-m-*-*-*
|
||||
0 1 -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1 -*-*-*-*-*-*-12-*-*-*-m-*-*-*
|
||||
0 1 -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1 -*-*-*-*-*-*-12-*-*-*-m-*-*-*
|
||||
1 1 /adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1 /*/*/*/*/*/*/12/*/*/*/m/*/*/*
|
||||
0 1 /adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1 /*/*/*/*/*/*/12/*/*/*/m/*/*/*
|
||||
1 1 abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt **/*a*b*g*n*t
|
||||
0 1 abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz **/*a*b*g*n*t
|
||||
14
test-wildmatch.c
Normal file
14
test-wildmatch.c
Normal file
@ -0,0 +1,14 @@
|
||||
#include "cache.h"
|
||||
#include "wildmatch.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if (!strcmp(argv[1], "wildmatch"))
|
||||
return wildmatch(argv[3], argv[2]) ? 0 : 1;
|
||||
else if (!strcmp(argv[1], "iwildmatch"))
|
||||
return iwildmatch(argv[3], argv[2]) ? 0 : 1;
|
||||
else if (!strcmp(argv[1], "fnmatch"))
|
||||
return !!fnmatch(argv[3], argv[2], FNM_PATHNAME);
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
@ -9,7 +9,10 @@
|
||||
** work differently than '*', and to fix the character-class code.
|
||||
*/
|
||||
|
||||
#include "rsync.h"
|
||||
#include "cache.h"
|
||||
#include "wildmatch.h"
|
||||
|
||||
typedef unsigned char uchar;
|
||||
|
||||
/* What character marks an inverted character class? */
|
||||
#define NEGATE_CLASS '!'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user