about summary refs log tree commit
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-09-18 19:50:50 +0000
committerEric Wong <e@80x24.org>2019-09-18 19:51:37 +0000
commit41a555ebab603d492440e97c8ddd889617cc51f0 (patch)
tree6c403e355a3f9220470b7647380a73a4d72b6863
parentbda9f9417bee51e4e18808578a001b4673a4123a (diff)
downloadpublic-inbox-41a555ebab603d492440e97c8ddd889617cc51f0.tar.gz
We need to handle arbitrary integers and case-insensitive
variations of human words to match git-config(1) behavior,
since that's what users would expect given we use config
files parseable by git-config(1).
-rw-r--r--lib/PublicInbox/Config.pm17
-rw-r--r--t/config.t20
2 files changed, 33 insertions, 4 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 01a01c62..ef277c40 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -366,6 +366,17 @@ sub _fill_code_repo {
         $git;
 }
 
+sub _git_config_bool ($) {
+        my ($val) = @_;
+        if ($val =~ /\A(?:false|no|off|[\-\+]?(?:0x)?0+)\z/i) {
+                0;
+        } elsif ($val =~ /\A(?:true|yes|on|[\-\+]?(?:0x)?[0-9]+)\z/i) {
+                1;
+        } else {
+                undef;
+        }
+}
+
 sub _fill {
         my ($self, $pfx) = @_;
         my $ibx = {};
@@ -379,10 +390,8 @@ sub _fill {
         foreach my $k (qw(obfuscate)) {
                 my $v = $self->{"$pfx.$k"};
                 defined $v or next;
-                if ($v =~ /\A(?:false|no|off|0)\z/) {
-                        $ibx->{$k} = 0;
-                } elsif ($v =~ /\A(?:true|yes|on|1)\z/) {
-                        $ibx->{$k} = 1;
+                if (defined(my $bval = _git_config_bool($v))) {
+                        $ibx->{$k} = $bval;
                 } else {
                         warn "Ignoring $pfx.$k=$v in config, not boolean\n";
                 }
diff --git a/t/config.t b/t/config.t
index b7a4ceb6..a4e76150 100644
--- a/t/config.t
+++ b/t/config.t
@@ -190,4 +190,24 @@ for my $s (@valid) {
                 'inboxes share ::Git object');
 }
 
+{
+        my $check_git = !!$ENV{CHECK_GIT_BOOL};
+        for my $t (qw(TRUE true yes on 1 +1 -1 13 0x1 0x12 0X5)) {
+                is(PublicInbox::Config::_git_config_bool($t), 1, "$t is true");
+                if ($check_git) {
+                        is(`git -c test.val=$t config --bool test.val`,
+                                "true\n", "$t matches git-config behavior");
+                }
+        }
+        for my $f (qw(FALSE false no off 0 +0 +000 00 0x00 0X0)) {
+                is(PublicInbox::Config::_git_config_bool($f), 0, "$f is false");
+                if ($check_git) {
+                        is(`git -c test.val=$f config --bool test.val`,
+                                "false\n", "$f matches git-config behavior");
+                }
+        }
+        is(PublicInbox::Config::_git_config_bool('bogus'), undef,
+                'bogus is undef');
+}
+
 done_testing();