Re: git-svn author file and svn2cl compatibility

[strk <strk@keybit.net>]

[-- Attachment #1: Type: text/plain, Size: 616 bytes --]

I attach a patch implementing the added support.

--strk;

On Wed, Dec 22, 2010 at 07:41:10PM +0100, strk wrote:
> The svn2cl tool [1] supports an author file to use for
> generating the ChangeLog.
> 
> [1] http://arthurdejong.org/svn2cl/
> 
> Format of the file is:
>  nick1:Name <email>
>  nick2:Name 2 <email2>
> 
> It would be nice if git-svn could support the same format
> in addition to the one using ``='' instead of ``:''.
> 
> That way you might have the authors file already available
> in projects that made use of svn2cl.
> 
> Does it make sense ?
> 
> Please include me in reply as I'm not subscribed.

[-- Attachment #2: 0001-Also-accept-svn2cl-format-for-authors-file.patch --]
[-- Type: text/plain, Size: 758 bytes --]

>From 0e6d6f3415b6d206e9cd8001ed4ce994e4150c39 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 23 Dec 2010 09:07:10 +0100
Subject: [PATCH] Also accept svn2cl format for authors file

---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 177dd25..6fd0f7f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1424,7 +1424,7 @@ sub load_authors {
 	my $log = $cmd eq 'log';
 	while (<$authors>) {
 		chomp;
-		next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
+		next unless /^(.+?|\(no author\))\s*[=:]\s*(.+?)\s*<(.+)>\s*$/;
 		my ($user, $name, $email) = ($1, $2, $3);
 		if ($log) {
 			$Git::SVN::Log::rusers{"$name <$email>"} = $user;
-- 
1.7.0.4