git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Célestin Matte" <celestin.matte@ensimag.fr>
To: git@vger.kernel.org
Cc: benoit.person@ensimag.fr, matthieu.moy@grenoble-inp.fr,
	"Célestin Matte" <celestin.matte@ensimag.fr>
Subject: [PATCH v6 31/31] git-remote-mediawiki: Make error message more precise
Date: Fri, 14 Jun 2013 15:50:39 +0200	[thread overview]
Message-ID: <1371217839-23017-32-git-send-email-celestin.matte@ensimag.fr> (raw)
In-Reply-To: <1371217839-23017-1-git-send-email-celestin.matte@ensimag.fr>

From: Célestin Matte <celestin.matte@ensimag.fr>

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>
---
 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 2246c84..9ff45fd 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]);
-- 
1.8.3.rc3.49.g4e74807

  parent reply	other threads:[~2013-06-14 13:51 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-14 13:50 [PATCH v6 00/31] git-remote-mediawiki: Follow perlcritic's recommandations Célestin Matte
2013-06-14 13:50 ` [PATCH v6 01/31] git-remote-mediawiki: Make a regexp clearer Célestin Matte
2013-06-14 13:50 ` [PATCH v6 02/31] git-remote-mediawiki: Move "use warnings;" before any instruction Célestin Matte
2013-06-14 13:50 ` [PATCH v6 03/31] git-remote-mediawiki: Replace :utf8 by :encoding(UTF-8) Célestin Matte
2013-06-14 13:50 ` [PATCH v6 04/31] git-remote-mediawiki: Always end a subroutine with a return Célestin Matte
2013-06-14 13:50 ` [PATCH v6 05/31] git-remote-mediawiki: Move a variable declaration at the top of the code Célestin Matte
2013-06-14 13:50 ` [PATCH v6 06/31] git-remote-mediawiki: Change syntax of map calls Célestin Matte
2013-06-14 13:50 ` [PATCH v6 07/31] git-remote-mediawiki: Rewrite unclear line of instructions Célestin Matte
2013-06-14 13:50 ` [PATCH v6 08/31] git-remote-mediawiki: Remove useless regexp modifier (m) Célestin Matte
2013-06-14 13:50 ` [PATCH v6 09/31] git-remote-mediawiki: Change the behaviour of a split Célestin Matte
2013-06-14 13:50 ` [PATCH v6 10/31] git-remote-mediawiki: Change separator of some regexps Célestin Matte
2013-06-14 13:50 ` [PATCH v6 11/31] git-remote-mediawiki: Change style in a regexp Célestin Matte
2013-06-14 13:50 ` [PATCH v6 12/31] " Célestin Matte
2013-06-14 13:50 ` [PATCH v6 13/31] git-remote-mediawiki: Add newline in the end of die() error messages Célestin Matte
2013-06-14 13:50 ` [PATCH v6 14/31] git-remote-mediawiki: Change the name of a variable Célestin Matte
2013-06-14 13:50 ` [PATCH v6 15/31] git-remote-mediawiki: Turn double-negated expressions into simple expressions Célestin Matte
2013-06-14 13:50 ` [PATCH v6 16/31] git-remote-mediawiki: Remove unused variable $entry Célestin Matte
2013-06-14 13:50 ` [PATCH v6 17/31] git-remote-mediawiki: Rename a variable ($last) which has the name of a keyword Célestin Matte
2013-06-14 13:50 ` [PATCH v6 18/31] git-remote-mediawiki: Assign a variable as undef and make proper indentation Célestin Matte
2013-06-14 13:50 ` [PATCH v6 19/31] git-remote-mediawiki: Check return value of open Célestin Matte
2013-06-14 13:50 ` [PATCH v6 20/31] git-remote-mediawiki: remove import of unused open2 Célestin Matte
2013-06-14 13:50 ` [PATCH v6 21/31] git-remote-mediawiki: Put long code into a subroutine Célestin Matte
2013-06-14 13:50 ` [PATCH v6 22/31] git-remote-mediawiki: Modify strings for a better coding-style Célestin Matte
2013-06-14 13:50 ` [PATCH v6 23/31] git-remote-mediawiki: Brace file handles for print for more clarity Célestin Matte
2013-06-14 13:50 ` [PATCH v6 24/31] git-remote-mediawiki: Replace "unless" statements with negated "if" statements Célestin Matte
2013-06-14 13:50 ` [PATCH v6 25/31] git-remote-mediawiki: Don't use quotes for empty strings Célestin Matte
2013-06-14 13:50 ` [PATCH v6 26/31] git-remote-mediawiki: Put non-trivial numeric values in constants Célestin Matte
2013-06-14 13:50 ` [PATCH v6 27/31] git-remote-mediawiki: Fix a typo ("mediwiki" instead of "mediawiki") Célestin Matte
2013-06-14 13:50 ` [PATCH v6 28/31] git-remote-mediawiki: Clearly rewrite double dereference Célestin Matte
2013-06-14 13:50 ` [PATCH v6 29/31] git-remote-mediawiki: Add a .perlcriticrc file Célestin Matte
2013-06-14 13:50 ` [PATCH v6 30/31] git-remote-mediawiki: add a perlcritic rule in Makefile Célestin Matte
2013-06-14 13:50 ` Célestin Matte [this message]
2013-06-14 16:03 ` [PATCH v6 00/31] git-remote-mediawiki: Follow perlcritic's recommandations Junio C Hamano

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

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

  git send-email \
    --in-reply-to=1371217839-23017-32-git-send-email-celestin.matte@ensimag.fr \
    --to=celestin.matte@ensimag.fr \
    --cc=benoit.person@ensimag.fr \
    --cc=git@vger.kernel.org \
    --cc=matthieu.moy@grenoble-inp.fr \
    /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.
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 NNTP newsgroup(s).