14937c2c06
Add the option -W/--function-context to git diff. It is similar to the same option of git grep and expands the context of change hunks so that the whole surrounding function is shown. This "natural" context can allow changes to be understood better. Note: GNU patch doesn't like diffs generated with the new option; it seems to expect context lines to be the same before and after changes. git apply doesn't complain. This implementation has the same shortcoming as the one in grep, namely that there is no way to explicitly find the end of a function. That means that a few lines of extra context are shown, right up to the next recognized function begins. It's already useful in its current form, though. The function get_func_line() in xdiff/xemit.c is extended to work forward as well as backward to find post-context as well as pre-context. It returns the position of the first found matching line. The func_line parameter is made optional, as we don't need it for -W. The enhanced function is then used in xdl_emit_diff() to extend the context as needed. If the added context overlaps with the next change, it is merged into the current hunk. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
93 lines
1.2 KiB
Bash
93 lines
1.2 KiB
Bash
#!/bin/sh
|
|
|
|
test_description='diff function context'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
|
|
|
|
|
cat <<\EOF >hello.c
|
|
#include <stdio.h>
|
|
|
|
static int a(void)
|
|
{
|
|
/*
|
|
* Dummy.
|
|
*/
|
|
}
|
|
|
|
static int hello_world(void)
|
|
{
|
|
/* Classic. */
|
|
printf("Hello world.\n");
|
|
|
|
/* Success! */
|
|
return 0;
|
|
}
|
|
static int b(void)
|
|
{
|
|
/*
|
|
* Dummy, too.
|
|
*/
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
a();
|
|
b();
|
|
return hello_world();
|
|
}
|
|
EOF
|
|
|
|
test_expect_success 'setup' '
|
|
git add hello.c &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
|
|
grep -v Classic <hello.c >hello.c.new &&
|
|
mv hello.c.new hello.c
|
|
'
|
|
|
|
cat <<\EOF >expected
|
|
diff --git a/hello.c b/hello.c
|
|
--- a/hello.c
|
|
+++ b/hello.c
|
|
@@ -10,8 +10,7 @@ static int a(void)
|
|
static int hello_world(void)
|
|
{
|
|
- /* Classic. */
|
|
printf("Hello world.\n");
|
|
|
|
/* Success! */
|
|
return 0;
|
|
}
|
|
EOF
|
|
|
|
test_expect_success 'diff -U0 -W' '
|
|
git diff -U0 -W >actual &&
|
|
compare_diff_patch actual expected
|
|
'
|
|
|
|
cat <<\EOF >expected
|
|
diff --git a/hello.c b/hello.c
|
|
--- a/hello.c
|
|
+++ b/hello.c
|
|
@@ -9,9 +9,8 @@ static int a(void)
|
|
|
|
static int hello_world(void)
|
|
{
|
|
- /* Classic. */
|
|
printf("Hello world.\n");
|
|
|
|
/* Success! */
|
|
return 0;
|
|
}
|
|
EOF
|
|
|
|
test_expect_success 'diff -W' '
|
|
git diff -W >actual &&
|
|
compare_diff_patch actual expected
|
|
'
|
|
|
|
test_done
|