commit: 37305aa8f6bd146c01c41ae9aca55b52c82c5193 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Wed Mar 8 20:04:55 2023 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Thu Mar 16 16:39:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37305aa8
dev-vcs/git: cleanup patches Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> .../git/files/git-2.7.0-mediawiki-500pages.patch | 46 ---------- .../git/files/git-2.7.0-mediawiki-namespaces.patch | 97 ---------------------- .../git/files/git-2.7.0-mediawiki-subpages.patch | 48 ----------- 3 files changed, 191 deletions(-) diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch deleted file mode 100644 index 0ce706db99a6..000000000000 --- a/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch +++ /dev/null @@ -1,46 +0,0 @@ -Searching for pages using the MediaWiki API returns at most 500 results -(hi Patrick). To get a list of all pages in a larger wiki, we need to run -repeated searches... - -Source: https://github.com/moy/Git-Mediawiki/issues/32 -Author: anarcat https://github.com/anarcat - -diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl -index 8dd74a9..f2ce311 100755 ---- a/contrib/mw-to-git/git-remote-mediawiki.perl -+++ b/contrib/mw-to-git/git-remote-mediawiki.perl -@@ -259,16 +259,29 @@ sub get_mw_tracked_categories { - sub get_mw_all_pages { - my $pages = shift; - # No user-provided list, get the list of pages from the API. -- my $mw_pages = $mediawiki->list({ -+ my $query = { - action => 'query', - list => 'allpages', - aplimit => 'max' -- }); -- if (!defined($mw_pages)) { -+ }; -+ my $curpage; -+ my $oldpage = ''; -+ while (1) { -+ if (defined($curpage)) { -+ if ($oldpage eq $curpage) { -+ last; -+ } -+ $query->{apfrom} = $curpage; -+ $oldpage = $curpage; -+ } -+ my $mw_pages = $mediawiki->list($query); -+ if (!defined($mw_pages)) { - fatal_mw_error("get the list of wiki pages"); -- } -- foreach my $page (@{$mw_pages}) { -+ } -+ foreach my $page (@{$mw_pages}) { - $pages->{$page->{title}} = $page; -+ $curpage = $page->{title}; -+ } - } - return; - } diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch deleted file mode 100644 index 72ab2126fa9c..000000000000 --- a/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch +++ /dev/null @@ -1,97 +0,0 @@ -source: -https://gist.github.com/anarcat/f821fa285c6b8b6b16a5 -https://github.com/moy/Git-Mediawiki/issues/10 - - -From 147224cfe6143c44b16aec0bb6d6a506a6b96ced Mon Sep 17 00:00:00 2001 -From: Kevin <[email protected]> -Date: Fri, 28 Aug 2015 15:53:37 -0500 -Subject: [PATCH] Add namespace support to git-mediawiki - -Signed-off-by: Kevin <[email protected]> ---- - contrib/mw-to-git/git-remote-mediawiki.perl | 34 +++++++++++++++++++++++++++-- - 1 file changed, 32 insertions(+), 2 deletions(-) - -diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl -index 8dd74a9..662a5b5 100755 ---- a/contrib/mw-to-git/git-remote-mediawiki.perl -+++ b/contrib/mw-to-git/git-remote-mediawiki.perl -@@ -17,6 +17,7 @@ use Git; - use Git::Mediawiki qw(clean_filename smudge_filename connect_maybe - EMPTY HTTP_CODE_OK); - use DateTime::Format::ISO8601; -+use Scalar::Util; - use warnings; - - # By default, use UTF-8 to communicate with Git and the user -@@ -63,6 +64,10 @@ chomp(@tracked_pages); - 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); -@@ -256,6 +261,23 @@ sub get_mw_tracked_categories { - 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. -@@ -319,6 +341,10 @@ sub get_mw_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); - } -@@ -1263,7 +1289,6 @@ my %cached_mw_namespace_id; - sub get_mw_namespace_id { - $mediawiki = connect_maybe($mediawiki, $remotename, $url); - my $name = shift; -- - if (!exists $namespace_id{$name}) { - # Look at configuration file, if the record for that namespace is - # already cached. Namespaces are stored in form: -@@ -1331,7 +1356,12 @@ sub get_mw_namespace_id { - sub get_mw_namespace_id_for_page { - my $namespace = shift; - if ($namespace =~ /^([^:]*):/) { -- return get_mw_namespace_id($namespace); -+ my ($ns, $id) = split(/:/, $namespace); -+ if (Scalar::Util::looks_like_number($id)) { -+ return get_mw_namespace_id($ns); -+ } else{ -+ return -+ } - } else { - return; - } --- -2.5.0 diff --git a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch b/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch deleted file mode 100644 index c798a894d3f8..000000000000 --- a/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2593304723c6def159c10b9060dafa78a775a057 Mon Sep 17 00:00:00 2001 -From: Lyubomyr Shaydariv <[email protected]> -Date: Fri, 11 Sep 2015 00:41:17 +0300 -Subject: [PATCH] git-remote-mediawiki: support subpages as subdirectories - -This is a fix for https://github.com/moy/Git-Mediawiki/issues/22 -The subdirectories option is enabled using -c remote.origin.subpageDirs=true -during the cloning and it is not recommended to be modified in or -removed from .git/config after the cloning. ---- - contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl -index 8dd74a9..f3624be 100755 ---- a/contrib/mw-to-git/git-remote-mediawiki.perl -+++ b/contrib/mw-to-git/git-remote-mediawiki.perl -@@ -63,6 +63,11 @@ - my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories")); - chomp(@tracked_categories); - -+# Use subdirectories for subpages -+my $use_subpage_dirs = run_git("config --get --bool remote.${remotename}.subpageDirs"); -+chomp($use_subpage_dirs); -+$use_subpage_dirs = ($use_subpage_dirs eq 'true'); -+ - # Import media files on pull - my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport"); - chomp($import_media); -@@ -689,6 +694,9 @@ sub fe_escape_path { - $path =~ s/\\/\\\\/g; - $path =~ s/"/\\"/g; - $path =~ s/\n/\\n/g; -+ if ($use_subpage_dirs) { -+ $path =~ s/%2F/\//g; -+ } - return qq("${path}"); - } - -@@ -927,7 +935,7 @@ sub mw_import_revids { - # 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 ", fe_escape_path($commit{title}), "\n"; - import_file_revision(\%commit, ($fetch_from == 1), $n_actual, \%mediafile); - } -
