delta/git.git/diffcore-pickaxe.c, branch jc/pack-objects

pickaxe: use textconv for -S counting

2012-10-28T12:48:17+00:00

We currently just look at raw blob data when using "-S" to
pickaxe. This is mostly historical, as pickaxe predates the
textconv feature. If the user has bothered to define a
textconv filter, it is more likely that their search string will be
on the textconv output, as that is what they will see in the
diff (and we do not even provide a mechanism for them to
search for binary needles that contain NUL characters).

This patch teaches "-S" to use textconv, just as we
already do for "-G".

Signed-off-by: Jeff King

pickaxe: hoist empty needle check

2012-10-28T12:48:09+00:00

If we are given an empty pickaxe needle like "git log -S ''",
it is impossible for us to find anything (because no matter
what the content, the count will always be 0). We currently
check this at the lowest level of contains(). Let's hoist
the logic much earlier to has_changes(), so that it is
simpler to return our answer before loading any blob data.

Signed-off-by: Jeff King

diff_grep: use textconv buffers for add/deleted files

2012-10-28T11:59:44+00:00

If you use "-G" to grep a diff, we will apply a configured
textconv filter to the data before generating the diff.
However, if the diff is an addition or deletion, we do not
bother running the diff at all, and just look for the token
in the added (or removed) content. This works because we
know that the diff must contain every line of content.

However, while we used the textconv-derived buffers in the
regular diff, we accidentally passed the original unmodified
buffers to regexec when checking the added or removed
content. This could lead to an incorrect answer.

Worse, in some cases we might have a textconv buffer but no
original buffer (e.g., if we pulled the textconv data from
cache, or if we reused a working tree file when generating
it). In that case, we could actually feed NULL to regexec
and segfault.

Reported-by: Peter Oberndorfer 
Signed-off-by: Jeff King

pickaxe: allow -i to search in patch case-insensitively

2012-02-29T00:15:29+00:00

"git log -S" is a useful way to find the last commit in the
codebase that touched the . As it was designed to be used by a
porcelain script to dig the history starting from a block of text that
appear in the starting commit, it never had to look for anything but an
exact match.

When used by an end user who wants to look for the last commit that
removed a string (e.g. name of a variable) that he vaguely remembers,
however, it is useful to support case insensitive match.

When given the "--regexp-ignore-case" (or "-i") option, which originally
was designed to affect case sensitivity of the search done in the commit
log part, e.g. "log --grep", the matches made with -S/-G pickaxe search is
done case insensitively now.

Signed-off-by: Junio C Hamano

pickaxe: factor out pickaxe

2011-10-07T22:46:14+00:00

Move the duplicate diff queue loop into its own function that accepts
a match function: has_changes() for -S and diff_grep() for -G.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

pickaxe: give diff_grep the same signature as has_changes

2011-10-07T22:46:14+00:00

Change diff_grep() to match the signature of has_changes() as a
preparation for the next patch that will use function pointers to
the two.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

pickaxe: pass diff_options to contains and has_changes

2011-10-07T22:46:13+00:00

Remove the unused parameter needle from contains() and has_changes().

Also replace the parameter len with a pointer to the diff_options.  We
can use its member pickaxe to check if the needle is an empty string
and use the kwsmatch structure to find out the length of the match
instead.

This change is done as a preparation to unify the signatures of
has_changes() and diff_grep(), which will be used in the patch after
the next one to factor out common code.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

pickaxe: factor out has_changes

2011-10-07T22:46:13+00:00

Move duplicate if/else construct into its own helper function.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

pickaxe: plug regex/kws leak

2011-10-07T22:46:13+00:00

With -S... --pickaxe-all, free the regex or the kws before returning
even if we found a match.  Also get rid of the variable has_changes,
as we can simply break out of the loop.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

pickaxe: plug regex leak

2011-10-07T22:46:13+00:00

With -G... --pickaxe-all, free the regex before returning even if we
found a match.  Also get rid of the variable has_changes, as we can
simply break out of the loop.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano