user/sven/git.git/diff.c, branch v1.4.1.1

diff.c: fix get_patch_id()

2006-06-29T05:49:42Z

The function internally generated diff to get the patch id but passed a wrong emit flags to the xdiff layer when it did so. Signed-off-by: Junio C Hamano

add diff_flush_patch_id() to calculate the patch id

2006-06-26T21:44:03Z

Call it like this: unsigned char id[20]; if (diff_flush_patch_id(diff_options, id)) printf("And the patch id is: %s\n", sha1_to_hex(id)); Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'jc/diff'

2006-06-26T21:36:02Z

* jc/diff: diff --color: use $GIT_DIR/config

Merge branch 'js/diff'

2006-06-26T21:28:42Z

* js/diff: Teach diff about -b and -w flags

diff --color: use $GIT_DIR/config

2006-06-25T07:39:13Z

This lets you use something like this in your $GIT_DIR/config file. [diff] color = auto [diff.color] new = blue old = yellow frag = reverse When diff.color is set to "auto", colored diff is enabled when the standard output is the terminal. Other choices are "always", and "never". Usual boolean true/false can also be used. The colormap entries can specify colors for the following slots: plain - lines that appear in both old and new file (context) meta - diff --git header and extended git diff headers frag - @@ -n,m +l,k @@ lines (hunk header) old - lines deleted from old file new - lines added to new file The following color names can be used: normal, bold, dim, l, blink, reverse, reset, black, red, green, yellow, blue, magenta, cyan, white Signed-off-by: Junio C Hamano

Clean up diff.c

2006-06-25T03:16:55Z

Signed-off-by: Timo Hirvonen Signed-off-by: Junio C Hamano

diff --color: use reset sequence when we mean reset.

2006-06-24T11:24:34Z

Signed-off-by: Junio C Hamano

Teach diff about -b and -w flags

2006-06-24T00:35:27Z

This adds -b (--ignore-space-change) and -w (--ignore-all-space) flags to diff. The main part of the patch is teaching libxdiff about it. [jc: renamed xdl_line_match() to xdl_recmatch() since the former is used for different purposes in xpatchi.c which is in the parts of the upstream source we do not use.] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Tweak diff colors

2006-06-22T22:08:36Z

This patch does: - always reset the color _before_ printing out the newline. This is actually important. You (and Johannes) didn't see it, because it only matters if you set the background, but if you don't do this, you get some random and funky behaviour if you pick a color with a non-default background (which still potentially has problems with tabs etc, but less so). - allow people to have a different color for the "file headers" (DIFF_METAINFO) and for the "fragment header" (DIFF_FRAGINFO). Also, make a difference between "normal color" and "reset colors" - default to red/green for old/new lines. That's the norm, I'd think. - instead of that eye-popping (and eye-ball-with-a-fondue-fork-popping) purple color for metadata, use bold-face for file headers, and cyan for the frag headers. I actually prefer the "gray background" for that, but it only works well in xterms, so COLOR_CYAN it is.. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Merge branch 'ff/c99' into next

2006-06-21T10:51:59Z

* ff/c99: Remove all void-pointer arithmetic.