[PATCH 2/2] git-svn: Configure a prompt callback for gnome_keyring.

[Matthijs Kooijman <matthijs@stdin.nl>]

This allows git-svn to prompt for a keyring unlock password, when a
the needed gnome keyring is locked.

This requires changes in the subversion perl bindings which have been
committed to trunk (1241554 and some followup commits) and should be
available with the (as of yet unreleased) 1.8.0 release.
---
 git-svn.perl |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/git-svn.perl b/git-svn.perl
index 1790d10..6565f4a 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4420,6 +4420,11 @@ sub username {
 	$SVN::_Core::SVN_NO_ERROR;
 }
 
+sub gnome_keyring_unlock {
+	my ($keyring, $pool) = @_;
+	_read_password("Password for '$keyring' GNOME keyring: ", undef);
+}
+
 sub _read_password {
 	my ($prompt, $realm) = @_;
 	my $password = '';
@@ -5524,6 +5529,21 @@ sub new {
 			$Git::SVN::Prompt::_no_auth_cache = 1;
 		}
 	} # no warnings 'once'
+
+
+	# Allow git-svn to show a prompt for opening up a gnome-keyring, if needed.
+	if (defined(&SVN::Core::auth_set_gnome_keyring_unlock_prompt_func)) {
+		my $keyring_callback = SVN::Core::auth_set_gnome_keyring_unlock_prompt_func(
+			$baton,
+			\&Git::SVN::Prompt::gnome_keyring_unlock
+		);
+		# Keep a reference to this callback, to prevent the function
+		# (reference) from being garbage collected.  We just add it to
+		# the callbacks value, which are also used only to prevent the
+		# garbage collector from eating stuff.
+		$callbacks = [$callbacks, $keyring_callback]
+	}
+
 	my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
 	                      config => $config,
 			      pool => SVN::Pool->new,
-- 
1.7.10