Git.pm: config_boolean() -> config_bool()

Petr Baudis · Junio C Hamano · commit 35c49eeae7e7 · 2007-05-10T14:13:29.000-07:00
This patch renames config_boolean() to config_bool() for consistency with
the commandline interface and because it is shorter but still obvious. ;-)
It also changes the return value from some obscure string to real Perl
boolean, allowing for clean user code.

Signed-off-by: Petr Baudis &lt;pasky@suse.cz&gt;
diff --git a/git-remote.perl b/git-remote.perl
@@ -297,9 +297,9 @@ sub update_remote {
 	} elsif ($name eq 'default') {
 		undef @remotes;
 		for (sort keys %$remote) {
-			my $do_fetch = $git->config_boolean("remote." . $_ .
+			my $do_fetch = $git->config_bool("remote." . $_ .
 						    ".skipDefaultUpdate");
-			if (!defined($do_fetch) || $do_fetch ne "true") {
+			unless ($do_fetch) {
 				push @remotes, $_;
 			}
 		}
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -154,8 +154,8 @@ sub format_2822_time {
 	$term = new FakeTerm "$@: going non-interactive";
 }
 
-my $def_chain = $repo->config_boolean('sendemail.chainreplyto');
-if ($def_chain and $def_chain eq 'false') {
+my $def_chain = $repo->config_bool('sendemail.chainreplyto');
+if (defined $def_chain and not $def_chain) {
     $chain_reply_to = 0;
 }
 
diff --git a/perl/Git.pm b/perl/Git.pm
@@ -516,24 +516,28 @@ sub config {
 }
 
 
-=item config_boolean ( VARIABLE )
+=item config_bool ( VARIABLE )
 
-Retrieve the boolean configuration C<VARIABLE>.
+Retrieve the bool configuration C<VARIABLE>. The return value
+is usable as a boolean in perl (and C<undef> if it's not defined,
+of course).
 
 Must be called on a repository instance.
 
 This currently wraps command('config') so it is not so fast.
 
 =cut
 
-sub config_boolean {
+sub config_bool {
 	my ($self, $var) = @_;
 	$self->repo_path()
 		or throw Error::Simple("not a repository");
 
 	try {
-		return $self->command_oneline('config', '--bool', '--get',
+		my $val = $self->command_oneline('config', '--bool', '--get',
 					      $var);
+		return undef unless defined $val;
+		return $val eq 'true';
 	} catch Git::Error::Command with {
 		my $E = shift;
 		if ($E->value() == 1) {

Original file line number	Diff line number	Diff line change
`@@ -297,9 +297,9 @@ sub update_remote {`
`297`	`297`	`} elsif ($name eq 'default') {`
`298`	`298`	`undef @remotes;`
`299`	`299`	`for (sort keys %$remote) {`
`300`		`- my $do_fetch = $git->config_boolean("remote." . $_ .`
	`300`	`+ my $do_fetch = $git->config_bool("remote." . $_ .`
`301`	`301`	`".skipDefaultUpdate");`
`302`		`- if (!defined($do_fetch) \|\| $do_fetch ne "true") {`
	`302`	`+ unless ($do_fetch) {`
`303`	`303`	`push @remotes, $_;`
`304`	`304`	`}`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,8 @@ sub format_2822_time {`
`154`	`154`	`$term = new FakeTerm "$@: going non-interactive";`
`155`	`155`	`}`
`156`	`156`
`157`		`-my $def_chain = $repo->config_boolean('sendemail.chainreplyto');`
`158`		`-if ($def_chain and $def_chain eq 'false') {`
	`157`	`+my $def_chain = $repo->config_bool('sendemail.chainreplyto');`
	`158`	`+if (defined $def_chain and not $def_chain) {`
`159`	`159`	`$chain_reply_to = 0;`
`160`	`160`	`}`
`161`	`161`