git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 03/18] Add newline in the end of die() error messages

From
Célestin Matte <celestin.matte@ensimag.fr>
Date
Jun 6, 2013, 19:34 UTC
Message-ID
<1370547263-13558-4-git-send-email-celestin.matte@ensimag.fr>
In-Reply-To
<1370547263-13558-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 482cd95..4baad95 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -136,16 +136,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]);
@@ -242,7 +242,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;
 		}
@@ -767,7 +767,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;
@@ -879,7 +879,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})) {
@@ -888,7 +888,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}});
@@ -999,7 +999,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";
@@ -1079,7 +1079,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};
@@ -1101,7 +1101,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";
 		}
@@ -1173,7 +1173,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) {
@@ -1227,7 +1227,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
Previous: Peter KreftingNext: Célestin Matte
Message 13 of 44 in “git-remote-mediawiki: Follow perlcritic's recommandations”
  1. 00/18 git-remote-mediawiki: Follow perlcritic's recommandationsCélestin Matte, Jun 6, 2013
  2. 01/18 Follow perlcritic's recommendations - level 5 and 4Célestin Matte, Jun 6, 2013
  3. Eric SunshineJun 7, 2013
  4. Matthieu MoyJun 7, 2013
  5. Célestin MatteJun 7, 2013
  6. Matthieu MoyJun 7, 2013
  7. 02/18 Change style of some regular expressions to make them clearerCélestin Matte, Jun 6, 2013
  8. Eric SunshineJun 7, 2013
  9. Junio C HamanoJun 7, 2013
  10. Eric SunshineJun 7, 2013
  11. Junio C HamanoJun 7, 2013
  12. Peter KreftingJun 7, 2013
  13. 03/18 Add newline in the end of die() error messagesCélestin Matte, Jun 6, 2013
  14. 04/18 Prevent local variable $url to have the same name as a global variableCélestin Matte, Jun 6, 2013
  15. 05/18 Turn double-negated expressions into simple expressionsCélestin Matte, Jun 6, 2013
  16. Eric SunshineJun 7, 2013
  17. Célestin MatteJun 7, 2013
  18. Eric SunshineJun 7, 2013
  19. Célestin MatteJun 7, 2013
  20. 06/18 Remove unused variableCélestin Matte, Jun 6, 2013
  21. 07/18 Rename a variable ($last) so that it does not have the name of a keywordCélestin Matte, Jun 6, 2013
  22. 08/18 Explicitely assign local variable as undef and make a proper one-instruction-by- line indentationCélestin Matte, Jun 6, 2013
  23. Eric SunshineJun 7, 2013
  24. Matthieu MoyJun 7, 2013
  25. 09/18 Check return value of open and remove import of unused open2Célestin Matte, Jun 6, 2013
  26. Matthieu MoyJun 7, 2013
  27. 10/18 Put long code into a submoduleCélestin Matte, Jun 6, 2013
  28. Eric SunshineJun 7, 2013
  29. Junio C HamanoJun 7, 2013
  30. 11/18 Modify strings for a better coding-styleCélestin Matte, Jun 6, 2013
  31. Eric SunshineJun 7, 2013
  32. 12/18 Brace file handles for print for more clarityCélestin Matte, Jun 6, 2013
  33. 13/18 Remove "unless" statements and replace them by negated "if" statementsCélestin Matte, Jun 6, 2013
  34. Eric SunshineJun 7, 2013
  35. 14/18 Don't use quotes for empty stringsCélestin Matte, Jun 6, 2013
  36. 15/18 Put non-trivial numeric values (e.g., different from 0, 1 and 2) in constants.Célestin Matte, Jun 6, 2013
  37. 16/18 Fix a typo ("mediwiki" instead of "mediawiki")Célestin Matte, Jun 6, 2013
  38. 17/18 Place the open() call inside the do{} struct and prevent failing closeCélestin Matte, Jun 6, 2013
  39. Junio C HamanoJun 6, 2013
  40. Célestin MatteJun 6, 2013
  41. Junio C HamanoJun 6, 2013
  42. Célestin MatteJun 6, 2013
  43. 18/18 Clearly rewrite double dereferenceCélestin Matte, Jun 6, 2013
  44. Eric SunshineJun 7, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.