user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] config: boolean handling matches git-config(1)
Date: Wed, 18 Sep 2019 19:50:50 +0000	[thread overview]
Message-ID: <20190918195050.16553-1-e@80x24.org> (raw)

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).
---
 lib/PublicInbox/Config.pm | 17 +++++++++++++----
 t/config.t                | 20 ++++++++++++++++++++
 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();
-- 
EW


                 reply	other threads:[~2019-09-18 19:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190918195050.16553-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).