noticed a problem

[git.ikiwiki.info.git] / IkiWiki / Plugin / darcs.pm

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 1ed9f0044aa25d3f6e8b5f914f3844b80307cf7b..2448673ac49169024aea08b0e8305d8a8622d414 100644 (file)
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -298,8 +298,6 @@ sub rcs_recentchanges ($) {
 
        my $repodir=$config{srcdir};
 
 
        my $repodir=$config{srcdir};
 

-       debug("darcs recent changes: $num");
-

        my $child = open(LOG, "-|");
        if (! $child) {
                $ENV{"DARCS_DONT_ESCAPE_ANYTHING"}=1;
        my $child = open(LOG, "-|");
        if (! $child) {
                $ENV{"DARCS_DONT_ESCAPE_ANYTHING"}=1;


@@ -315,15 +313,14 @@ sub rcs_recentchanges ($) {
 
        my $log = XMLin($data, ForceArray => 1);
 
 
        my $log = XMLin($data, ForceArray => 1);
 

-       debug("parsing recent changes...");

        foreach my $patch (@{$log->{patch}}) {
                my $date=$patch->{local_date};
                my $hash=$patch->{hash};
                my $when=str2time($date);
                my (@pages, @files, @pg);
        foreach my $patch (@{$log->{patch}}) {
                my $date=$patch->{local_date};
                my $hash=$patch->{hash};
                my $when=str2time($date);
                my (@pages, @files, @pg);

-               push @pages, $_ for (@{$patch->{summary}->[0]->{modify_file}});
-               push @pages, $_ for (@{$patch->{summary}->[0]->{add_file}});
-               push @pages, $_ for (@{$patch->{summary}->[0]->{remove_file}});
+               push @pages, $_ foreach (@{$patch->{summary}->[0]->{modify_file}});
+               push @pages, $_ foreach (@{$patch->{summary}->[0]->{add_file}});
+               push @pages, $_ foreach (@{$patch->{summary}->[0]->{remove_file}});

                foreach my $f (@pages) {
                        $f = $f->{content} if ref $f;
                        $f =~ s,^\s+,,; $f =~ s,\s+$,,; # cut whitespace
                foreach my $f (@pages) {
                        $f = $f->{content} if ref $f;
                        $f =~ s,^\s+,,; $f =~ s,\s+$,,; # cut whitespace


@@ -339,16 +336,12 @@ sub rcs_recentchanges ($) {
                        $d =~ s/\[\[file\]\]/$f/go;
                        $d =~ s/\[\[hash\]\]/$hash/go;
 
                        $d =~ s/\[\[file\]\]/$f/go;
                        $d =~ s/\[\[hash\]\]/$hash/go;
 

-                       debug("file: $f");
-                       debug("diffurl: $d");

                        push @pg, {
                                page => pagename($f),
                                diffurl => $d,
                        };
                }
                next unless (scalar @pg > 0);
                        push @pg, {
                                page => pagename($f),
                                diffurl => $d,
                        };
                }
                next unless (scalar @pg > 0);

-               debug("recent change: " . $patch->{name}[0] . " ("
-                       . scalar @pg . " changes)");

 
                my @message;
                push @message, { line => $_ } foreach (@{$patch->{name}});
 
                my @message;
                push @message, { line => $_ } foreach (@{$patch->{name}});


@@ -400,16 +393,13 @@ sub rcs_getctime ($) {
        eval q{use XML::Simple};
        local $/=undef;
 
        eval q{use XML::Simple};
        local $/=undef;
 

-       # Sigh... doing things the hard way again
-       my $repodir=$config{srcdir};
-
-       my $filer=substr($file, length($repodir));
+       my $filer=substr($file, length($config{srcdir}));

        $filer =~ s:^[/]+::;
 
        my $child = open(LOG, "-|");
        if (! $child) {
                exec("darcs", "changes", "--xml", "--reverse",
        $filer =~ s:^[/]+::;
 
        my $child = open(LOG, "-|");
        if (! $child) {
                exec("darcs", "changes", "--xml", "--reverse",

-                       "--repodir", "$repodir", "$filer")
+                       "--repodir", $config{srcdir}, $filer)

                || error("'darcs changes $filer' failed to run");
        }
 
                || error("'darcs changes $filer' failed to run");
        }