X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3506f4ba07b612312f7b892c73f5d486f320974e..34115a34e0593e999b7a279e07293b090012082a:/IkiWiki/Rcs/git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 68b573fb9..26a6f4266 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -165,10 +165,7 @@ sub _parse_diff_tree ($@) { #{{{
 	# Identification lines for the commit.
 	while (my $line = shift @{ $dt_ref }) {
 		# Regexps are semi-stolen from gitweb.cgi.
-		if ($line =~ m/^commit ([0-9a-fA-F]{40})$/) {
-			$ci{'commit'} = $1;
-		}
-		elsif ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
+		if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
 			$ci{'tree'} = $1;
 		}
 		elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
@@ -199,10 +196,14 @@ sub _parse_diff_tree ($@) { #{{{
 		}
 	}
 
-	debug("No 'tree' or 'parents' seen in diff-tree output")
-	    if !defined $ci{'tree'} || !defined $ci{'parents'};
+	debug("No 'tree' seen in diff-tree output") if !defined $ci{'tree'};
 
-	$ci{'parent'} = @{ $ci{'parents'} }[0] if defined $ci{'parents'};
+	if (defined $ci{'parents'}) {
+		$ci{'parent'} = @{ $ci{'parents'} }[0];
+	}
+	else {
+		$ci{'parent'} = 0 x 40;
+	}
 
 	# Commit message.
 	while (my $line = shift @{ $dt_ref }) {
@@ -216,17 +217,19 @@ sub _parse_diff_tree ($@) { #{{{
 
 	# Modified files.
 	while (my $line = shift @{ $dt_ref }) {
-		if ($line =~ m{^:
-			([0-7]{6})[ ]      # from mode
-			([0-7]{6})[ ]      # to mode
-			($sha1_pattern)[ ] # from sha1
-			($sha1_pattern)[ ] # to sha1
-			(.)                # status
-			([0-9]{0,3})\t     # similarity
-			(.*)               # file
+		if ($line =~ m{^
+			(:+)       # number of parents
+			([^\t]+)\t # modes, sha1, status
+			(.*)       # file names
 		$}xo) {
-			my ($sha1_from, $sha1_to, $file) =
-			   ($3,         $4,       $7   );
+			my $num_parents = length $1;
+			my @tmp = split(" ", $2);
+			my ($file, $file_to) = split("\t", $3);
+			my @mode_from = splice(@tmp, 0, $num_parents);
+			my $mode_to = shift(@tmp);
+			my @sha1_from = splice(@tmp, 0, $num_parents);
+			my $sha1_to = shift(@tmp);
+			my $status = shift(@tmp);
 
 			if ($file =~ m/^"(.*)"$/) {
 				($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
@@ -235,7 +238,7 @@ sub _parse_diff_tree ($@) { #{{{
 			if (length $file) {
 				push @{ $ci{'details'} }, {
 					'file'      => decode_utf8($file),
-					'sha1_from' => $sha1_from,
+					'sha1_from' => $sha1_from[0],
 					'sha1_to'   => $sha1_to,
 				};
 			}
@@ -244,8 +247,6 @@ sub _parse_diff_tree ($@) { #{{{
 		last;
 	}
 
-	debug("No detail in diff-tree output") if !defined $ci{'details'};
-
 	return \%ci;
 } #}}}
 
@@ -366,14 +367,12 @@ sub rcs_recentchanges ($) { #{{{
 
 	my @rets;
 	foreach my $ci (git_commit_info('HEAD', $num)) {
-		my $title = @{ $ci->{'comment'} }[0];
-
 		# Skip redundant commits.
-		next if ($title eq $dummy_commit_msg);
+		next if (@{$ci->{'comment'}}[0] eq $dummy_commit_msg);
 
 		my ($sha1, $when) = (
 			$ci->{'sha1'},
-			time - $ci->{'author_epoch'}
+			$ci->{'author_epoch'}
 		);
 
 		my (@pages, @messages);
@@ -391,7 +390,7 @@ sub rcs_recentchanges ($) { #{{{
 				diffurl => $diffurl,
 			};
 		}
-		push @messages, { line => $title };
+		push @messages, { line => $_ } foreach @{$ci->{'comment'}};
 
 		my ($user, $type) = (q{}, "web");
 
@@ -420,50 +419,6 @@ sub rcs_recentchanges ($) { #{{{
 	return @rets;
 } #}}}
 
-sub rcs_notify () { #{{{
-	# Send notification mail to subscribed users.
-	#
-	# In usual Git usage, hooks/update script is presumed to send
-	# notification mails (see git-receive-pack(1)).  But we prefer
-	# hooks/post-update to support IkiWiki commits coming from a
-	# cloned repository (through command line) because post-update
-	# is called _after_ each ref in repository is updated (update
-	# hook is called _before_ the repository is updated).  Since
-	# post-update hook does not accept command line arguments, we
-	# don't have an $ENV variable in this function.
-	#
-	# Here, we rely on a simple fact: we can extract all parts of the
-	# notification content by parsing the "HEAD" commit (which also
-	# triggers a refresh of IkiWiki pages).
-
-	my $ci = git_commit_info('HEAD');
-	return if !defined $ci;
-
-	my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
-
-	my ($user, $message);
-	if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
-		$user    = defined $2 ? "$2" : "$3";
-		$message = $4;
-	}
-	else {
-		$user    = $ci->{'author_username'};
-		$message = join "\n", @{ $ci->{'comment'} };
-	}
-
-	my $sha1 = $ci->{'commit'};
-
-	require IkiWiki::UserInfo;
-	send_commit_mails(
-		sub {
-			$message;
-		},
-		sub {
-			join "\n", run_or_die('git', 'diff', "${sha1}^", $sha1);
-		}, $user, @changed_pages
-	);
-} #}}}
-
 sub rcs_getctime ($) { #{{{
 	my $file=shift;
 	# Remove srcdir prefix