undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-remote-mediawiki: escape ", \, and LF in file names

Browse Source 
A mediawiki page can contain, and even start with a " character, we have
to escape it when generating the fast-export stream, as well as \
character. While we're there, also escape newlines, but I don't think we
can get them from MediaWiki pages.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2012-11-29 18:00:55 +01:00 committed by Junio C Hamano
parent 93341d805f
commit 462d97daf6
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/mw-to-git/git-remote-mediawiki
View File

@ -711,6 +711,14 @@ sub fetch_mw_revisions {
return ($n, @revisions); return ($n, @revisions);
} }
sub fe_escape_path {
my $path = shift;
$path =~ s/\\/\\\\/g;
$path =~ s/"/\\"/g;
$path =~ s/\n/\\n/g;
return '"' . $path . '"';
}
sub import_file_revision { sub import_file_revision {
my $commit = shift; my $commit = shift;
my %commit = %{$commit}; my %commit = %{$commit};
@ -738,15 +746,17 @@ sub import_file_revision {
print STDOUT "from refs/mediawiki/$remotename/master^0\n"; print STDOUT "from refs/mediawiki/$remotename/master^0\n";
} }
if ($content ne DELETED_CONTENT) { if ($content ne DELETED_CONTENT) {
print STDOUT "M 644 inline $title.mw\n"; print STDOUT "M 644 inline " .
fe_escape_path($title . ".mw") . "\n";
literal_data($content); literal_data($content);
if (%mediafile) { if (%mediafile) {
print STDOUT "M 644 inline $mediafile{title}\n"; print STDOUT "M 644 inline "
. fe_escape_path($mediafile{title}) . "\n";
literal_data_raw($mediafile{content}); literal_data_raw($mediafile{content});
} }
print STDOUT "\n\n"; print STDOUT "\n\n";
} else { } else {
print STDOUT "D $title.mw\n"; print STDOUT "D " . fe_escape_path($title . ".mw") . "\n";
} }
# mediawiki revision number in the git note # mediawiki revision number in the git note

26
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
View File

@ -318,4 +318,30 @@ test_expect_success 'git push with \ in format control' '
' '
test_expect_success 'fast-import meta-characters in page name (mw -> git)' '
wiki_reset &&
wiki_editpage \"file\"_\\_foo "expect to be called \"file\"_\\_foo" false &&
git clone mediawiki::'"$WIKI_URL"' mw_dir_21 &&
test_path_is_file mw_dir_21/\"file\"_\\_foo.mw &&
wiki_getallpage ref_page_21 &&
test_diff_directories mw_dir_21 ref_page_21
'
test_expect_success 'fast-import meta-characters in page name (git -> mw) ' '
wiki_reset &&
git clone mediawiki::'"$WIKI_URL"' mw_dir_22 &&
(
cd mw_dir_22 &&
echo "this file is called \"file\"_\\_foo.mw" >\"file\"_\\_foo &&
git add . &&
git commit -am "file \"file\"_\\_foo" &&
git pull &&
git push
) &&
wiki_getallpage ref_page_22 &&
test_diff_directories mw_dir_22 ref_page_22
'
test_done test_done