Merge commit 'jelmer/master'

[git.ikiwiki.info.git] / IkiWiki / Rcs / tla.pm

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 5275500c395b5031bfbf627e5d31531abff41a8e..4232e1fe8372429902b7438f20e6c0c25189ce52 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 
 use warnings;
 use strict;
 use IkiWiki;
 

-package IkiWiki;
-

 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");


@@ -78,6 +78,14 @@ sub rcs_commit ($$$;$$) { #{{{
        return undef # success
 } #}}}
 
        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;
 
 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;
 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");
                        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}/) {
 
                my $committype = "web";
                if (defined $summ && $summ =~ /$config{web_commit_regexp}/) {


@@ -132,7 +152,7 @@ sub rcs_recentchanges ($) {
                }
 
                my @message;
                }
 
                my @message;

-               push @message, { line => escapeHTML($summ) };
+               push @message, { line => $summ };

 
                my @pages;
 
 
                my @pages;
 


@@ -146,7 +166,7 @@ sub rcs_recentchanges ($) {
                        } if length $file;
                }
                push @ret, {
                        } if length $file;
                }
                push @ret, {

-                       id => $change,
+                       rev => $change,

                        user => $user,
                        committype => $committype,
                        when => $when,
                        user => $user,
                        committype => $committype,
                        when => $when,


@@ -160,49 +180,18 @@ sub rcs_recentchanges ($) {
        return @ret;
 }
 
        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 ($) { #{{{
 } #}}}
 
 sub rcs_getctime ($) { #{{{