git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthijs Kooijman <matthijs@stdin.nl>
To: Eric Wong <normalperson@yhbt.net>
Cc: Gustav Munkby <grddev@gmail.com>,
	Edward Rudd <urkle@outoforder.cc>, Carsten Bormann <cabo@tzi.org>,
	git@vger.kernel.org, Matthijs Kooijman <matthijs@stdin.nl>
Subject: [PATCH 1/2] git-svn: use platform specific auth providers
Date: Thu, 26 Apr 2012 21:34:02 +0200	[thread overview]
Message-ID: <1335468843-24653-1-git-send-email-matthijs@stdin.nl> (raw)
In-Reply-To: <20120426183634.GA4023@login.drsnuggles.stderr.nl>

On Linux, this makes authentication using passwords from gnome-keyring
and kwallet work (only the former was tested). On Mac OS X, this allows
using the OS X Keychain.
---
 git-svn.perl |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 4334b95..1790d10 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -5436,7 +5436,7 @@ BEGIN {
 }
 
 sub _auth_providers () {
-	[
+	my @rv = (
 	  SVN::Client::get_simple_provider(),
 	  SVN::Client::get_ssl_server_trust_file_provider(),
 	  SVN::Client::get_simple_prompt_provider(
@@ -5452,7 +5452,23 @@ sub _auth_providers () {
 	    \&Git::SVN::Prompt::ssl_server_trust),
 	  SVN::Client::get_username_prompt_provider(
 	    \&Git::SVN::Prompt::username, 2)
-	]
+	);
+
+	# earlier 1.6.x versions would segfault, and <= 1.5.x didn't have
+	# this function
+	if ($SVN::Core::VERSION gt '1.6.12') {
+		my $config = SVN::Core::config_get_config($config_dir);
+		my ($p, @a);
+		# config_get_config returns all config files from
+		# ~/.subversion, auth_get_platform_specific_client_providers
+		# just wants the config "file".
+		@a = ($config->{'config'}, undef);
+		$p = SVN::Core::auth_get_platform_specific_client_providers(@a);
+		# Insert the return value from
+		# auth_get_platform_specific_providers
+		unshift @rv, @$p;
+	}
+	\@rv;
 }
 
 sub escape_uri_only {
-- 
1.7.10

  reply	other threads:[~2012-04-26 20:12 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-18  0:36 git-svn won't remember pem password Igor
2012-02-18 11:30 ` Jakub Narebski
2012-02-19  4:03   ` Nikolaus Demmel
2012-02-20  0:57   ` Jeff King
2012-02-20  3:08     ` Nikolaus Demmel
2012-02-19  1:30 ` Eric Wong
2012-04-26 18:00   ` Matthijs Kooijman
     [not found]     ` <41A093CB-CA4A-4FEF-9F5C-A9B626D10AFB@gmail.com>
     [not found]       ` <20120426181327.GZ4023@login.drsnuggles.stderr.nl>
2012-04-26 18:31         ` Igor
2012-04-26 18:36           ` Matthijs Kooijman
2012-04-26 19:34             ` Matthijs Kooijman [this message]
2012-04-26 19:34               ` [PATCH 2/2] git-svn: Configure a prompt callback for gnome_keyring Matthijs Kooijman
2012-04-27  8:28                 ` Eric Wong
2012-04-27  9:36                   ` Matthijs Kooijman
2013-06-18 16:36                   ` Matthijs Kooijman
2013-06-18 16:38                     ` [PATCH] " Matthijs Kooijman
2013-08-29  9:42                       ` Matthijs Kooijman
2013-08-29 17:38                         ` Eric Wong
     [not found]                           ` <35AE7D09-F859-4277-AC74-729BA1188D10@outoforder.cc>
2013-08-29 17:56                             ` Eric Wong
2012-04-27  8:29                 ` [PATCH 2/2] " Matthijs Kooijman
2012-04-27  8:21               ` [PATCH 1/2] git-svn: use platform specific auth providers Eric Wong
2012-04-27  8:25                 ` Matthijs Kooijman
2012-04-29  8:23                   ` Eric Wong
2012-04-30  0:03                     ` Junio C Hamano
2012-04-30  1:21                       ` Junio C Hamano
2012-04-30  8:19                         ` Eric Wong
2012-04-30 16:04                           ` Junio C Hamano
2012-04-30 16:53                             ` Matthijs Kooijman
2012-04-30 19:02                               ` Eric Wong
2012-04-30 19:20                                 ` Matthijs Kooijman
2012-05-01  1:08                                   ` Junio C Hamano
2012-06-03 10:49                                     ` Charles Bailey
2012-06-03 21:44                                       ` Junio C Hamano
2012-06-04  9:00                                         ` Matthijs Kooijman
2012-06-04 19:26                                           ` Junio C Hamano
2012-06-04 19:36                                             ` Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335468843-24653-1-git-send-email-matthijs@stdin.nl \
    --to=matthijs@stdin.nl \
    --cc=cabo@tzi.org \
    --cc=git@vger.kernel.org \
    --cc=grddev@gmail.com \
    --cc=normalperson@yhbt.net \
    --cc=urkle@outoforder.cc \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).