X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4f269010b4a2b5ae9f2a3e342e3ec15ea72c61bb..11872cecfcf40a4f68677a82b0d2db7c8e24dd71:/IkiWiki/Rcs/tla.pm

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 5275500c3..4232e1fe8 100644
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 
+package IkiWiki;
+
 use warnings;
 use strict;
 use IkiWiki;
 
-package IkiWiki;
-
 sub quiet_system (@) {
 	# See Debian bug #385939.
 	open (SAVEOUT, ">&STDOUT");
@@ -78,6 +78,14 @@ sub rcs_commit ($$$;$$) { #{{{
 	return undef # success
 } #}}}
 
+sub rcs_commit_staged ($$$) {
+	# Commits all staged changes. Changes can be staged using rcs_add,
+	# rcs_remove, and rcs_rename.
+	my ($message, $user, $ipaddr)=@_;
+	
+	error("rcs_commit_staged not implemented for tla"); # TODO
+}
+
 sub rcs_add ($) { #{{{
 	my $file=shift;
 
@@ -88,6 +96,18 @@ sub rcs_add ($) { #{{{
 	}
 } #}}}
 
+sub rcs_remove ($) { # {{{
+	my $file = shift;
+
+	error("rcs_remove not implemented for tla"); # TODO
+} #}}}
+
+sub rcs_rename ($$) { # {{{a
+	my ($src, $dest) = @_;
+
+	error("rcs_rename not implemented for tla"); # TODO
+} #}}}
+
 sub rcs_recentchanges ($) {
 	my $num=shift;
 	my @ret;
@@ -120,7 +140,7 @@ sub rcs_recentchanges ($) {
 			split(/ /, "$newfiles $modfiles .arch-ids/fake.id");
 
 		my $sdate = $head->get("Standard-date");
-		my $when = time - str2time($sdate, 'UTC');
+		my $when = str2time($sdate, 'UTC');
 
 		my $committype = "web";
 		if (defined $summ && $summ =~ /$config{web_commit_regexp}/) {
@@ -132,7 +152,7 @@ sub rcs_recentchanges ($) {
 		}
 
 		my @message;
-		push @message, { line => escapeHTML($summ) };
+		push @message, { line => $summ };
 
 		my @pages;
 
@@ -146,7 +166,7 @@ sub rcs_recentchanges ($) {
 			} if length $file;
 		}
 		push @ret, {
-			id => $change,
+			rev => $change,
 			user => $user,
 			committype => $committype,
 			when => $when,
@@ -160,49 +180,18 @@ sub rcs_recentchanges ($) {
 	return @ret;
 }
 
-sub rcs_notify () { #{{{
-	# FIXME: Not set
-	if (! exists $ENV{ARCH_VERSION}) {
-		error("ARCH_VERSION is not set, not running from tla post-commit hook, cannot send notifications");
+sub rcs_diff ($) { #{{{
+	my $rev=shift;
+	my $logs = `tla logs -d $config{srcdir}`;
+	my @changesets = reverse split(/\n/, $logs);
+	my $i;
+
+	for($i=0;$i<$#changesets;$i++) {
+		last if $changesets[$i] eq $rev;
 	}
-	my $rev=int(possibly_foolish_untaint($ENV{REV}));
 
-	eval q{use Mail::Header};
-	error($@) if $@;
-	open(LOG, $ENV{"ARCH_LOG"});
-	my $head = Mail::Header->new(\*LOG);
-	close(LOG);
-
-	my $user = $head->get("Creator");
-
-	my $newfiles = $head->get("New-files");
-	my $modfiles = $head->get("Modified-files");
-	my $remfiles = $head->get("Removed-files");
-
-	my @changed_pages = grep { !/(^.*\/)?\.arch-ids\/.*\.id$/ }
-		split(/ /, "$newfiles $modfiles $remfiles .arch-ids/fake.id");
-
-	require IkiWiki::UserInfo;
-	send_commit_mails(
-		sub {
-			my $message = $head->get("Summary");
-			if ($message =~ /$config{web_commit_regexp}/) {
-				$user=defined $2 ? "$2" : "$3";
-				$message=$4;
-			}
-		},
-		sub {
-			my $logs = `tla logs -d $config{srcdir}`;
-			my @changesets = reverse split(/\n/, $logs);
-			my $i;
-
-			for($i=0;$i<$#changesets;$i++) {
-				last if $changesets[$i] eq $rev;
-			}
-	
-			my $revminusone = $changesets[$i+1];
-			`tla diff -d $ENV{ARCH_TREE_ROOT} $revminusone`;
-		}, $user, @changed_pages);
+	my $revminusone = $changesets[$i+1];
+	return `tla diff -d $config{srcdir} $revminusone`;
 } #}}}
 
 sub rcs_getctime ($) { #{{{