Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
remote-mediawiki: add namespace support
author
Kevin
<kevin@ki-ai.org>
Mon, 6 Nov 2017 21:19:47 +0000
(16:19 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 7 Nov 2017 00:45:55 +0000
(09:45 +0900)
This introduces a new remote.origin.namespaces argument that is a
space-separated list of namespaces. The list of pages extract is then
taken from all the specified namespaces.
Reviewed-by: Antoine Beaupré <anarcat@debian.org>
Signed-off-by: Antoine Beaupré <anarcat@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/mw-to-git/git-remote-mediawiki.perl
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
cb5918a
)
diff --git
a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index e7f857c1a2882c7c701af3e2ce6c3223bfd88c7c..5ffb57595324bd9ff9c9118c82d7c210ba565387 100755
(executable)
--- a/
contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/
contrib/mw-to-git/git-remote-mediawiki.perl
@@
-63,6
+63,10
@@
my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
chomp(@tracked_categories);
my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
chomp(@tracked_categories);
+# Just like @tracked_categories, but for MediaWiki namespaces.
+my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
+chomp(@tracked_namespaces);
+
# Import media files on pull
my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
chomp($import_media);
# Import media files on pull
my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
chomp($import_media);
@@
-256,6
+260,23
@@
sub get_mw_tracked_categories {
return;
}
return;
}
+sub get_mw_tracked_namespaces {
+ my $pages = shift;
+ foreach my $local_namespace (@tracked_namespaces) {
+ my $mw_pages = $mediawiki->list( {
+ action => 'query',
+ list => 'allpages',
+ apnamespace => get_mw_namespace_id($local_namespace),
+ aplimit => 'max' } )
+ || die $mediawiki->{error}->{code} . ': '
+ . $mediawiki->{error}->{details} . "\n";
+ foreach my $page (@{$mw_pages}) {
+ $pages->{$page->{title}} = $page;
+ }
+ }
+ return;
+}
+
sub get_mw_all_pages {
my $pages = shift;
# No user-provided list, get the list of pages from the API.
sub get_mw_all_pages {
my $pages = shift;
# No user-provided list, get the list of pages from the API.
@@
-319,6
+340,10
@@
sub get_mw_pages {
$user_defined = 1;
get_mw_tracked_categories(\%pages);
}
$user_defined = 1;
get_mw_tracked_categories(\%pages);
}
+ if (@tracked_namespaces) {
+ $user_defined = 1;
+ get_mw_tracked_namespaces(\%pages);
+ }
if (!$user_defined) {
get_mw_all_pages(\%pages);
}
if (!$user_defined) {
get_mw_all_pages(\%pages);
}