>> * sb/diff-color-move-more (2018-04-25) 7 commits
>...
>>
>> Will merge to 'next'.
>
>I did not get around to fix it up, there are still review
>comments outstanding. (The test is broken in the last commit.)
This is a reroll of sb/diff-color-move-more, with the test fixed as well
as another extra patch, that would have caught the bad test.
The range diff is below.
Thanks,
Stefan
Stefan Beller (8):
xdiff/xdiff.h: remove unused flags
xdiff/xdiffi.c: remove unneeded function declarations
diff.c: do not pass diff options as keydata to hashmap
diff.c: adjust hash function signature to match hashmap expectation
diff.c: add a blocks mode for moved code detection
diff.c: decouple white space treatment from move detection algorithm
diff.c: add --color-moved-ignore-space-delta option
diff: color-moved white space handling options imply color-moved
Documentation/diff-options.txt | 25 ++++-
diff.c | 138 +++++++++++++++++++----
diff.h | 8 +-
t/t4015-diff-whitespace.sh | 197 +++++++++++++++++++++++++++++++--
xdiff/xdiff.h | 8 --
xdiff/xdiffi.c | 17 ---
6 files changed, 336 insertions(+), 57 deletions(-)
--
2.17.0.582.gccdcbd54c44.dirty
1: a7a7af6b76b = 1: a7a7af6b76b xdiff/xdiff.h: remove unused flags
2: a7b6aaf7bc0 = 2: a7b6aaf7bc0 xdiff/xdiffi.c: remove unneeded function
declarations
3: d9e57cc6b05 = 3: d9e57cc6b05 diff.c: do not pass diff options as keydata
to hashmap
4: 87111ba726d = 4: 87111ba726d diff.c: adjust hash function signature to
match hashmap expectation
5: 9559b8cb456 = 5: 9559b8cb456 diff.c: add a blocks mode for moved code
detection
6: 41a70464209 = 6: 41a70464209 diff.c: decouple white space treatment from
move detection algorithm
7: c0114b2ce56 ! 7: 72bb8213cab diff.c: add --color-moved-ignore-space-delta
option
@@ -6,7 +6,6 @@
changes uniformly.
Signed-off-by: Stefan Beller <sbel...@google.com>
- Signed-off-by: Junio C Hamano <gits...@pobox.com>
diff --git a/Documentation/diff-options.txt
b/Documentation/diff-options.txt
--- a/Documentation/diff-options.txt
@@ -237,7 +236,7 @@
+ not adjust
+ EOF
+
-+ git diff --color --color-moved-ignore-space-prefix-delta |
++ git diff --color --color-moved --color-moved-ignore-space-prefix-delta |
+ grep -v "index" |
+ test_decode_color >actual &&
+
@@ -246,20 +245,20 @@
+ <BOLD>--- a/text.txt<RESET>
+ <BOLD>+++ b/text.txt<RESET>
+ <CYAN>@@ -1,7 +1,7 @@<RESET>
-+ <RED>-QIndented<RESET>
-+ <RED>-QText across<RESET>
-+ <RED>-Qthree lines<RESET>
++ <BOLD;MAGENTA>-QIndented<RESET>
++ <BOLD;MAGENTA>-QText across<RESET>
++ <BOLD;MAGENTA>-Qthree lines<RESET>
+ <RED>-QBut! <- this stands out<RESET>
-+ <RED>-Qthis one<RESET>
-+ <RED>-QQline did<RESET>
-+ <RED>-Qnot adjust<RESET>
-+ <GREEN>+<RESET>QQ<GREEN>Indented<RESET>
-+ <GREEN>+<RESET>QQ<GREEN>Text across<RESET>
-+ <GREEN>+<RESET>QQ<GREEN>three lines<RESET>
++ <BOLD;MAGENTA>-Qthis one<RESET>
++ <BOLD;MAGENTA>-QQline did<RESET>
++ <BOLD;MAGENTA>-Qnot adjust<RESET>
++ <BOLD;YELLOW>+<RESET>QQ<BOLD;YELLOW>Indented<RESET>
++ <BOLD;YELLOW>+<RESET>QQ<BOLD;YELLOW>Text across<RESET>
++ <BOLD;YELLOW>+<RESET>QQ<BOLD;YELLOW>three lines<RESET>
+ <GREEN>+<RESET>QQQ<GREEN>But! <- this stands out<RESET>
-+ <GREEN>+<RESET><GREEN>this one<RESET>
-+ <GREEN>+<RESET>Q<GREEN>line did<RESET>
-+ <GREEN>+<RESET><GREEN>not adjust<RESET>
++ <BOLD;YELLOW>+<RESET><BOLD;YELLOW>this one<RESET>
++ <BOLD;YELLOW>+<RESET>Q<BOLD;YELLOW>line did<RESET>
++ <BOLD;YELLOW>+<RESET><BOLD;YELLOW>not adjust<RESET>
+ EOF
+
+ test_cmp expected actual
-: ----------- > 8: 9e0508c8381 diff: color-moved white space handling
options imply color-moved
