Merge branch 'ready/tag-test' into transient-tag

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

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 0dfc8708daee02a78d55794ba5150beb7e9b8a96..cd4fcd0fff438b250e7dd059d0e8eaa05be95bcf 100644 (file)
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -373,11 +373,13 @@ sub rcs_recentchanges ($) {
        return @ret;
 }
 
        return @ret;
 }
 

-sub rcs_diff ($) {
+sub rcs_diff ($;$) {

        my $rev=shift;
        my $rev=shift;

+       my $maxlines=shift;

        my @lines;
        foreach my $line (silentsystem("darcs", "diff", "--match", "hash ".$rev)) {
                if (@lines || $line=~/^diff/) {
        my @lines;
        foreach my $line (silentsystem("darcs", "diff", "--match", "hash ".$rev)) {
                if (@lines || $line=~/^diff/) {

+                       last if defined $maxlines && @lines == $maxlines;

                        push @lines, $line."\n";
                }
        }
                        push @lines, $line."\n";
                }
        }


@@ -396,14 +398,11 @@ sub rcs_getctime ($) {
        eval q{use XML::Simple};
        local $/=undef;
 
        eval q{use XML::Simple};
        local $/=undef;
 

-       my $filer=substr($file, length($config{srcdir}));
-       $filer =~ s:^[/]+::;
-

        my $child = open(LOG, "-|");
        if (! $child) {
                exec("darcs", "changes", "--xml", "--reverse",
        my $child = open(LOG, "-|");
        if (! $child) {
                exec("darcs", "changes", "--xml", "--reverse",

-                       "--repodir", $config{srcdir}, $filer)
-               || error("'darcs changes $filer' failed to run");
+                       "--repodir", $config{srcdir}, $file)
+               || error("'darcs changes $file' failed to run");

        }
 
        my $data;
        }
 
        my $data;


@@ -418,7 +417,7 @@ sub rcs_getctime ($) {
        my $datestr = $log->{patch}[0]->{local_date};
 
        if (! defined $datestr) {
        my $datestr = $log->{patch}[0]->{local_date};
 
        if (! defined $datestr) {

-               warn "failed to get ctime for $filer";
+               warn "failed to get ctime for $file";

                return 0;
        }
 
                return 0;
        }