xmerge.c: minimum readability fixups
This replaces hardcoded magic constants with symbolic ones for readability, and swaps one if/else blocks to better match the order in which 0/1/2 variables are handled to nearby codepath. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 29, 2008 at 08:16 UTC
838338cd22c1df53c1460d9239780371a234b242
1 file changed
+7
-7
xdiff/xmerge.c
+7
-7
@@ -427,7 +427,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
427
xscr2 = xscr2->next;
428
continue;
429
}
430
- if (level < 1 || xscr1->i1 != xscr2->i1 ||
430
+ if (level == XDL_MERGE_MINIMAL || xscr1->i1 != xscr2->i1 ||
431
xscr1->chg1 != xscr2->chg1 ||
432
xscr1->chg2 != xscr2->chg2 ||
433
xdl_merge_cmp_lines(xe1, xscr1->i2,
@@ -449,12 +449,11 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
449
chg0 = xscr1->i1 + xscr1->chg1 - i0;
450
chg1 = xscr1->i2 + xscr1->chg2 - i1;
451
chg2 = xscr2->i2 + xscr2->chg2 - i2;
452
- if (ffo > 0)
453
- chg2 += ffo;
454
- else {
452
+ if (ffo < 0) {
453
chg0 -= ffo;
454
chg1 -= ffo;
457
- }
455
+ } else
456
+ chg2 += ffo;
457
if (xdl_append_merge(&c, 0,
458
i0, chg0, i1, chg1, i2, chg2)) {
459
xdl_cleanup_merge(changes);
@@ -505,9 +504,10 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
504
if (!changes)
505
changes = c;
506
/* refine conflicts */
508
- if (level > 1 &&
507
+ if (XDL_MERGE_ZEALOUS <= level &&
508
(xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
510
- xdl_simplify_non_conflicts(xe1, changes, level > 2) < 0)) {
509
+ xdl_simplify_non_conflicts(xe1, changes,
510
+ XDL_MERGE_ZEALOUS < level) < 0)) {
511
xdl_cleanup_merge(changes);
512
return -1;
513
}