This is a re-attempt of [1], which allows the moved code detection to
ignore blanks in various modes.
patches 1-5 are refactoring, patch 6 adds all existing white space options
of regular diff to the move detection. (I am unsure about this patch,
as I presume we want to keep the option space at a minimum if possible).
The fun is in the last patch, which allows white space sensitive
languages to trust the move detection, too. Each block that is marked as
moved will have the same delta in {in-, de-}dentation.
I would think this mode might be a reasonable default eventually.
Thanks,
Stefan
[1] https://public-inbox.org/git/[email protected]/
Stefan Beller (7):
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: refactor internal representation for coloring moved code
diff.c: decouple white space treatment for move detection from generic
option
diff.c: add --color-moved-ignore-space-delta option
Documentation/diff-options.txt | 13 ++
diff.c | 155 ++++++++++++---
diff.h | 18 +-
t/t4015-diff-whitespace.sh | 341 ++++++++++++++++++++++++++++++++-
xdiff/xdiff.h | 8 -
xdiff/xdiffi.c | 17 --
6 files changed, 483 insertions(+), 69 deletions(-)
--
2.17.0.484.g0c8726318c-goog
