web commit by JoshTriplett: Use example.org as the example domain throughout. In...

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

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 48dc78157ae95b5406a6fdf61b04bb236c1f4a91..c71c9e6ee77907ea02afcc66e7e512323d50ce74 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -13,7 +13,9 @@ sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
        close STDOUT;
+       open (STDOUT, ">/dev/null");
        my $ret=system(@_);
+       close STDOUT;
        open (STDOUT, ">&SAVEOUT");
        close SAVEOUT;
        return $ret;
@@ -51,8 +53,8 @@ sub rcs_commit ($$$) { #{{{
                if (defined $rev && defined $oldrev && $rev ne $oldrev) {
                        # Merge their changes into the file that we've
                        # changed.
-                       if (system("tla", "update", "-d",
-                                  "$config{srcdir}/$file") != 0) {
+                       if (quiet_system("tla", "update", "-d",
+                                  "$config{srcdir}") != 0) {
                                warn("tla update failed\n");
                        }
                }
@@ -61,7 +63,7 @@ sub rcs_commit ($$$) { #{{{
                           "-L".possibly_foolish_untaint($message),
                           '-d', $config{srcdir}) != 0) {
                        my $conflict=readfile("$config{srcdir}/$file");
-                       if (system("tla", "undo", "--quiet", "-d", "$config{srcdir}") != 0) {
+                       if (system("tla", "undo", "-n", "--quiet", "-d", "$config{srcdir}") != 0) {
                                warn("tla undo failed\n");
                        }
                        return $conflict;
@@ -87,7 +89,9 @@ sub rcs_recentchanges ($) {
        return unless -d "$config{srcdir}/{arch}";
 
        eval q{use Date::Parse};
+       error($@) if $@;
        eval q{use Mail::Header};
+       error($@) if $@;
 
        my $logs = `tla logs -d $config{srcdir}`;
        my @changesets = reverse split(/\n/, $logs);
@@ -103,10 +107,11 @@ sub rcs_recentchanges ($) {
                my $summ = $head->get("Summary");
                my $newfiles = $head->get("New-files");
                my $modfiles = $head->get("Modified-files");
+               my $remfiles = $head->get("Removed-files");
                my $user = $head->get("Creator");
 
-               my @paths = grep {!/^.*\/\.arch-ids\/.*\.id$/} split(/ /,
-                       "$newfiles $modfiles");
+               my @paths = grep { !/^(.*\/)?\.arch-ids\/.*\.id$/ }
+                       split(/ /, "$newfiles $modfiles .arch-ids/fake.id");
 
                my $sdate = $head->get("Standard-date");
                my $when = time - str2time($sdate, 'UTC');
@@ -122,7 +127,6 @@ sub rcs_recentchanges ($) {
 
                my @message;
                push @message, { line => escapeHTML($summ) };
-               $user = escapeHTML($user);
 
                my @pages;
 
@@ -151,12 +155,13 @@ sub rcs_recentchanges ($) {
 
 sub rcs_notify () { #{{{
        # FIXME: Not set
-       if (! exists $ENV{REV}) {
-               error("REV is not set, not running from tla post-commit hook, cannot send notifications");
+       if (! exists $ENV{ARCH_VERSION}) {
+               error("ARCH_VERSION is not set, not running from tla post-commit hook, cannot send notifications");
        }
        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);
@@ -166,9 +171,10 @@ sub rcs_notify () { #{{{
 
        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");
+       my @changed_pages = grep { !/(^.*\/)?\.arch-ids\/.*\.id$/ }
+               split(/ /, "$newfiles $modfiles $remfiles .arch-ids/fake.id");
 
        if ($message =~ /$tla_webcommit/) {
                $user=defined $2 ? "$2" : "$3";
@@ -211,6 +217,7 @@ sub rcs_notify () { #{{{
                );
 
                eval q{use Mail::Sendmail};
+               error($@) if $@;
                foreach my $email (@email_recipients) {
                        sendmail(
                                To => $email,
@@ -225,7 +232,9 @@ sub rcs_notify () { #{{{
 sub rcs_getctime ($) { #{{{
        my $file=shift;
        eval q{use Date::Parse};
+       error($@) if $@;
        eval q{use Mail::Header};
+       error($@) if $@;
 
        my $logs = `tla logs -d $config{srcdir}`;
        my @changesets = reverse split(/\n/, $logs);