From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Feb 2012 20:57:17 +0000 (-0800)
Subject: Merge branch 'jk/userdiff-config-simplify'
X-Git-Tag: v1.7.10-rc0~86
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/63d37c3062e13cb2828edf63bc03cce1b6c41fd0?hp=-c

Merge branch 'jk/userdiff-config-simplify'

* jk/userdiff-config-simplify:
drop odd return value semantics from userdiff_config
---

63d37c3062e13cb2828edf63bc03cce1b6c41fd0
diff --combined diff.c
index 84780fd5e6,a656f5e83e..3550c18e39
--- a/diff.c
+++ b/diff.c
@@@ -177,11 -177,8 +177,8 @@@ int git_diff_basic_config(const char *v
  		return 0;
  	}
  
- 	switch (userdiff_config(var, value)) {
- 		case 0: break;
- 		case -1: return -1;
- 		default: return 0;
- 	}
+ 	if (userdiff_config(var, value) < 0)
+ 		return -1;
  
  	if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
  		int slot = parse_diff_color_slot(var, 11);
@@@ -1322,55 -1319,6 +1319,55 @@@ static void fill_print_name(struct diff
  	file->print_name = pname;
  }
  
 +int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
 +{
 +	struct strbuf sb = STRBUF_INIT;
 +	int ret;
 +
 +	if (!files) {
 +		assert(insertions == 0 && deletions == 0);
 +		return fputs(_(" 0 files changed\n"), fp);
 +	}
 +
 +	strbuf_addf(&sb,
 +		    Q_(" %d file changed", " %d files changed", files),
 +		    files);
 +
 +	/*
 +	 * For binary diff, the caller may want to print "x files
 +	 * changed" with insertions == 0 && deletions == 0.
 +	 *
 +	 * Not omitting "0 insertions(+), 0 deletions(-)" in this case
 +	 * is probably less confusing (i.e skip over "2 files changed
 +	 * but nothing about added/removed lines? Is this a bug in Git?").
 +	 */
 +	if (insertions || deletions == 0) {
 +		/*
 +		 * TRANSLATORS: "+" in (+) is a line addition marker;
 +		 * do not translate it.
 +		 */
 +		strbuf_addf(&sb,
 +			    Q_(", %d insertion(+)", ", %d insertions(+)",
 +			       insertions),
 +			    insertions);
 +	}
 +
 +	if (deletions || insertions == 0) {
 +		/*
 +		 * TRANSLATORS: "-" in (-) is a line removal marker;
 +		 * do not translate it.
 +		 */
 +		strbuf_addf(&sb,
 +			    Q_(", %d deletion(-)", ", %d deletions(-)",
 +			       deletions),
 +			    deletions);
 +	}
 +	strbuf_addch(&sb, '\n');
 +	ret = fputs(sb.buf, fp);
 +	strbuf_release(&sb);
 +	return ret;
 +}
 +
  static void show_stats(struct diffstat_t *data, struct diff_options *options)
  {
  	int i, len, add, del, adds = 0, dels = 0;
@@@ -1524,7 -1472,9 +1521,7 @@@
  		extra_shown = 1;
  	}
  	fprintf(options->file, "%s", line_prefix);
 -	fprintf(options->file,
 -	       " %d files changed, %d insertions(+), %d deletions(-)\n",
 -	       total_files, adds, dels);
 +	print_stat_summary(options->file, total_files, adds, dels);
  }
  
  static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
@@@ -1554,7 -1504,8 +1551,7 @@@
  				options->output_prefix_data);
  		fprintf(options->file, "%s", msg->buf);
  	}
 -	fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
 -	       total_files, adds, dels);
 +	print_stat_summary(options->file, total_files, adds, dels);
  }
  
  static void show_numstat(struct diffstat_t *data, struct diff_options *options)