(no commit message)

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

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 1ed9f0044aa25d3f6e8b5f914f3844b80307cf7b..f17fadcb10ef5a66b5530ae6d65d41b175a186b7 100644 (file)
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -18,6 +18,7 @@ sub import {
        hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
        hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
        hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
        hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
        hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
        hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);

+       hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);

 }
 
 sub silentsystem (@) {
 }
 
 sub silentsystem (@) {


@@ -51,7 +52,7 @@ sub darcs_info ($$$) {
        return $_;
 }
 
        return $_;
 }
 

-sub file_in_vc($$) {
+sub file_in_vc ($$) {

        my $repodir = shift;
        my $file = shift;
 
        my $repodir = shift;
        my $file = shift;
 


@@ -62,23 +63,23 @@ sub file_in_vc($$) {
        }
        my $found=0;
        while (<DARCS_MANIFEST>) {
        }
        my $found=0;
        while (<DARCS_MANIFEST>) {

-               $found = 1, last if /^(\.\/)?$file$/;
+               $found = 1 if /^(\.\/)?$file$/;

        }
        close(DARCS_MANIFEST) or error("'darcs query manifest' exited " . $?);
 
        return $found;
 }
 
        }
        close(DARCS_MANIFEST) or error("'darcs query manifest' exited " . $?);
 
        return $found;
 }
 

-sub darcs_rev($) {
+sub darcs_rev ($) {

        my $file = shift; # Relative to the repodir.
        my $repodir = $config{srcdir};
 
        my $file = shift; # Relative to the repodir.
        my $repodir = $config{srcdir};
 

-       return "" if (! file_in_vc($repodir, $file));
+       return "" unless file_in_vc($repodir, $file);

        my $hash = darcs_info('hash', $repodir, $file);
        return defined $hash ? $hash : "";
 }
 
        my $hash = darcs_info('hash', $repodir, $file);
        return defined $hash ? $hash : "";
 }
 

-sub checkconfig() {
+sub checkconfig () {

        if (defined $config{darcs_wrapper} && length $config{darcs_wrapper}) {
                push @{$config{wrappers}}, {
                        wrapper => $config{darcs_wrapper},
        if (defined $config{darcs_wrapper} && length $config{darcs_wrapper}) {
                push @{$config{wrappers}}, {
                        wrapper => $config{darcs_wrapper},


@@ -87,11 +88,12 @@ sub checkconfig() {
        }
 }
 
        }
 }
 

-sub getsetup() {
+sub getsetup () {

        return
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,
        return
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,

+                       section => "rcs",

                },
                darcs_wrapper => {
                        type => "string",
                },
                darcs_wrapper => {
                        type => "string",


@@ -237,7 +239,7 @@ sub rcs_commit ($$$;$$) {
        }
 }
 
        }
 }
 

-sub rcs_commit_staged($$$) {
+sub rcs_commit_staged ($$$) {

        my ($message, $user, $ipaddr) = @_;
 
        my $author;
        my ($message, $user, $ipaddr) = @_;
 
        my $author;


@@ -298,8 +300,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 +315,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 +338,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 +395,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");
        }
 


@@ -436,4 +428,8 @@ sub rcs_getctime ($) {
        return $date;
 }
 
        return $date;
 }
 

+sub rcs_getmtime ($) {
+       error "rcs_getmtime is not implemented for darcs\n"; # TODO
+}
+

 1
 1