Code

xdiff: Show function names in hunk headers.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 28 Mar 2006 02:23:31 +0000 (03:23 +0100)
committerJunio C Hamano <junkio@cox.net>
Tue, 28 Mar 2006 02:43:51 +0000 (18:43 -0800)
commitacb725772964ee11656543a28c303e9aa6d092c5
treef2b53ddc3d0b5640819a4c6d10ee6c6c6d4ee37e
parent9c48666aa0745c666593bb7383e17f78c43eb36d
xdiff: Show function names in hunk headers.

The speed of the built-in diff generator is nice; but the function names
shown by `diff -p' are /really/ nice.  And I hate having to choose.  So,
we hack xdiff to find the function names and print them.

xdiff has grown a flag to say whether to dig up the function names.  The
builtin_diff function passes this flag unconditionally.  I suppose it
could parse GIT_DIFF_OPTS, but it doesn't at the moment.  I've also
reintroduced the `function name' into the test suite, from which it was
removed in commit 3ce8f089.

The function names are parsed by a particularly stupid algorithm at the
moment: it just tries to find a line in the `old' file, from before the
start of the hunk, whose first character looks plausible.  Still, it's
most definitely a start.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff.c
t/t4001-diff-rename.sh
xdiff/xdiff.h
xdiff/xemit.c
xdiff/xinclude.h
xdiff/xutils.c
xdiff/xutils.h