From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Feb 2008 00:13:56 +0000 (-0800)
Subject: Merge branch 'mk/color'
X-Git-Tag: v1.5.5-rc0~177
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b23b27eb5dc950081d4f76ae84f10168c4d149bd?ds=inline;hp=-c

Merge branch 'mk/color'

* mk/color:
Add color.ui variable which globally enables colorization if set
---

b23b27eb5dc950081d4f76ae84f10168c4d149bd
diff --combined builtin-log.c
index 5fea64abad,f2216d3187..c67d63cb1c
--- a/builtin-log.c
+++ b/builtin-log.c
@@@ -5,6 -5,7 +5,7 @@@
   *		 2006 Junio Hamano
   */
  #include "cache.h"
+ #include "color.h"
  #include "commit.h"
  #include "diff.h"
  #include "revision.h"
@@@ -197,8 -198,7 +198,8 @@@ static int cmd_log_walk(struct rev_inf
  	if (rev->early_output)
  		setup_early_output(rev);
  
 -	prepare_revision_walk(rev);
 +	if (prepare_revision_walk(rev))
 +		die("revision walk setup failed");
  
  	if (rev->early_output)
  		finish_early_output(rev);
@@@ -236,6 -236,10 +237,10 @@@ int cmd_whatchanged(int argc, const cha
  	struct rev_info rev;
  
  	git_config(git_log_config);
+ 
+ 	if (diff_use_color_default == -1)
+ 		diff_use_color_default = git_use_color_default;
+ 
  	init_revisions(&rev, prefix);
  	rev.diff = 1;
  	rev.simplify_history = 0;
@@@ -308,6 -312,10 +313,10 @@@ int cmd_show(int argc, const char **arg
  	int i, count, ret = 0;
  
  	git_config(git_log_config);
+ 
+ 	if (diff_use_color_default == -1)
+ 		diff_use_color_default = git_use_color_default;
+ 
  	init_revisions(&rev, prefix);
  	rev.diff = 1;
  	rev.combine_merges = 1;
@@@ -368,6 -376,10 +377,10 @@@ int cmd_log_reflog(int argc, const cha
  	struct rev_info rev;
  
  	git_config(git_log_config);
+ 
+ 	if (diff_use_color_default == -1)
+ 		diff_use_color_default = git_use_color_default;
+ 
  	init_revisions(&rev, prefix);
  	init_reflog_walk(&rev.reflog_info);
  	rev.abbrev_commit = 1;
@@@ -396,6 -408,10 +409,10 @@@ int cmd_log(int argc, const char **argv
  	struct rev_info rev;
  
  	git_config(git_log_config);
+ 
+ 	if (diff_use_color_default == -1)
+ 		diff_use_color_default = git_use_color_default;
+ 
  	init_revisions(&rev, prefix);
  	rev.always_show_header = 1;
  	cmd_log_init(argc, argv, prefix, &rev);
@@@ -557,8 -573,7 +574,8 @@@ static void get_patch_ids(struct rev_in
  	o2->flags ^= UNINTERESTING;
  	add_pending_object(&check_rev, o1, "o1");
  	add_pending_object(&check_rev, o2, "o2");
 -	prepare_revision_walk(&check_rev);
 +	if (prepare_revision_walk(&check_rev))
 +		die("revision walk setup failed");
  
  	while ((commit = get_revision(&check_rev)) != NULL) {
  		/* ignore merges */
@@@ -783,8 -798,7 +800,8 @@@ int cmd_format_patch(int argc, const ch
  	if (!use_stdout)
  		realstdout = xfdopen(xdup(1), "w");
  
 -	prepare_revision_walk(&rev);
 +	if (prepare_revision_walk(&rev))
 +		die("revision walk setup failed");
  	while ((commit = get_revision(&rev)) != NULL) {
  		/* ignore merges */
  		if (commit->parents && commit->parents->next)
@@@ -926,8 -940,7 +943,8 @@@ int cmd_cherry(int argc, const char **a
  		die("Unknown commit %s", limit);
  
  	/* reverse the list of commits */
 -	prepare_revision_walk(&revs);
 +	if (prepare_revision_walk(&revs))
 +		die("revision walk setup failed");
  	while ((commit = get_revision(&revs)) != NULL) {
  		/* ignore merges */
  		if (commit->parents && commit->parents->next)