mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jt/diff-color-move-fix'

Browse Source 
A handful of bugfixes and an improvement to "diff --color-moved".

* jt/diff-color-move-fix:
  diff: define block by number of alphanumeric chars
  diff: respect MIN_BLOCK_LENGTH for last block
  diff: avoid redundantly clearing a flag
This commit is contained in:
Junio C Hamano
2017-08-26 22:55:04 -07:00
parent b6c4058f97 f0b8fb6e59
commit 0b96358479
4 changed files with 236 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
diff.c
View File

@ -855,6 +855,38 @@ static int shrink_potential_moved_blocks(struct moved_entry **pmb,
return rp + 1;
}
/*
* If o->color_moved is COLOR_MOVED_PLAIN, 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
* that block.
*
* The last block consists of the (n - block_length)'th line up to but not
* including the nth line.
*
* NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
* Think of a way to unify them.
*/
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)
return;
for (i = 1; i < block_length + 1; i++) {
const char *c = o->emitted_symbols->buf[n - i].line;
for (; *c; c++) {
if (!isalnum(*c))
continue;
alnum_count++;
if (alnum_count >= COLOR_MOVED_MIN_ALNUM_COUNT)
return;
}
}
for (i = 1; i < block_length + 1; i++)
o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
}
/* Find blocks of moved code, delegate actual coloring decision to helper */
static void mark_color_as_moved(struct diff_options *o,
struct hashmap *add_lines,
@ -890,20 +922,13 @@ static void mark_color_as_moved(struct diff_options *o,
}
if (!match) {
if (block_length < COLOR_MOVED_MIN_BLOCK_LENGTH &&
o->color_moved != COLOR_MOVED_PLAIN) {
for (i = 0; i < block_length + 1; i++) {
l = &o->emitted_symbols->buf[n - i];
l->flags &= ~DIFF_SYMBOL_MOVED_LINE;
}
}
adjust_last_block(o, n, block_length);
pmb_nr = 0;
block_length = 0;
continue;
}
l->flags |= DIFF_SYMBOL_MOVED_LINE;
block_length++;
if (o->color_moved == COLOR_MOVED_PLAIN)
continue;
@ -933,11 +958,17 @@ static void mark_color_as_moved(struct diff_options *o,
}
flipped_block = (flipped_block + 1) % 2;
adjust_last_block(o, n, block_length);
block_length = 0;
}
block_length++;
if (flipped_block)
l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
}
adjust_last_block(o, n, block_length);
free(pmb);
}