summaryrefslogtreecommitdiff
path: root/dev-vcs/git
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-16 18:25:06 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-16 18:25:06 +0000
commit7972abc05090180dcc09d2b16af4020ce1cd1841 (patch)
tree3e6e1c7ca86ab7d4e8dc45009f67403fc489ade9 /dev-vcs/git
parente4ad5901ca8464ae513bd315a1c0349c2bd0986c (diff)
gentoo auto-resync : 16:03:2023 - 18:25:06
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/Manifest3
-rw-r--r--dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch46
-rw-r--r--dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch97
-rw-r--r--dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch48
4 files changed, 0 insertions, 194 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index c49f5ef01775..2c570f64397a 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -2,9 +2,6 @@ AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df
AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7a48986c4ebba95f3e7ab033bc1b9c29eee9ded0b47a2c6d6831d4ece0662dd244f41a670d0805e1a5c8bd8c25531fcfb3493 SHA512 3c076c2865e930cfe2f0c9d01fb8e272037aeed99b46063e88942b89b1191e8149fd87ecbcbdb2d23ea37d556a971434938d7f4e4e2eef0e26e1b250534cc0e2
AUX git-2.37.2-darwin-prefix-gettext.patch 922 BLAKE2B 172c5be167cf865a137f60fb0ffb022c3ffe54fb865f495bd10a160920a5448c842ee74a64d385730595cf329be0aeff56dd104b3da636feb1ce3f21f30206fd SHA512 2c5ad30d69e6333288231b2eff5219d815dfab3149119adcf799eff57030c2000061cc57add97992ac228225d40e97f4da86c46794c654334f667996efe325c1
AUX git-2.37.2-unsafe-directory.patch 367 BLAKE2B 433c4b39777d1f24fbebb0b08dc09672c059c01bbd8930b3a235d66d2990dcc5e3f17e758ff7860ce3d37d778db1a8792fd847ad110fef730095e52430fb0c19 SHA512 f23b0c29977e33596daa4eab60fcc1f64522dac93f6baa39aea9c627740363073176aabf29fe680a9802be34d9c3948713e17ce798000895cec787ccb40f56a7
-AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be
-AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f
-AUX git-2.7.0-mediawiki-subpages.patch 2091 BLAKE2B 01c6735edd80c3f264b8fe41edd5acb9fb375f0cd439ea4719932d0f0ebb8e00e3acea8e4de465bd75d35cce096dc720e3b4edabd13e80d1374af9806158e40f SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e
AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a
AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101ae96374145eb81076cc2018e73141aa9dc8c4e50b7f1087e8265f4bcd56d761c60375607268d470437 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec
AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701
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 <kevin@ki-ai.org>
-Date: Fri, 28 Aug 2015 15:53:37 -0500
-Subject: [PATCH] Add namespace support to git-mediawiki
-
-Signed-off-by: Kevin <kevin@ki-ai.org>
----
- 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 <lyubomyr-shaydariv@users.noreply.github.com>
-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);
- }
-