git-remote-mediawiki: add newline in the end of die() error messages
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>
Célestin Matte committed
Jun 14, 2013 at 15:50 UTC
8a43b36ac225304f31730465c9c8e8ba77695a7d
1 file changed
+13
-13
contrib/mw-to-git/git-remote-mediawiki.perl
+13
-13
@@ -131,16 +131,16 @@ while (<STDIN>) {
131
if (defined($cmd[0])) {
132
# Line not blank
133
if ($cmd[0] eq "capabilities") {
134
- die("Too many arguments for capabilities") unless (!defined($cmd[1]));
134
+ die("Too many arguments for capabilities\n") unless (!defined($cmd[1]));
135
mw_capabilities();
136
} elsif ($cmd[0] eq "list") {
137
- die("Too many arguments for list") unless (!defined($cmd[2]));
137
+ die("Too many arguments for list\n") unless (!defined($cmd[2]));
138
mw_list($cmd[1]);
139
} elsif ($cmd[0] eq "import") {
140
- die("Invalid arguments for import") unless ($cmd[1] ne "" && !defined($cmd[2]));
140
+ die("Invalid arguments for import\n") unless ($cmd[1] ne "" && !defined($cmd[2]));
141
mw_import($cmd[1]);
142
} elsif ($cmd[0] eq "option") {
143
- die("Too many arguments for option") unless ($cmd[1] ne "" && $cmd[2] ne "" && !defined($cmd[3]));
143
+ die("Too many arguments for option\n") unless ($cmd[1] ne "" && $cmd[2] ne "" && !defined($cmd[3]));
144
mw_option($cmd[1],$cmd[2]);
145
} elsif ($cmd[0] eq "push") {
146
mw_push($cmd[1]);
@@ -247,7 +247,7 @@ sub get_mw_tracked_categories {
247
cmtitle => $category,
248
cmlimit => 'max' } )
249
|| die $mediawiki->{error}->{code} . ': '
250
- . $mediawiki->{error}->{details};
250
+ . $mediawiki->{error}->{details} . "\n";
251
foreach my $page (@{$mw_pages}) {
252
$pages->{$page->{title}} = $page;
253
}
@@ -766,7 +766,7 @@ sub get_more_refs {
766
} elsif ($line eq "\n") {
767
return @refs;
768
} else {
769
- die("Invalid command in a '$cmd' batch: ". $_);
769
+ die("Invalid command in a '$cmd' batch: $_\n");
770
}
771
}
772
return;
@@ -878,7 +878,7 @@ sub mw_import_revids {
878
my $result = $mediawiki->api($query);
879
880
if (!$result) {
881
- die "Failed to retrieve modified page for revision $pagerevid";
881
+ die "Failed to retrieve modified page for revision $pagerevid\n";
882
}
883
884
if (defined($result->{query}->{badrevids}->{$pagerevid})) {
@@ -887,7 +887,7 @@ sub mw_import_revids {
887
}
888
889
if (!defined($result->{query}->{pages})) {
890
- die "Invalid revision $pagerevid.";
890
+ die "Invalid revision $pagerevid.\n";
891
}
892
893
my @result_pages = values(%{$result->{query}->{pages}});
@@ -998,7 +998,7 @@ sub mw_upload_file {
998
}, {
999
skip_encoding => 1
1000
} ) || die $mediawiki->{error}->{code} . ':'
1001
- . $mediawiki->{error}->{details};
1001
+ . $mediawiki->{error}->{details} . "\n";
1002
my $last_file_page = $mediawiki->get_page({title => $path});
1003
$newrevid = $last_file_page->{revid};
1004
print STDERR "Pushed file: $new_sha1 - $complete_file_name.\n";
@@ -1078,7 +1078,7 @@ sub mw_push_file {
1078
# Other errors. Shouldn't happen => just die()
1079
die 'Fatal: Error ' .
1080
$mediawiki->{error}->{code} .
1081
- ' from mediwiki: ' . $mediawiki->{error}->{details};
1081
+ ' from mediwiki: ' . $mediawiki->{error}->{details} . "\n";
1082
}
1083
}
1084
$newrevid = $result->{edit}->{newrevid};
@@ -1100,7 +1100,7 @@ sub mw_push {
1100
my $pushed;
1101
for my $refspec (@refsspecs) {
1102
my ($force, $local, $remote) = $refspec =~ /^(\+)?([^:]*):([^:]*)$/
1103
- or die("Invalid refspec for push. Expected <src>:<dst> or +<src>:<dst>");
1103
+ or die("Invalid refspec for push. Expected <src>:<dst> or +<src>:<dst>\n");
1104
if ($force) {
1105
print STDERR "Warning: forced push not allowed on a MediaWiki.\n";
1106
}
@@ -1172,7 +1172,7 @@ sub mw_push_revision {
1172
$local_ancestry{$parent} = $child;
1173
}
1174
} elsif (!$line =~ /^([a-f0-9]+)/) {
1175
- die "Unexpected output from git rev-list: $line";
1175
+ die "Unexpected output from git rev-list: $line\n";
1176
}
1177
}
1178
while ($parsed_sha1 ne $HEAD_sha1) {
@@ -1226,7 +1226,7 @@ sub mw_push_revision {
1226
return error_non_fast_forward($remote);
1227
}
1228
if ($status ne "ok") {
1229
- die("Unknown error from mw_push_file()");
1229
+ die("Unknown error from mw_push_file()\n");
1230
}
1231
}
1232
unless ($dumb_push) {