git/t/t4018-diff-funcname.sh, branch v1.6.3

t4018-diff-funcname: add cpp xfuncname pattern to syntax test

2009-05-06T05:49:02Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-10-17T08:52:32Z

* maint: t1301-shared-repo.sh: don't let a default ACL interfere with the test git-check-attr(1): add output and example sections xdiff-interface.c: strip newline (and cr) from line before pattern matching t4018-diff-funcname: demonstrate end of line funcname matching flaw t4018-diff-funcname: rework negated last expression test Typo "does not exists" when git remote update remote. remote.c: correct the check for a leading '/' in a remote name Add testcase to ensure merging an early part of a branch is done properly Conflicts: t/t7600-merge.sh

xdiff-interface.c: strip newline (and cr) from line before pattern matching

2008-10-16T15:31:56Z

POSIX doth sayeth: "In the regular expression processing described in IEEE Std 1003.1-2001, the is regarded as an ordinary character and both a period and a non-matching list can match one. ... Those utilities (like grep) that do not allow s to match are responsible for eliminating any from strings before matching against the RE." Thus far git has not been removing the trailing newline from strings matched against regular expression patterns. This has the effect that (quoting Jonathan del Strother) "... a line containing just 'FUNCNAME' (terminated by a newline) will be matched by the pattern '^(FUNCNAME.$)' but not '^(FUNCNAME$)'", and more simply not '^FUNCNAME$'. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

t4018-diff-funcname: demonstrate end of line funcname matching flaw

2008-10-16T15:31:56Z

Since the newline is not removed from lines before pattern matching, a pattern cannot match to the end of the line using the '$' operator without using an additional operator which will indirectly match the '\n' character. Introduce a test which should pass, but which does not due to this flaw. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t4018-diff-funcname: rework negated last expression test

2008-10-16T15:31:56Z

This test used the non-zero exit status of 'git diff' to indicate that a negated funcname pattern, when placed last, was correctly rejected. The problem with this is that 'git diff' always returns non-zero if it finds differences in the files it is comparing, and the files must contain differences in order to trigger the funcname pattern codepath. Instead of checking for non-zero exit status, make sure the expected error message is printed. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t4018-diff-funcname: add objective-c xfuncname pattern to syntax test

2008-10-14T23:49:13Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t4018-diff-funcname: test syntax of builtin xfuncname patterns

2008-09-23T08:48:49Z

[jc: fixes bibtex pattern breakage exposed by this test] Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t4018-diff-funcname: test syntax of builtin xfuncname patterns

2008-09-23T02:59:23Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

diff.*.xfuncname which uses "extended" regex's for hunk header selection

2008-09-19T03:06:31Z

Currently, the hunk headers produced by 'diff -p' are customizable by setting the diff.*.funcname option in the config file. The 'funcname' option takes a basic regular expression. This functionality was designed using the GNU regex library which, by default, allows using backslashed versions of some extended regular expression operators, even in Basic Regular Expression mode. For example, the following characters, when backslashed, are interpreted according to the extended regular expression rules: ?, +, and |. As such, the builtin funcname patterns were created using some extended regular expression operators. Other platforms which adhere more strictly to the POSIX spec do not interpret the backslashed extended RE operators in Basic Regular Expression mode. This causes the pattern matching for the builtin funcname patterns to fail on those platforms. Introduce a new option 'xfuncname' which uses extended regular expressions, and advertise it _instead_ of funcname. Since most users are on GNU platforms, the majority of funcname patterns are created and tested there. Advertising only xfuncname should help to avoid the creation of non-portable patterns which work with GNU regex but not elsewhere. Additionally, the extended regular expressions may be less ugly and complicated compared to the basic RE since many common special operators do not need to be backslashed. For example, the GNU Basic RE: ^[ ]*\$\\(public\\|static\$.*\\)$ becomes the following Extended RE: ^[ ]*((public|static).*)$ Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Use compatibility regex library for OSX/Darwin

2008-09-10T20:36:40Z

The standard libc regex library on OSX does not support alternation in POSIX Basic Regular Expression mode. This breaks the diff.funcname functionality on OSX. To fix this, we use the GNU regex library which is already present in the compat/ diretory for the MinGW port. However, simply adding compat/ to the COMPAT_CFLAGS variable causes a conflict between the system fnmatch.h and the one present in compat/. To remedy this, move the regex and fnmatch functionality to their own subdirectories in compat/ so they can be included seperately. Signed-off-by: Arjen Laarhoven Tested-by: Mike Ralphson (AIX) Tested-by: Johannes Sixt (MinGW) Signed-off-by: Junio C Hamano