git-remote-mediawiki: refactor loop over revision ids
Without changing the behavior, we turn the foreach loop on an array of revisions into a loop on an array of integer. It will be easier to implement other strategies as they will only need to produce an array of integer instead of a more complex data-structure. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Jul 6, 2012 at 12:03 UTC
4465b6d6101173481eb5a4b7de6bda97ea03dc19
1 file changed
+11
-6
contrib/mw-to-git/git-remote-mediawiki
+11
-6
@@ -819,30 +819,35 @@ sub mw_import_ref {
819
# Creation of the fast-import stream
820
print STDERR "Fetching & writing export data...\n";
821
822
+ @revisions = sort {$a->{revid} <=> $b->{revid}} @revisions;
823
+ my @revision_ids = map $_->{revid}, @revisions;
824
+
825
$n = 0;
826
my $last_timestamp = 0; # Placeholer in case $rev->timestamp is undefined
827
825
- foreach my $pagerevid (sort {$a->{revid} <=> $b->{revid}} @revisions) {
828
+ foreach my $pagerevid (@revision_ids) {
829
# fetch the content of the pages
830
my $query = {
831
action => 'query',
832
prop => 'revisions',
833
rvprop => 'content|timestamp|comment|user|ids',
831
- revids => $pagerevid->{revid},
834
+ revids => $pagerevid,
835
};
836
837
my $result = $mediawiki->api($query);
838
836
- my $rev = pop(@{$result->{query}->{pages}->{$pagerevid->{pageid}}->{revisions}});
839
+ my @result_pages = values(%{$result->{query}->{pages}});
840
+ my $result_page = $result_pages[0];
841
+ my $rev = $result_pages[0]->{revisions}->[0];
842
843
$n++;
844
840
- my $page_title = $result->{query}->{pages}->{$pagerevid->{pageid}}->{title};
845
+ my $page_title = $result_page->{title};
846
my %commit;
847
$commit{author} = $rev->{user} || 'Anonymous';
848
$commit{comment} = $rev->{comment} || '*Empty MediaWiki Message*';
849
$commit{title} = mediawiki_smudge_filename($page_title);
845
- $commit{mw_revision} = $pagerevid->{revid};
850
+ $commit{mw_revision} = $rev->{revid};
851
$commit{content} = mediawiki_smudge($rev->{'*'});
852
853
if (!defined($rev->{timestamp})) {
@@ -861,7 +866,7 @@ sub mw_import_ref {
866
# If this is a revision of the media page for new version
867
# of a file do one common commit for both file and media page.
868
# Else do commit only for that page.
864
- print STDERR "$n/", scalar(@revisions), ": Revision #$pagerevid->{revid} of $commit{title}\n";
869
+ print STDERR "$n/", scalar(@revision_ids), ": Revision #$rev->{revid} of $commit{title}\n";
870
import_file_revision(\%commit, ($fetch_from == 1), $n, \%mediafile);
871
}
872