At the time the move coloring was implemented we thought an enum of modes
is the best to configure this feature. However as we want to tack on new
features, the enum would grow exponentially.
Refactor the code such that features are enabled via bits. Currently we can
* activate the move detection,
* enable the block detection on top, and
* enable the dimming inside a block, though this could be done without
block detection as well (mode "plain, dimmed")
Choose the flags to not be at bit position 2,3,4 as the next patch
will occupy these.
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
diff.c | 27 ++++++++++++++-------------
diff.h | 17 ++++++++++-------
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/diff.c b/diff.c
index 879b8a5d9d..2052a43f7a 100644
--- a/diff.c
+++ b/diff.c
@@ -260,7 +260,7 @@ static int parse_color_moved(const char *arg)
{
switch (git_parse_maybe_bool(arg)) {
case 0:
- return COLOR_MOVED_NO;
+ return 0;
case 1:
return COLOR_MOVED_DEFAULT;
default:
@@ -268,15 +268,17 @@ static int parse_color_moved(const char *arg)
}
if (!strcmp(arg, "no"))
- return COLOR_MOVED_NO;
+ return 0;
else if (!strcmp(arg, "plain"))
- return COLOR_MOVED_PLAIN;
+ return COLOR_MOVED_ENABLED;
else if (!strcmp(arg, "zebra"))
- return COLOR_MOVED_ZEBRA;
+ return COLOR_MOVED_ENABLED | COLOR_MOVED_FIND_BLOCKS;
else if (!strcmp(arg, "default"))
return COLOR_MOVED_DEFAULT;
else if (!strcmp(arg, "dimmed_zebra"))
- return COLOR_MOVED_ZEBRA_DIM;
+ return COLOR_MOVED_ENABLED |
+ COLOR_MOVED_FIND_BLOCKS |
+ COLOR_MOVED_DIMMED_BLOCKS;
else
return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'"));
}
@@ -794,7 +796,7 @@ static int shrink_potential_moved_blocks(struct moved_entry **pmb,
}
/*
- * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
+ * If o->color_moved is not set to find blocks, this function does nothing.
*
* Otherwise, if the last block has fewer alphanumeric characters than
* COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
@@ -809,7 +811,7 @@ static int shrink_potential_moved_blocks(struct moved_entry **pmb,
static void adjust_last_block(struct diff_options *o, int n, int block_length)
{
int i, alnum_count = 0;
- if (o->color_moved == COLOR_MOVED_PLAIN)
+ if (!(o->color_moved & COLOR_MOVED_FIND_BLOCKS))
return;
for (i = 1; i < block_length + 1; i++) {
const char *c = o->emitted_symbols->buf[n - i].line;
@@ -868,7 +870,7 @@ static void mark_color_as_moved(struct diff_options *o,
l->flags |= DIFF_SYMBOL_MOVED_LINE;
- if (o->color_moved == COLOR_MOVED_PLAIN)
+ if (!(o->color_moved & COLOR_MOVED_FIND_BLOCKS))
continue;
/* Check any potential block runs, advance each or nullify */
@@ -4697,12 +4699,11 @@ int diff_opt_parse(struct diff_options *options,
else if (!strcmp(arg, "--no-color"))
options->use_color = 0;
else if (!strcmp(arg, "--color-moved")) {
- if (diff_color_moved_default)
- options->color_moved = diff_color_moved_default;
- if (options->color_moved == COLOR_MOVED_NO)
+ options->color_moved = diff_color_moved_default;
+ if (!options->color_moved)
options->color_moved = COLOR_MOVED_DEFAULT;
} else if (!strcmp(arg, "--no-color-moved"))
- options->color_moved = COLOR_MOVED_NO;
+ options->color_moved = 0;
else if (skip_prefix(arg, "--color-moved=", &arg)) {
int cm = parse_color_moved(arg);
if (cm < 0)
@@ -5543,7 +5544,7 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
add_lines_to_move_detection(o, &add_lines, &del_lines);
mark_color_as_moved(o, &add_lines, &del_lines);
- if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
+ if (o->color_moved & COLOR_MOVED_DIMMED_BLOCKS)
dim_moved_lines(o);
hashmap_free(&add_lines, 0);
diff --git a/diff.h b/diff.h
index d29560f822..9542017986 100644
--- a/diff.h
+++ b/diff.h
@@ -205,13 +205,16 @@ struct diff_options {
int diff_path_counter;
struct emitted_diff_symbols *emitted_symbols;
- enum {
- COLOR_MOVED_NO = 0,
- COLOR_MOVED_PLAIN = 1,
- COLOR_MOVED_ZEBRA = 2,
- COLOR_MOVED_ZEBRA_DIM = 3,
- } color_moved;
- #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
+ unsigned color_moved;
+
+ #define COLOR_MOVED_ENABLED (1 << 0)
+
+ #define COLOR_MOVED_FIND_BLOCKS (1 << 1)
+ /* XDF_WHITESPACE_FLAGS regarding block detection are set at 2, 3, 4 */
+
+ #define COLOR_MOVED_DIMMED_BLOCKS (1 << 23)
+
+ #define COLOR_MOVED_DEFAULT (COLOR_MOVED_ENABLED | COLOR_MOVED_FIND_BLOCKS)
#define COLOR_MOVED_MIN_ALNUM_COUNT 20
};
--
2.17.0.484.g0c8726318c-goog
