From 73a834e9e27906a76940f1ced5c132bce205d3f8 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Sun, 22 Jul 2018 05:57:12 -0400 Subject: range-diff: relieve callers of low-level configuration burden There are a number of very low-level configuration details which need to be managed precisely to generate a proper range-diff. In particular, 'diff_options' output format, header suppression, indentation, and dual-color mode must all be set appropriately to ensure proper behavior. Handle these details locally in the libified range-diff back-end rather than forcing each caller to have specialized knowledge of these implementation details, and to avoid duplication as new callers are added. While at it, localize these tweaks to be active only while generating the range-diff, so they don't clobber the caller-provided 'diff_options', which might be used beyond range-diff generation. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- range-diff.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'range-diff.h') diff --git a/range-diff.h b/range-diff.h index f26de5d0b0..190593f0c7 100644 --- a/range-diff.h +++ b/range-diff.h @@ -6,6 +6,7 @@ #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 int show_range_diff(const char *range1, const char *range2, - int creation_factor, struct diff_options *diffopt); + int creation_factor, int dual_color, + struct diff_options *diffopt); #endif -- cgit v1.2.3