git/diffcore-pickaxe.c, branch v2.3.8

pickaxe: simplify kwset loop in contains()

2014-03-24T22:13:17Z

Inlining the variable "found" actually makes the code shorter and easier to read. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

pickaxe: call strlen only when necessary in diffcore_pickaxe_count()

2014-03-24T22:13:17Z

We need to determine the search term's length only when fixed-string matching is used; regular expression compilation takes a NUL-terminated string directly. Only call strlen() in the former case. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

pickaxe: move pickaxe() after pickaxe_match()

2014-03-24T22:13:10Z

pickaxe() calls pickaxe_match(); moving the definition of the former after the latter allows us to do without an explicit function declaration. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()

2014-03-24T22:12:45Z

diffcore_pickaxe_count() initializes the regular expression or kwset for the search term, calls pickaxe() with the callback has_changes() and cleans up afterwards. diffcore_pickaxe_grep() does the same, only it doesn't support kwset and uses the callback diff_grep() instead. Merge the two functions to form the new diffcore_pickaxe() and thus get rid of the duplicate regex setup and cleanup code. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

pickaxe: honor -i when used with -S and --pickaxe-regex

2014-03-24T22:12:45Z

accccde4 (pickaxe: allow -i to search in patch case-insensitively) allowed case-insenitive matching for -G and -S, but for the latter only if fixed string matching is used. Allow it for -S and regular expression matching as well to make the support complete. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'rs/pickaxe-simplify'

2013-07-12T19:04:17Z

* rs/pickaxe-simplify: diffcore-pickaxe: simplify has_changes and contains

diffcore-pickaxe: simplify has_changes and contains

2013-07-07T17:24:11Z

Halve the number of callsites of contains() to two using temporary variables, simplifying the code. While at it, get rid of the diff_options parameter, which became unused with 8fa4b09f. Signed-off-by: René Scharfe Acked-by: Jeff King Signed-off-by: Junio C Hamano

diffcore-pickaxe: make error messages more consistent

2013-06-03T17:50:22Z

Currently, diffcore-pickaxe reports two distinct errors for the same user error: $ git log --pickaxe-regex -S'\1' fatal: invalid pickaxe regex: Invalid back reference $ git log -G'\1' fatal: invalid log-grep regex: Invalid back reference This "log-grep" was only an internal name for the -G feature during development, and invite confusion with "git log --grep=". Change the error messages to say "invalid regex". Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

diffcore-pickaxe: unify code for log -S/-G

2013-04-05T17:31:09Z

The logic flow of has_changes() used for "log -S" and diff_grep() used for "log -G" are essentially the same. See if we have both sides that could be different in any interesting way, slurp the contents in core, possibly after applying textconv, inspect the contents, clean-up and report the result. The only difference between the two is how "inspect" step works. Unify this codeflow in a helper, pickaxe_match(), which takes a callback function that implements the specific "inspect" step. After removing the common scaffolding code from the existing has_changes() and diff_grep(), they each becomes such a callback function suitable for passing to pickaxe_match(). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

diffcore-pickaxe: fix leaks in "log -S" and "log -G"

2013-04-05T17:31:09Z

The diff_grep() and has_changes() functions had early return codepaths for unmerged filepairs, which simply returned 0. When we taught textconv filter to them, one was ignored and continued to return early without freeing the result filtered by textconv, and the other had a failed attempt to fix, which allowed the planned return value 0 to be overwritten by a bogus call to contains(). Signed-off-by: Junio C Hamano