git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / 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 v4 13/31] git-remote-mediawiki: Add newline in the end of die() error messages
Date: Wed, 12 Jun 2013 00:18:04 +0200	[thread overview]
Message-ID: <1370989102-24942-14-git-send-email-celestin.matte@ensimag.fr> (raw)
In-Reply-To: <1370989102-24942-1-git-send-email-celestin.matte@ensimag.fr>

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 |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 86229a1..44c5e0e 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -135,16 +135,16 @@ while (<STDIN>) {
 	if (defined($cmd[0])) {
 		# Line not blank
 		if ($cmd[0] eq "capabilities") {
-			die("Too many arguments for capabilities") unless (!defined($cmd[1]));
+			die("Too many arguments for capabilities\n") unless (!defined($cmd[1]));
 			mw_capabilities();
 		} elsif ($cmd[0] eq "list") {
-			die("Too many arguments for list") unless (!defined($cmd[2]));
+			die("Too many arguments for list\n") unless (!defined($cmd[2]));
 			mw_list($cmd[1]);
 		} elsif ($cmd[0] eq "import") {
-			die("Invalid arguments for import") unless ($cmd[1] ne "" && !defined($cmd[2]));
+			die("Invalid arguments for import\n") unless ($cmd[1] ne "" && !defined($cmd[2]));
 			mw_import($cmd[1]);
 		} elsif ($cmd[0] eq "option") {
-			die("Too many arguments for option") unless ($cmd[1] ne "" && $cmd[2] ne "" && !defined($cmd[3]));
+			die("Too many arguments for option\n") unless ($cmd[1] ne "" && $cmd[2] ne "" && !defined($cmd[3]));
 			mw_option($cmd[1],$cmd[2]);
 		} elsif ($cmd[0] eq "push") {
 			mw_push($cmd[1]);
@@ -241,7 +241,7 @@ sub get_mw_tracked_categories {
 			cmtitle => $category,
 			cmlimit => 'max' } )
 			|| die $mediawiki->{error}->{code} . ': '
-				. $mediawiki->{error}->{details};
+				. $mediawiki->{error}->{details} . "\n";
 		foreach my $page (@{$mw_pages}) {
 			$pages->{$page->{title}} = $page;
 		}
@@ -766,7 +766,7 @@ sub get_more_refs {
 		} elsif ($line eq "\n") {
 			return @refs;
 		} else {
-			die("Invalid command in a '$cmd' batch: ". $_);
+			die("Invalid command in a '$cmd' batch: $_\n");
 		}
 	}
 	return;
@@ -878,7 +878,7 @@ sub mw_import_revids {
 		my $result = $mediawiki->api($query);
 
 		if (!$result) {
-			die "Failed to retrieve modified page for revision $pagerevid";
+			die "Failed to retrieve modified page for revision $pagerevid\n";
 		}
 
 		if (defined($result->{query}->{badrevids}->{$pagerevid})) {
@@ -887,7 +887,7 @@ sub mw_import_revids {
 		}
 
 		if (!defined($result->{query}->{pages})) {
-			die "Invalid revision $pagerevid.";
+			die "Invalid revision $pagerevid.\n";
 		}
 
 		my @result_pages = values(%{$result->{query}->{pages}});
@@ -998,7 +998,7 @@ sub mw_upload_file {
 			}, {
 				skip_encoding => 1
 			} ) || die $mediawiki->{error}->{code} . ':'
-				 . $mediawiki->{error}->{details};
+				 . $mediawiki->{error}->{details} . "\n";
 			my $last_file_page = $mediawiki->get_page({title => $path});
 			$newrevid = $last_file_page->{revid};
 			print STDERR "Pushed file: $new_sha1 - $complete_file_name.\n";
@@ -1078,7 +1078,7 @@ sub mw_push_file {
 				# Other errors. Shouldn't happen => just die()
 				die 'Fatal: Error ' .
 				    $mediawiki->{error}->{code} .
-				    ' from mediwiki: ' . $mediawiki->{error}->{details};
+				    ' from mediwiki: ' . $mediawiki->{error}->{details} . "\n";
 			}
 		}
 		$newrevid = $result->{edit}->{newrevid};
@@ -1100,7 +1100,7 @@ sub mw_push {
 	my $pushed;
 	for my $refspec (@refsspecs) {
 		my ($force, $local, $remote) = $refspec =~ /^(\+)?([^:]*):([^:]*)$/
-		    or die("Invalid refspec for push. Expected <src>:<dst> or +<src>:<dst>");
+		    or die("Invalid refspec for push. Expected <src>:<dst> or +<src>:<dst>\n");
 		if ($force) {
 			print STDERR "Warning: forced push not allowed on a MediaWiki.\n";
 		}
@@ -1172,7 +1172,7 @@ sub mw_push_revision {
 					$local_ancestry{$parent} = $child;
 				}
 			} elsif (!$line =~ /^([a-f0-9]+)/) {
-				die "Unexpected output from git rev-list: $line";
+				die "Unexpected output from git rev-list: $line\n";
 			}
 		}
 		while ($parsed_sha1 ne $HEAD_sha1) {
@@ -1226,7 +1226,7 @@ sub mw_push_revision {
 				return error_non_fast_forward($remote);
 			}
 			if ($status ne "ok") {
-				die("Unknown error from mw_push_file()");
+				die("Unknown error from mw_push_file()\n");
 			}
 		}
 		unless ($dumb_push) {
-- 
1.7.9.5

  parent reply	other threads:[~2013-06-11 22:20 UTC|newest]

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

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: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=1370989102-24942-14-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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.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).