clarify

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

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index dfd193b9c1a66a1ee59f03bc15e8fa51f5c1098d..1c9538e83efb490a637b21bf2da818ddbe682bd6 100644 (file)
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -73,7 +73,7 @@ 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 : "";
 }


@@ -92,6 +92,7 @@ sub getsetup() {
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,

+                       section => "rcs",

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


@@ -205,7 +206,7 @@ sub rcs_commit ($$$;$$) {
        # Update the repository by pulling from the default repository, which is
        # master repository.
        silentsystem('darcs', "pull", "--quiet", "--repodir", $config{srcdir},
        # Update the repository by pulling from the default repository, which is
        # master repository.
        silentsystem('darcs', "pull", "--quiet", "--repodir", $config{srcdir},

-               "--all") !=0 || error("'darcs pull' failed");
+               "--all") == 0 || error("'darcs pull' failed");

 
        # If this updating yields any conflicts, we'll record them now to resolve
        # them.  If nothing is recorded, there are no conflicts.
 
        # If this updating yields any conflicts, we'll record them now to resolve
        # them.  If nothing is recorded, there are no conflicts.


@@ -298,8 +299,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 +314,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,31 +337,30 @@ 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 $committype;
 
                my @message;
                push @message, { line => $_ } foreach (@{$patch->{name}});
 
                my $committype;

-               if ($patch->{author} =~ /\@web$/) {
+               my $author;
+               if ($patch->{author} =~ /(.*)\@web$/) {
+                       $author = $1;

                        $committype = "web";
                }
                else {
                        $committype = "web";
                }
                else {

+                       $author=$patch->{author};

                        $committype = "darcs";
                }
 
                push @ret, {
                        rev => $patch->{hash},
                        $committype = "darcs";
                }
 
                push @ret, {
                        rev => $patch->{hash},

-                       user => $patch->{author},
+                       user => $author,

                        committype => $committype,
                        when => $when, 
                        message => [@message],
                        committype => $committype,
                        when => $when, 
                        message => [@message],


@@ -397,16 +394,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");
        }