kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

xdl_change_compact(): only use heuristic if group can't be matched 

If the changed group of lines can be matched to a group in the other
file, then that positioning should take precedence over the compaction
heuristic.

The old code tried the heuristic unconditionally, which cost redundant
effort and also was broken if the matching code had already shifted the
group higher than the blank line.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2016-08-22 13:22:41 +02:00 committed by Junio C Hamano
parent a8fd78cc53
commit cb0eded863
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
xdiff/xdiffi.c
View File

@ -504,25 +504,25 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
} }
} while (grpsiz != ix - ixs); } while (grpsiz != ix - ixs);


/* if (ixref < ix) {
* Try to move back the possibly merged group of changes, to match /*
* the recorded position in the other file. * Try to move back the possibly merged group of changes, to match
*/ * the recorded position in the other file.
while (ixref < ix) { */
rchg[--ixs] = 1; while (ixref < ix) {
rchg[--ix] = 0; rchg[--ixs] = 1;
while (rchgo[--ixo]); rchg[--ix] = 0;
} while (rchgo[--ixo]);

}
/* } else if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {
* If a group can be moved back and forth, see if there is a /*
* blank line in the moving space. If there is a blank line, * The group can be slid up to make its last line a
* make sure the last blank line is the end of the group. * blank line. Do so.
* *
* As we already shifted the group forward as far as possible * As we already shifted the group forward as far as
* in the earlier loop, we need to shift it back only if at all. * possible in the earlier loop, we need to shift it
*/ * back only if at all.
if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) { */
while (ixs > 0 && while (ixs > 0 &&
!is_blank_line(recs, ix - 1, flags) && !is_blank_line(recs, ix - 1, flags) &&
recs_match(recs, ixs - 1, ix - 1, flags)) { recs_match(recs, ixs - 1, ix - 1, flags)) {