X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d93aaed7919f0449d387aed6c6ee3aaff85a12eb..1b318dacbda00d05566f300bb4a69cd913ce0e71:/IkiWiki/Rcs/git.pm?ds=inline

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 376d03c78..26f2a39f2 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -1,13 +1,13 @@
 #!/usr/bin/perl
 
+package IkiWiki;
+
 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
-package IkiWiki;
-
 my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
 
@@ -180,14 +180,14 @@ sub _parse_diff_tree ($@) { #{{{
 			$ci{ "${who}_epoch" } = $epoch;
 			$ci{ "${who}_tz"    } = $tz;
 
-			if ($name =~ m/^([^<]+) <([^@>]+)/) {
-				my ($fullname, $username) = ($1, $2);
-				$ci{"${who}_fullname"}    = $fullname;
-				$ci{"${who}_username"}    = $username;
+			if ($name =~ m/^[^<]+\s+<([^@>]+)/) {
+				$ci{"${who}_username"} = $1;
+			}
+			elsif ($name =~ m/^([^<]+)\s+<>$/) {
+				$ci{"${who}_username"} = $1;
 			}
 			else {
-				$ci{"${who}_fullname"} =
-					$ci{"${who}_username"} = $name;
+				$ci{"${who}_username"} = $name;
 			}
 		}
 		elsif ($line =~ m/^$/) {
@@ -197,7 +197,7 @@ sub _parse_diff_tree ($@) { #{{{
 	}
 
 	debug("No 'tree' seen in diff-tree output") if !defined $ci{'tree'};
-
+	
 	if (defined $ci{'parents'}) {
 		$ci{'parent'} = @{ $ci{'parents'} }[0];
 	}
@@ -205,15 +205,13 @@ sub _parse_diff_tree ($@) { #{{{
 		$ci{'parent'} = 0 x 40;
 	}
 
-	# Commit message.
-	while (my $line = shift @{ $dt_ref }) {
-		if ($line =~ m/^$/) {
-			# Trailing empty line signals next section.
-			last;
-		};
+	# Commit message (optional).
+	while ($dt_ref->[0] =~ /^    /) {
+		my $line = shift @{ $dt_ref };
 		$line =~ s/^    //;
 		push @{ $ci{'comment'} }, $line;
 	}
+	shift @{ $dt_ref } if $dt_ref->[0] =~ /^$/;
 
 	# Modified files.
 	while (my $line = shift @{ $dt_ref }) {
@@ -279,7 +277,8 @@ sub git_sha1 (;$) { #{{{
 	my $file = shift || q{--};
 
 	# Ignore error since a non-existing file might be given.
-	my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD', $file);
+	my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD',
+		'--', $file);
 	if ($sha1) {
 		($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
 	} else { debug("Empty sha1sum for '$file'.") }
@@ -310,22 +309,6 @@ sub rcs_commit ($$$;$$) { #{{{
 
 	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
-	if (defined $user) {
-		$message = "web commit by $user" .
-		    (length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message = "web commit from $ipaddr" .
-		    (length $message ? ": $message" : "");
-	}
-
-	# XXX: Wiki directory is in the unlocked state when starting this
-	# action.  But it takes time for a Git process to finish its job
-	# (especially if a merge required), so we must re-lock to prevent
-	# race conditions.  Only when the time of the real commit action
-	# (i.e. git push) comes, we'll unlock the directory.
-	lockwiki();
-
 	# Check to see if the page has been changed by someone else since
 	# rcs_prepedit was called.
 	my $cur    = git_sha1($file);
@@ -335,17 +318,24 @@ sub rcs_commit ($$$;$$) { #{{{
 		my $conflict = _merge_past($prev, $file, $dummy_commit_msg);
 		return $conflict if defined $conflict;
 	}
+	
+	# Set the commit author to the web committer.
+	my %env=%ENV;
+	if (defined $user || defined $ipaddr) {
+		$ENV{GIT_AUTHOR_NAME}=(defined $user ? $user : $ipaddr)." (web)";
+		$ENV{GIT_AUTHOR_EMAIL}="";
+	}
 
 	# git commit returns non-zero if file has not been really changed.
 	# so we should ignore its exit status (hence run_or_non).
 	$message = possibly_foolish_untaint($message);
-	if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) {
-		unlockwiki();
+	if (run_or_non('git', 'commit', '--cleanup=verbatim', '-q', '-m', $message, '-i', $file)) {
 		if (length $config{gitorigin_branch}) {
 			run_or_cry('git', 'push', $config{gitorigin_branch});
 		}
 	}
-
+	
+	%ENV=%env;
 	return undef; # success
 } #}}}
 
@@ -368,14 +358,14 @@ sub rcs_recentchanges ($) { #{{{
 	my @rets;
 	foreach my $ci (git_commit_info('HEAD', $num)) {
 		# Skip redundant commits.
-		next if (@{$ci->{'comment'}}[0] eq $dummy_commit_msg);
+		next if ($ci->{'comment'} && @{$ci->{'comment'}}[0] eq $dummy_commit_msg);
 
 		my ($sha1, $when) = (
 			$ci->{'sha1'},
 			$ci->{'author_epoch'}
 		);
 
-		my (@pages, @messages);
+		my @pages;
 		foreach my $detail (@{ $ci->{'details'} }) {
 			my $file = $detail->{'file'};
 
@@ -390,24 +380,30 @@ sub rcs_recentchanges ($) { #{{{
 				diffurl => $diffurl,
 			};
 		}
-		push @messages, { line => $_ } foreach @{$ci->{'comment'}};
 
-		my ($user, $type) = (q{}, "web");
+		my @messages;
+		my $pastblank=0;
+		foreach my $line (@{$ci->{'comment'}}) {
+			$pastblank=1 if $line eq '';
+			next if $pastblank && $line=~m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i;
+			push @messages, { line => $line };
+		}
 
-		if (defined $messages[0] &&
-		    $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
+		my $user=$ci->{'author_username'};
+		my $web_commit = ($user=~s/\s+\(web\)$//);
+		
+		# compatability code for old web commit messages
+		if (! $web_commit &&
+		      defined $messages[0] &&
+		      $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
 			$user = defined $2 ? "$2" : "$3";
 			$messages[0]->{line} = $4;
 		}
-		else {
-			$type ="git";
-			$user = $ci->{'author_username'};
-		}
 
 		push @rets, {
 			rev        => $sha1,
 			user       => $user,
-			committype => $type,
+			committype => $web_commit ? "web" : "git",
 			when       => $when,
 			message    => [@messages],
 			pages      => [@pages],
@@ -422,7 +418,18 @@ sub rcs_recentchanges ($) { #{{{
 sub rcs_diff ($) { #{{{
 	my $rev=shift;
 	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
-	return join("\n", run_or_non("git", "diff", "$sha1^", $sha1));
+	my @lines;
+	foreach my $line (run_or_non("git", "show", $sha1)) {
+		if (@lines || $line=~/^diff --git/) {
+			push @lines, $line."\n";
+		}
+	}
+	if (wantarray) {
+		return @lines;
+	}
+	else {
+		return join("", @lines);
+	}
 } #}}}
 
 sub rcs_getctime ($) { #{{{