cvsimport: handle the parsing of uppercase config options

The current code leads to

fatal: bad config value for 'cvsimport.r' in .git/config

for a standard use case with cvsimport.r set.

cvsimport sets internal variables by checking the config for each
possible command line option. The problem is that config items are case
insensitive, so config.r and config.R are the same. The ugly error is
due to that fact that cvsimport expects a bool for -R (and thus
config.R) but a remote name for -r (and thus config.r).

Fix this by making cvsimport expect long names for uppercase options.

config options for cvsimport have been undocumented so far, though
present in the code and advertised in several tutorials. So one may read
"enhance" for "fix". Similarly, the names for the options are
"documented" in the code, waitiing for their lowercase equivalents to be
transformed into long config options, as well.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index bf953543acb330a9b4ddc954c5d9f9453127d8a9..58f5b11dc2c5bbedcafaaba9f00146ab58cdf8d2 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -89,6 +89,14 @@ ($)
 }
 
 # convert getopts specs for use by git config
 }
 
 # convert getopts specs for use by git config

+my %longmap = (
+       'A:' => 'authors-file',
+       'M:' => 'merge-regex',
+       'P:' => undef,
+       'R' => 'track-revisions',
+       'S:' => 'ignore-paths',
+);
+

 sub read_repo_config {
        # Split the string between characters, unless there is a ':'
        # So "abc:de" becomes ["a", "b", "c:", "d", "e"]
 sub read_repo_config {
        # Split the string between characters, unless there is a ':'
        # So "abc:de" becomes ["a", "b", "c:", "d", "e"]


@@ -98,8 +106,17 @@ sub read_repo_config {
                $key =~ s/://g;
                my $arg = 'git config';
                $arg .= ' --bool' if ($o !~ /:$/);
                $key =~ s/://g;
                my $arg = 'git config';
                $arg .= ' --bool' if ($o !~ /:$/);

-
-               chomp(my $tmp = `$arg --get cvsimport.$key`);
+               my $ckey = $key;
+
+               if (exists $longmap{$o}) {
+                       # An uppercase option like -R cannot be
+                       # expressed in the configuration, as the
+                       # variable names are downcased.
+                       $ckey = $longmap{$o};
+                       next if (! defined $ckey);
+                       $ckey =~ s/-//g;
+               }
+               chomp(my $tmp = `$arg --get cvsimport.$ckey`);

                if ($tmp && !($arg =~ /--bool/ && $tmp eq 'false')) {
                        no strict 'refs';
                        my $opt_name = "opt_" . $key;
                if ($tmp && !($arg =~ /--bool/ && $tmp eq 'false')) {
                        no strict 'refs';
                        my $opt_name = "opt_" . $key;

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 432b82e3d5a361d0eba329f5d5c56c17009738db..4c384ff02333e1413cc67b1b4a6bed47ae3d00db 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -89,7 +89,8 @@ EOF
 test_expect_success PERL 'update git module' '
 
        (cd module-git &&
 test_expect_success PERL 'update git module' '
 
        (cd module-git &&

-       git cvsimport -a -R -z 0 module &&
+       git config cvsimport.trackRevisions true &&
+       git cvsimport -a -z 0 module &&

        git merge origin
        ) &&
        test_cmp module-cvs/o_fortuna module-git/o_fortuna
        git merge origin
        ) &&
        test_cmp module-cvs/o_fortuna module-git/o_fortuna


@@ -117,7 +118,8 @@ test_expect_success PERL 'cvsimport.module config works' '
 
        (cd module-git &&
                git config cvsimport.module module &&
 
        (cd module-git &&
                git config cvsimport.module module &&

-               git cvsimport -a -R -z0 &&
+               git config cvsimport.trackRevisions true &&
+               git cvsimport -a -z0 &&

                git merge origin
        ) &&
        test_cmp module-cvs/tick module-git/tick
                git merge origin
        ) &&
        test_cmp module-cvs/tick module-git/tick


@@ -137,6 +139,7 @@ test_expect_success PERL 'import from a CVS working tree' '
 
        $CVS co -d import-from-wt module &&
        (cd import-from-wt &&
 
        $CVS co -d import-from-wt module &&
        (cd import-from-wt &&

+               git config cvsimport.trackRevisions false &&

                git cvsimport -a -z0 &&
                echo 1 >expect &&
                git log -1 --pretty=format:%s%n >actual &&
                git cvsimport -a -z0 &&
                echo 1 >expect &&
                git log -1 --pretty=format:%s%n >actual &&