[PATCH 10/12] git-remote-mediawiki: extract revision-importing loop to a function
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:54:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Matthieu Moy <redacted> --- contrib/mw-to-git/git-remote-mediawiki | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki
index e19402c..beb4566 100755
--- a/contrib/mw-to-git/git-remote-mediawiki
+++ b/contrib/mw-to-git/git-remote-mediawiki@@ -849,10 +849,18 @@ sub mw_import_ref { @revisions = sort {$a->{revid} <=> $b->{revid}} @revisions; my @revision_ids = map $_->{revid}, @revisions; - $n = 0; + return mw_import_revids($fetch_from, \@revision_ids, \%pages_hash); +} + +sub mw_import_revids { + my $fetch_from = shift; + my $revision_ids = shift; + my $pages = shift; + + my $n = 0; my $last_timestamp = 0; # Placeholer in case $rev->timestamp is undefined - foreach my $pagerevid (@revision_ids) { + foreach my $pagerevid (@$revision_ids) { # fetch the content of the pages my $query = { action => 'query',
@@ -896,7 +904,7 @@ sub mw_import_ref { # If this is a revision of the media page for new version # of a file do one common commit for both file and media page. # Else do commit only for that page. - print STDERR "$n/", scalar(@revision_ids), ": Revision #$rev->{revid} of $commit{title}\n"; + print STDERR "$n/", scalar(@$revision_ids), ": Revision #$rev->{revid} of $commit{title}\n"; if (%mediafile) { print STDERR "\tDownloading file $mediafile{title}, version $mediafile{timestamp}\n"; import_file_revision(\%commit, ($fetch_from == 1), $n, \%mediafile);
@@ -911,6 +919,8 @@ sub mw_import_ref { # thrown saying that HEAD is refering to unknown object 0000000000000000000 # and the clone fails. } + + return $n; } sub error_non_fast_forward {
--
1.7.11.1.147.g47a574d