From d8e7c67e13e0687ba01ea53522db2615ea897f96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9lestin=20Matte?= Date: Fri, 14 Jun 2013 15:50:39 +0200 Subject: [PATCH] git-remote-mediawiki: make error message more precise MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 2246c84483..9ff45fd926 100755 --- a/contrib/mw-to-git/git-remote-mediawiki.perl +++ b/contrib/mw-to-git/git-remote-mediawiki.perl @@ -161,12 +161,16 @@ sub parse_command { die("Too many arguments for list\n") if (defined($cmd[2])); mw_list($cmd[1]); } elsif ($cmd[0] eq 'import') { - die("Invalid arguments for import\n") - if ($cmd[1] eq EMPTY || defined($cmd[2])); + die("Invalid argument for import\n") + if ($cmd[1] eq EMPTY); + die("Too many arguments for import\n") + if (defined($cmd[2])); mw_import($cmd[1]); } 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") - if ($cmd[1] eq EMPTY || $cmd[2] eq EMPTY || defined($cmd[3])); + if (defined($cmd[3])); mw_option($cmd[1],$cmd[2]); } elsif ($cmd[0] eq 'push') { mw_push($cmd[1]); -- 2.11.4.GIT