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

Merge branch 'maint'

Browse Source 
* maint:
  git-remote-mediawiki: bugfix for pages w/ >500 revisions
This commit is contained in:
Jonathan Nieder 2013-09-24 23:19:00 -07:00
commit 962393b5d9
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/mw-to-git/git-remote-mediawiki.perl
View File

@ -625,6 +625,9 @@ sub fetch_mw_revisions_for_page {
rvstartid => $fetch_from, rvstartid => $fetch_from,
rvlimit => 500, rvlimit => 500,
pageids => $id, pageids => $id,
# Let MediaWiki know that we support the latest API.
continue => '',
}; };
my $revnum = 0; my $revnum = 0;
@ -640,8 +643,15 @@ sub fetch_mw_revisions_for_page {
push(@page_revs, $page_rev_ids); push(@page_revs, $page_rev_ids);
$revnum++; $revnum++;
} }
last if (!$result->{'query-continue'});
$query->{rvstartid} = $result->{'query-continue'}->{revisions}->{rvstartid}; if ($result->{'query-continue'}) { # For legacy APIs
$query->{rvstartid} = $result->{'query-continue'}->{revisions}->{rvstartid};
} elsif ($result->{continue}) { # For newer APIs
$query->{rvstartid} = $result->{continue}->{rvcontinue};
$query->{continue} = $result->{continue}->{continue};
} else {
last;
}
} }
if ($shallow_import && @page_revs) { if ($shallow_import && @page_revs) {
print {*STDERR} " Found 1 revision (shallow import).\n"; print {*STDERR} " Found 1 revision (shallow import).\n";

23
contrib/mw-to-git/t/t9365-continuing-queries.sh Executable file
View File

@ -0,0 +1,23 @@
#!/bin/sh
test_description='Test the Git Mediawiki remote helper: queries w/ more than 500 results'
. ./test-gitmw-lib.sh
. $TEST_DIRECTORY/test-lib.sh
test_check_precond
test_expect_success 'creating page w/ >500 revisions' '
wiki_reset &&
for i in `test_seq 501`
do
echo "creating revision $i" &&
wiki_editpage foo "revision $i<br/>" true
done
'
test_expect_success 'cloning page w/ >500 revisions' '
git clone mediawiki::'"$WIKI_URL"' mw_dir
'
test_done