add -p: print errors in separate color

trast · gitster · commit a301973641f4 · 2009-02-05T17:44:39.000-08:00
Print interaction error messages in color.interactive.error, which
defaults to the value of color.interactive.help.

Signed-off-by: Thomas Rast &lt;trast@student.ethz.ch&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -556,8 +556,8 @@ color.interactive::
 
 color.interactive.<slot>::
 	Use customized color for 'git-add --interactive'
-	output. `<slot>` may be `prompt`, `header`, or `help`, for
-	three distinct types of normal output from interactive
+	output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
+	four distinct types of normal output from interactive
 	programs.  The values of these variables may be specified as
 	in color.branch.<slot>.
 
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
@@ -12,6 +12,12 @@
 		$repo->get_color('color.interactive.header', 'bold'),
 		$repo->get_color('color.interactive.help', 'red bold'),
 	) : ();
+my $error_color = ();
+if ($menu_use_color) {
+	my $help_color_spec = $repo->config('color.interactive.help');
+	$error_color = $repo->get_color('color.interactive.error',
+					$help_color_spec);
+}
 
 my $diff_use_color = $repo->get_colorbool('color.diff');
 my ($fraginfo_color) =
@@ -333,6 +339,10 @@ sub highlight_prefix {
 	return "$prompt_color$prefix$normal_color$remainder";
 }
 
