Git.pm: config_boolean() -> config_bool()
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 <pasky@suse.cz>
This commit is contained in:
parent
efa615ba08
commit
35c49eeae7
@ -297,9 +297,9 @@ sub update_remote {
|
|||||||
} elsif ($name eq 'default') {
|
} elsif ($name eq 'default') {
|
||||||
undef @remotes;
|
undef @remotes;
|
||||||
for (sort keys %$remote) {
|
for (sort keys %$remote) {
|
||||||
my $do_fetch = $git->config_boolean("remote." . $_ .
|
my $do_fetch = $git->config_bool("remote." . $_ .
|
||||||
".skipDefaultUpdate");
|
".skipDefaultUpdate");
|
||||||
if (!defined($do_fetch) || $do_fetch ne "true") {
|
unless ($do_fetch) {
|
||||||
push @remotes, $_;
|
push @remotes, $_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -154,8 +154,8 @@ if ($@) {
|
|||||||
$term = new FakeTerm "$@: going non-interactive";
|
$term = new FakeTerm "$@: going non-interactive";
|
||||||
}
|
}
|
||||||
|
|
||||||
my $def_chain = $repo->config_boolean('sendemail.chainreplyto');
|
my $def_chain = $repo->config_bool('sendemail.chainreplyto');
|
||||||
if ($def_chain and $def_chain eq 'false') {
|
if (defined $def_chain and not $def_chain) {
|
||||||
$chain_reply_to = 0;
|
$chain_reply_to = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
12
perl/Git.pm
12
perl/Git.pm
@ -516,9 +516,11 @@ 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.
|
Must be called on a repository instance.
|
||||||
|
|
||||||
@ -526,14 +528,16 @@ This currently wraps command('config') so it is not so fast.
|
|||||||
|
|
||||||
=cut
|
=cut
|
||||||
|
|
||||||
sub config_boolean {
|
sub config_bool {
|
||||||
my ($self, $var) = @_;
|
my ($self, $var) = @_;
|
||||||
$self->repo_path()
|
$self->repo_path()
|
||||||
or throw Error::Simple("not a repository");
|
or throw Error::Simple("not a repository");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return $self->command_oneline('config', '--bool', '--get',
|
my $val = $self->command_oneline('config', '--bool', '--get',
|
||||||
$var);
|
$var);
|
||||||
|
return undef unless defined $val;
|
||||||
|
return $val eq 'true';
|
||||||
} catch Git::Error::Command with {
|
} catch Git::Error::Command with {
|
||||||
my $E = shift;
|
my $E = shift;
|
||||||
if ($E->value() == 1) {
|
if ($E->value() == 1) {
|
||||||
|
Loading…
Reference in New Issue
Block a user