X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b11ddb88e608a6dd5e95f95bff2c506674c4fad8..2404ce0ddd3482f24d62ca1d7ef948ae6db0c6a0:/IkiWiki/Rcs/git.pm?ds=sidebyside

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 9640acfbe..376d03c78 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -247,8 +247,6 @@ sub _parse_diff_tree ($@) { #{{{
 		last;
 	}
 
-	debug("No detail in diff-tree output") if !defined $ci{'details'};
-
 	return \%ci;
 } #}}}
 
@@ -374,7 +372,7 @@ sub rcs_recentchanges ($) { #{{{
 
 		my ($sha1, $when) = (
 			$ci->{'sha1'},
-			time - $ci->{'author_epoch'}
+			$ci->{'author_epoch'}
 		);
 
 		my (@pages, @messages);
@@ -407,7 +405,7 @@ sub rcs_recentchanges ($) { #{{{
 		}
 
 		push @rets, {
-			id         => $sha1,
+			rev        => $sha1,
 			user       => $user,
 			committype => $type,
 			when       => $when,
@@ -421,45 +419,10 @@ 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).
-	#
-	# Here, we rely on a simple fact: we can extract all parts of the
-	# notification content by parsing the "HEAD" commit.
-
-	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->{'sha1'};
-
-	require IkiWiki::UserInfo;
-	send_commit_mails(
-		sub {
-			$message;
-		},
-		sub {
-			join "\n", run_or_die('git', 'diff', "${sha1}^", $sha1);
-		}, $user, @changed_pages
-	);
+sub rcs_diff ($) { #{{{
+	my $rev=shift;
+	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
+	return join("\n", run_or_non("git", "diff", "$sha1^", $sha1));
 } #}}}
 
 sub rcs_getctime ($) { #{{{