From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: [PATCH 08/12] git-remote-mediawiki: change return type of get_mw_pages Date: Fri, 6 Jul 2012 12:03:11 +0200 Message-ID: <1341568995-12467-9-git-send-email-Matthieu.Moy@imag.fr> References: <1341568995-12467-1-git-send-email-Matthieu.Moy@imag.fr> Cc: Matthieu Moy To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Fri Jul 06 12:04:12 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sn5OU-0006dd-PZ for gcvg-git-2@plane.gmane.org; Fri, 06 Jul 2012 12:04:11 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932841Ab2GFKEC (ORCPT ); Fri, 6 Jul 2012 06:04:02 -0400 Received: from mx2.imag.fr ([129.88.30.17]:60784 "EHLO rominette.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932642Ab2GFKD5 (ORCPT ); Fri, 6 Jul 2012 06:03:57 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by rominette.imag.fr (8.13.8/8.13.8) with ESMTP id q66A2a4q008052 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Fri, 6 Jul 2012 12:02:36 +0200 Received: from bauges.imag.fr ([129.88.7.32]) by mail-veri.imag.fr with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Sn5OA-0003UY-8r; Fri, 06 Jul 2012 12:03:50 +0200 Received: from moy by bauges.imag.fr with local (Exim 4.72) (envelope-from ) id 1Sn5OA-0003HR-7a; Fri, 06 Jul 2012 12:03:50 +0200 X-Mailer: git-send-email 1.7.11.1.147.g47a574d In-Reply-To: <1341568995-12467-1-git-send-email-Matthieu.Moy@imag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (rominette.imag.fr [129.88.30.17]); Fri, 06 Jul 2012 12:02:36 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: q66A2a4q008052 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr MailScanner-NULL-Check: 1342173758.76475@23Rwt+ftrtR5eODRuMb+ag Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- contrib/mw-to-git/git-remote-mediawiki | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index 063a978..4bf990b 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(); -- 1.7.11.1.147.g47a574d