user/sven/git.git/diffcore-pickaxe.c, branch v1.5.6.4

War on whitespace

2007-06-07T07:04:01Z

This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano

diff -S: release the image after looking for needle in it

2007-05-07T22:54:32Z

Signed-off-by: Junio C Hamano

diffcore-pickaxe: fix infinite loop on zero-length needle

2007-01-26T05:17:19Z

The "contains" algorithm runs into an infinite loop if the needle string has zero length. The loop could be modified to handle this, but it makes more sense to simply have an empty needle return no matches. Thus, a command like git log -S produces no output. We place the check at the top of the function so that we get the same results with or without --pickaxe-regex. Note that until now, git log -S --pickaxe-regex would match everything, not nothing. Arguably, an empty pickaxe string should simply produce an error message; however, this is still a useful assertion to add to the algorithm at this layer of the code. Noticed by Bill Lear. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

simplify inclusion of system header files.

2006-12-20T17:51:35Z

This is a mechanical clean-up of the way *.c files include system header files. (1) sources under compat/, platform sha-1 implementations, and xdelta code are exempt from the following rules; (2) the first #include must be "git-compat-util.h" or one of our own header file that includes it first (e.g. config.h, builtin.h, pkt-line.h); (3) system headers that are included in "git-compat-util.h" need not be included in individual C source files. (4) "git-compat-util.h" does not have to include subsystem specific header files (e.g. expat.h). Signed-off-by: Junio C Hamano

On some platforms, certain headers need to be included before regex.h

2006-04-05T00:14:06Z

Happily, these are already included in cache.h, which is included anyway... so: change the order of includes. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Support for pickaxe matching regular expressions

2006-04-04T20:44:15Z

git-diff-* --pickaxe-regex will change the -S pickaxe to match POSIX extended regular expressions instead of fixed strings. The regex.h library is a rather stupid interface and I like pcre too, but with any luck it will be everywhere we will want to run Git on, it being POSIX.2 and all. I'm not sure if we can expect platforms like AIX to conform to POSIX.2 or if win32 has regex.h. We might add a flag to Makefile if there is a portability trouble potential. Signed-off-by: Petr Baudis

[PATCH] diffcore-pickaxe: switch to "counting" behaviour.

2005-07-24T03:27:49Z

Instead of finding old/new pair that one side has and the other side does not have the specified string, find old/new pair that contains the specified string as a substring different number of times. This would still not catch a case where you introduce two static variable declarations and remove two static function definitions from a file with -S"static", but would make it behave a bit more intuitively. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Do not include unused header files.

2005-05-29T18:42:29Z

Some source files were including "delta.h" without actually needing it. Remove them. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Optimize diff-tree -[CM] --stdin

2005-05-29T18:17:44Z

This attempts to optimize "diff-tree -[CM] --stdin", which compares successible tree pairs. This optimization does not make much sense for other commands in the diff-* brothers. When reading from --stdin and using rename/copy detection, the patch makes diff-tree to read the current index file first. This is done to reuse the optimization used by diff-cache in the non-cached case. Similarity estimator can avoid expanding a blob if the index says what is in the work tree has an exact copy of that blob already expanded. Another optimization the patch makes is to check only file sizes first to terminate similarity estimation early. In order for this to work, it needs a way to tell the size of the blob without expanding it. Since an obvious way of doing it, which is to keep all the blobs previously used in the memory, is too costly, it does so by keeping the filesize for each object it has already seen in memory. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Add --pickaxe-all to diff-* brothers.

2005-05-29T18:17:43Z

When --pickaxe-all is given in addition to -S, pickaxe shows the entire diffs contained in the changeset, not just the diffs for the filepair that touched the sought-after string. This is useful to see the changes in context. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds