patch, 5 partsgit-svn: Make merge metadata accessible to make_log_entry

diff --git a/git-svn.perl b/git-svn.perl
index 51f03ad..53bf20c 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2491,7 +2491,7 @@ sub set_commit_header_env {
 
 	$ENV{GIT_AUTHOR_NAME} = $log_entry->{name};
 	$ENV{GIT_AUTHOR_EMAIL} = $log_entry->{email};
-	$ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
+	$ENV{GIT_AUTHOR_DATE} = $log_entry->{date};
 
 	$ENV{GIT_COMMITTER_NAME} = (defined $log_entry->{commit_name})
 						? $log_entry->{commit_name}
@@ -2499,6 +2499,9 @@ sub set_commit_header_env {
 	$ENV{GIT_COMMITTER_EMAIL} = (defined $log_entry->{commit_email})
 						? $log_entry->{commit_email}
 						: $log_entry->{email};
+        $ENV{GIT_COMMITTER_DATE} =  (defined $log_entry->{commit_date})
+						? $log_entry->{commit_date}
+						: $log_entry->{date};
 	\%env;
 }
 

diff --git a/git-svn.perl b/git-svn.perl
index 53bf20c..5337326 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2924,7 +2924,7 @@ sub check_author {
 }
 
 sub find_extra_svk_parents {
-	my ($self, $ed, $tickets, $parents) = @_;
+	my ($self, $ed, $tickets, $parents, $merges) = @_;
 	# aha!  svk:merge property changed...
 	my @tickets = split "\n", $tickets;
 	my @known_parents;
@@ -2944,14 +2944,15 @@ sub find_extra_svk_parents {
 				# wahey!  we found it, but it might be
 				# an old one (!)
 				push @known_parents, [ $rev, $commit ];
+				push @known_parents, [ $rev, $path, $commit ];
 			}
 		}
 	}
 	# Ordering matters; highest-numbered commit merge tickets
 	# first, as they may account for later merge ticket additions
 	# or changes.
-	@known_parents = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @known_parents;
-	for my $parent ( @known_parents ) {
+	for my $merge ( sort {$b->[0] <=> $a->[0]} @known_parents ) {
+		my ($rev, $path, $parent) = @{$merge};
 		my @cmd = ('rev-list', $parent, map { "^$_" } @$parents );
 		my ($msg_fh, $ctx) = command_output_pipe(@cmd);
 		my $new;
@@ -2963,6 +2964,7 @@ sub find_extra_svk_parents {
 			print STDERR
 			    "Found merge parent (svk:merge ticket): $parent\n";
 			push @$parents, $parent;
+			push @$merges, "$path:$rev";
 		}
 	}
 }
@@ -3061,27 +3063,31 @@ sub make_log_entry {
 	my ($self, $rev, $parents, $ed) = @_;
 	my $untracked = $self->get_untracked($ed);
 
-	my @parents = @$parents;
+	my %log_entry = ( parents => $parents,
+	                  merged_branches => [],
+	                  revision => $rev,
+	                  log => '');
 	my $ps = $ed->{path_strip} || "";
 	for my $path ( grep { m/$ps/ } %{$ed->{dir_prop}} ) {
 		my $props = $ed->{dir_prop}{$path};
 		if ( $props->{"svk:merge"} ) {
 			$self->find_extra_svk_parents
-				($ed, $props->{"svk:merge"}, \@parents);
+				($ed,
+				 $props->{"svk:merge"},
+				 $log_entry{parents},
+				 $log_entry{merged_branches});
 		}
 		if ( $props->{"svn:mergeinfo"} ) {
 			$self->find_extra_svn_parents
 				($ed,
 				 $props->{"svn:mergeinfo"},
-				 \@parents);
+				 $log_entry{parents});
 		}
 	}
 
 	open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
 	print $un "r$rev\n" or croak $!;
 	print $un $_, "\n" foreach @$untracked;
-	my %log_entry = ( parents => \@parents, revision => $rev,
-	                  log => '');
 
 	my $headrev;
 	my $logged = delete $self->{logged_rev_props};

diff --git a/git-svn.perl b/git-svn.perl
index 5337326..0731425 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3110,7 +3110,8 @@ sub make_log_entry {
 	close $un or croak $!;
 
 	$log_entry{date} = parse_svn_date($log_entry{date});
-	$log_entry{log} .= "\n";
+	parse_svk_log(\%log_entry) if $log_entry{log} =~ svk_header_regex( lenient => 1 );
+
 	my $author = $log_entry{author} = check_author($log_entry{author});
 	my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
 						       : ($author, undef);
@@ -3118,7 +3119,15 @@ sub make_log_entry {
 	my ($commit_name, $commit_email) = ($name, $email);
 	if ($_use_log_author) {
 		my $name_field;
-		if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
+		if ($log_entry{log_author}) {
+			$log_entry{commit_date} = $log_entry{date};
+			$log_entry{date} = $log_entry{log_author_date};
+			$log_entry{log_author} = check_author($log_entry{log_author});
+			my ($log_author_name, $log_author_email)
+			    = defined $::users{$log_entry{log_author}} ? @{$::users{$log_entry{log_author}}}
+			        : ($log_entry{log_author}, undef);
+			$name_field = "$log_author_name <$log_author_email>";
+		} elsif ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
 			$name_field = $1;
 		} elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
 			$name_field = $1;
@@ -3182,6 +3191,91 @@ sub make_log_entry {
 	\%log_entry;
 }
 
+sub svk_header_regex {
+	my %args = ( lenient => 0, orig => 0, @_ );
+	my $orig = $args{orig} ? qr/ \(orig r\d+\)/ : "";
+	my $atstart = "";
+	if ($args{lenient}) {
+		$atstart = qr/\s*/;
+		$orig = qr/(?: \(orig r\d+\))?/;
+	}
+	return qr/^${atstart}r\d+\@\S+$orig:\s*(\S+)\s*\|\s*(.*?)\s*([+-]\d+)$/m;
+}
+
+sub parse_svk_log {
+	my $log_entry = shift;
+	my $log = $log_entry->{log};
+
+	# Strip off blank lines at the start and end
+	$log =~ s/^(\s*?\n)+//;
+	$log =~ s/\s*$//;
+
+	# If each line starts with a space, this might be an
+	# unmodified SVK log format.  As a side effect, this also
+	# trims the leading space off of the lines.
+	my $lines = $log =~ s/^//mg;
+	my $spaced = $log =~ s/^ //mg;
+	return unless $lines == $spaced;
+
+	my $regex = svk_header_regex( orig => 1 );
+	if ($log =~ /\A$regex/) {
+		# This is either a merge commit, or a base-less merge
+		# (replay from a different repository) The \A assures
+		# that this is an _unedited_ merge commit with no
+		# hand-supplied log message.
+		if (@{$log_entry->{merged_branches} || []}) {
+			# This is a merge with no description; provide
+			# one.
+			$log_entry->{log} = "Merge from @{$log_entry->{merged_branches}}\n\n$log";
+		} else {
+			my $commits = 0;
+			$commits++ while $log =~ /$regex/g;
+			if ($commits == 1) {
+				# This is a baseless merge of one
+				# commit; strip off the original
+				# commit info
+				$log_entry->{log_author} = $1;
+				$log_entry->{log_author_date} = "$3 $2";
+				$log =~ s/\A$regex\n*//;
+				$log_entry->{log} = $log;
+				parse_svk_log($log_entry);
+			} else {
+				# A lump baseless merge?  Remove all
+				# of the SVK headers on this level,
+				# and add a summary.  Trailing
+				# newlines on the svk header lines are
+				# left unmolested, so they become
+				# blank lines.
+				$log =~ s/$regex//g;
+				$log_entry->{log} = "Lump commit\n$log";
+			}
+		}
+	} else {
+		# Look for svk header lines without the (orig r12345),
+		# which were local commits.
+		$regex = svk_header_regex();
+		my $commits = 0;
+		$commits++ while $log =~ /$regex/g;
+		if ($commits == 0) {
+			# No more svk-like commits; don't change anything.
+		} elsif ($commits == 1) {
+			# Only one top-level commit-like object; strip
+			# it off, recurse down.
+			$log_entry->{log_author} = $1;
+			$log_entry->{log_author_date} = "$3 $2";
+			$log =~ s/$regex\n*//;
+			$log_entry->{log} = $log;
+			parse_svk_log($log_entry);
+		} else {
+			# This is a lump push of local commits.	 Strip
+			# off all of the svk headers in this level,
+			# and call it quits.
+			$log =~ s/$regex//g;
+			$log_entry->{log} = $log;
+		}
+	}
+}
+
 sub fetch {
 	my ($self, $min_rev, $max_rev, @parents) = @_;
 	my ($last_rev, $last_commit) = $self->last_rev_commit;

diff --git a/git-svn.perl b/git-svn.perl
index 0731425..87462c9 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3111,6 +3111,7 @@ sub make_log_entry {
 
 	$log_entry{date} = parse_svn_date($log_entry{date});
 	parse_svk_log(\%log_entry) if $log_entry{log} =~ svk_header_regex( lenient => 1 );
+	$log_entry{log} = "(empty commit message)\n" unless $log_entry{log} =~ /\S/;
 
 	my $author = $log_entry{author} = check_author($log_entry{author});
 	my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}

diff --git a/git-svn.perl b/git-svn.perl
index 87462c9..804a26c 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2973,7 +2973,7 @@ sub find_extra_svk_parents {
 # have actually changed
 sub find_extra_svn_parents {
 	my ($self, $ed, $mergeinfo, $parents) = @_;
-	# aha!  svk:merge property changed...
+	# aha!  svn:mergeinfo property changed...
 
 	# We first search for merged tips which are not in our
 	# history.  Then, we figure out which git revisions are in