+sub error_msg {
+	print STDERR colored $error_color, @_;
+}
+
 sub list_and_choose {
 	my ($opts, @stuff) = @_;
 	my (@chosen, @return);
@@ -428,12 +438,12 @@ sub list_and_choose {
 			else {
 				$bottom = $top = find_unique($choice, @stuff);
 				if (!defined $bottom) {
-					print "Huh ($choice)?\n";
+					error_msg "Huh ($choice)?\n";
 					next TOPLOOP;
 				}
 			}
 			if ($opts->{SINGLETON} && $bottom != $top) {
-				print "Huh ($choice)?\n";
+				error_msg "Huh ($choice)?\n";
 				next TOPLOOP;
 			}
 			for ($i = $bottom-1; $i <= $top-1; $i++) {
@@ -1029,11 +1039,11 @@ sub patch_update_file {
 					chomp $response;
 				}
 				if ($response !~ /^\s*\d+\s*$/) {
-					print STDERR "Invalid number: '$response'\n";
+					error_msg "Invalid number: '$response'\n";
 				} elsif (0 < $response && $response <= $num) {
 					$ix = $response - 1;
 				} else {
-					print STDERR "Sorry, only $num hunks available.\n";
+					error_msg "Sorry, only $num hunks available.\n";
 				}
 				next;
 			}
@@ -1062,7 +1072,7 @@ sub patch_update_file {
 				if ($@) {
 					my ($err,$exp) = ($@, $1);
 					$err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//;
-					print STDERR "Malformed search regexp $exp: $err\n";
+					error_msg "Malformed search regexp $exp: $err\n";
 					next;
 				}
 				my $iy = $ix;
@@ -1072,7 +1082,7 @@ sub patch_update_file {
 					$iy++;
 					$iy = 0 if ($iy >= $num);
 					if ($ix == $iy) {
-						print STDERR "No hunk matches the given pattern\n";
+						error_msg "No hunk matches the given pattern\n";
 						last;
 					}
 				}
@@ -1084,7 +1094,7 @@ sub patch_update_file {
 					$ix--;
 				}
 				else {
-					print STDERR "No previous hunk\n";
+					error_msg "No previous hunk\n";
 				}
 				next;
 			}
@@ -1093,7 +1103,7 @@ sub patch_update_file {
 					$ix++;
 				}
 				else {
-					print STDERR "No next hunk\n";
+					error_msg "No next hunk\n";
 				}
 				next;
 			}
@@ -1106,13 +1116,13 @@ sub patch_update_file {
 					}
 				}
 				else {
-					print STDERR "No previous hunk\n";
+					error_msg "No previous hunk\n";
 				}
 				next;
 			}
 			elsif ($line =~ /^j/) {
 				if ($other !~ /j/) {
-					print STDERR "No next hunk\n";
+					error_msg "No next hunk\n";
 					next;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,12 @@`
`12`	`12`	`$repo->get_color('color.interactive.header', 'bold'),`
`13`	`13`	`$repo->get_color('color.interactive.help', 'red bold'),`
`14`	`14`	`) : ();`
	`15`	`+my $error_color = ();`
	`16`	`+if ($menu_use_color) {`
	`17`	`+ my $help_color_spec = $repo->config('color.interactive.help');`
	`18`	`+ $error_color = $repo->get_color('color.interactive.error',`
	`19`	`+ $help_color_spec);`
	`20`	`+}`
`15`	`21`
`16`	`22`	`my $diff_use_color = $repo->get_colorbool('color.diff');`
`17`	`23`	`my ($fraginfo_color) =`
`@@ -333,6 +339,10 @@ sub highlight_prefix {`
`333`	`339`	`return "$prompt_color$prefix$normal_color$remainder";`
`334`	`340`	`}`
`335`	`341`
	`342`	`+sub error_msg {`
	`343`	`+ print STDERR colored $error_color, @_;`
	`344`	`+}`
	`345`	`+`
`336`	`346`	`sub list_and_choose {`
`337`	`347`	`my ($opts, @stuff) = @_;`
`338`	`348`	`my (@chosen, @return);`
`@@ -428,12 +438,12 @@ sub list_and_choose {`
`428`	`438`	`else {`
`429`	`439`	`$bottom = $top = find_unique($choice, @stuff);`
`430`	`440`	`if (!defined $bottom) {`
`431`		`- print "Huh ($choice)?\n";`
	`441`	`+ error_msg "Huh ($choice)?\n";`
`432`	`442`	`next TOPLOOP;`
`433`	`443`	`}`
`434`	`444`	`}`
`435`	`445`	`if ($opts->{SINGLETON} && $bottom != $top) {`
`436`		`- print "Huh ($choice)?\n";`
	`446`	`+ error_msg "Huh ($choice)?\n";`
`437`	`447`	`next TOPLOOP;`
`438`	`448`	`}`
`439`	`449`	`for ($i = $bottom-1; $i <= $top-1; $i++) {`
`@@ -1029,11 +1039,11 @@ sub patch_update_file {`
`1029`	`1039`	`chomp $response;`
`1030`	`1040`	`}`
`1031`	`1041`	`if ($response !~ /^\s\d+\s$/) {`
`1032`		`- print STDERR "Invalid number: '$response'\n";`
	`1042`	`+ error_msg "Invalid number: '$response'\n";`
`1033`	`1043`	`} elsif (0 < $response && $response <= $num) {`
`1034`	`1044`	`$ix = $response - 1;`
`1035`	`1045`	`} else {`
`1036`		`- print STDERR "Sorry, only $num hunks available.\n";`
	`1046`	`+ error_msg "Sorry, only $num hunks available.\n";`
`1037`	`1047`	`}`
`1038`	`1048`	`next;`
`1039`	`1049`	`}`
`@@ -1062,7 +1072,7 @@ sub patch_update_file {`
`1062`	`1072`	`if ($@) {`
`1063`	`1073`	`my ($err,$exp) = ($@, $1);`
`1064`	`1074`	`$err =~ s/ at .git-add--interactive line \d+, <STDIN> line \d+.$//;`
`1065`		`- print STDERR "Malformed search regexp $exp: $err\n";`
	`1075`	`+ error_msg "Malformed search regexp $exp: $err\n";`
`1066`	`1076`	`next;`
`1067`	`1077`	`}`
`1068`	`1078`	`my $iy = $ix;`
`@@ -1072,7 +1082,7 @@ sub patch_update_file {`
`1072`	`1082`	`$iy++;`
`1073`	`1083`	`$iy = 0 if ($iy >= $num);`
`1074`	`1084`	`if ($ix == $iy) {`
`1075`		`- print STDERR "No hunk matches the given pattern\n";`
	`1085`	`+ error_msg "No hunk matches the given pattern\n";`
`1076`	`1086`	`last;`
`1077`	`1087`	`}`
`1078`	`1088`	`}`
`@@ -1084,7 +1094,7 @@ sub patch_update_file {`
`1084`	`1094`	`$ix--;`
`1085`	`1095`	`}`
`1086`	`1096`	`else {`
`1087`		`- print STDERR "No previous hunk\n";`
	`1097`	`+ error_msg "No previous hunk\n";`
`1088`	`1098`	`}`
`1089`	`1099`	`next;`
`1090`	`1100`	`}`
`@@ -1093,7 +1103,7 @@ sub patch_update_file {`
`1093`	`1103`	`$ix++;`
`1094`	`1104`	`}`
`1095`	`1105`	`else {`
`1096`		`- print STDERR "No next hunk\n";`
	`1106`	`+ error_msg "No next hunk\n";`
`1097`	`1107`	`}`
`1098`	`1108`	`next;`
`1099`	`1109`	`}`
`@@ -1106,13 +1116,13 @@ sub patch_update_file {`
`1106`	`1116`	`}`
`1107`	`1117`	`}`
`1108`	`1118`	`else {`
`1109`		`- print STDERR "No previous hunk\n";`
	`1119`	`+ error_msg "No previous hunk\n";`
`1110`	`1120`	`}`
`1111`	`1121`	`next;`
`1112`	`1122`	`}`
`1113`	`1123`	`elsif ($line =~ /^j/) {`
`1114`	`1124`	`if ($other !~ /j/) {`
`1115`		`- print STDERR "No next hunk\n";`
	`1125`	`+ error_msg "No next hunk\n";`
`1116`	`1126`	`next;`
`1117`	`1127`	`}`
`1118`	`1128`	`}`