undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-remote-mediawiki: make error message more precise

Browse Source 
In subroutine parse_command, error messages were not correct. For the "import"
function, having too much or incorrect arguments displayed both
"invalid arguments", while it displayed "too many arguments" for the "option"
functions under the same conditions.
Separate the two error messages in both cases.

Signed-off-by: Célestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Célestin Matte 2013-06-14 15:50:39 +02:00 committed by Junio C Hamano
parent e3e7d34513
commit d8e7c67e13
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/mw-to-git/git-remote-mediawiki.perl
View File

@ -161,12 +161,16 @@ sub parse_command {
die("Too many arguments for list\n") if (defined($cmd[2])); die("Too many arguments for list\n") if (defined($cmd[2]));
mw_list($cmd[1]); mw_list($cmd[1]);
} elsif ($cmd[0] eq 'import') { } elsif ($cmd[0] eq 'import') {
die("Invalid arguments for import\n") die("Invalid argument for import\n")
if ($cmd[1] eq EMPTY || defined($cmd[2])); if ($cmd[1] eq EMPTY);
die("Too many arguments for import\n")
if (defined($cmd[2]));
mw_import($cmd[1]); mw_import($cmd[1]);
} elsif ($cmd[0] eq 'option') { } elsif ($cmd[0] eq 'option') {
die("Invalid arguments for option\n")
if ($cmd[1] eq EMPTY || $cmd[2] eq EMPTY);
die("Too many arguments for option\n") die("Too many arguments for option\n")
if ($cmd[1] eq EMPTY || $cmd[2] eq EMPTY || defined($cmd[3])); if (defined($cmd[3]));
mw_option($cmd[1],$cmd[2]); mw_option($cmd[1],$cmd[2]);
} elsif ($cmd[0] eq 'push') { } elsif ($cmd[0] eq 'push') {
mw_push($cmd[1]); mw_push($cmd[1]);