From: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Fri, 6 Jul 2012 10:03:11 +0000 (+0200)
Subject: git-remote-mediawiki: change return type of get_mw_pages
X-Git-Tag: v1.7.12-rc0~40^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1ede9a9f232b1416d1487bba3f69a8e88ec75ee;p=thirdparty%2Fgit.git

git-remote-mediawiki: change return type of get_mw_pages

The previous version was returning the list of pages to be fetched, but
we are going to need an efficient membership test (i.e. is the page
$title tracked), hence exposing a hash will be more convenient.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki
index 063a978a6e..4bf990bd58 100755
--- a/contrib/mw-to-git/git-remote-mediawiki
+++ b/contrib/mw-to-git/git-remote-mediawiki
@@ -379,7 +379,7 @@ sub get_mw_pages {
 			get_all_mediafiles(\%pages);
 		}
 	}
-	return values(%pages);
+	return %pages;
 }
 
 # usage: $out = run_git("command args");
@@ -536,7 +536,8 @@ my %basetimestamps;
 sub get_last_remote_revision {
 	mw_connect_maybe();
 
-	my @pages = get_mw_pages();
+	my %pages_hash = get_mw_pages();
+	my @pages = values(%pages_hash);
 
 	my $max_rev_num = 0;
 
@@ -802,7 +803,8 @@ sub mw_import_ref {
 
 	mw_connect_maybe();
 
-	my @pages = get_mw_pages();
+	my %pages_hash = get_mw_pages();
+	my @pages = values(%pages_hash);
 
 	print STDERR "Searching revisions...\n";
 	my $last_local = get_last_local_revision();