X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6a7eb63ca534bdad7ab13f840cdee33ea391d9bf..b5e7f7a67f9893c7083afe3594c4a274c1b96062:/IkiWiki/Plugin/darcs.pm

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 1ed9f0044..bc8394b90 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -51,7 +51,7 @@ sub darcs_info ($$$) {
 	return $_;
 }
 
-sub file_in_vc($$) {
+sub file_in_vc ($$) {
 	my $repodir = shift;
 	my $file = shift;
 
@@ -69,16 +69,16 @@ sub file_in_vc($$) {
 	return $found;
 }
 
-sub darcs_rev($) {
+sub darcs_rev ($) {
 	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 : "";
 }
 
-sub checkconfig() {
+sub checkconfig () {
 	if (defined $config{darcs_wrapper} && length $config{darcs_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{darcs_wrapper},
@@ -87,11 +87,12 @@ sub checkconfig() {
 	}
 }
 
-sub getsetup() {
+sub getsetup () {
 	return
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		darcs_wrapper => {
 			type => "string",
@@ -237,7 +238,7 @@ sub rcs_commit ($$$;$$) {
 	}
 }
 
-sub rcs_commit_staged($$$) {
+sub rcs_commit_staged ($$$) {
 	my ($message, $user, $ipaddr) = @_;
 
 	my $author;
@@ -298,8 +299,6 @@ sub rcs_recentchanges ($) {
 
 	my $repodir=$config{srcdir};
 
-	debug("darcs recent changes: $num");
-
 	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);
 
-	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);
-		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
@@ -339,16 +337,12 @@ sub rcs_recentchanges ($) {
 			$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);
-		debug("recent change: " . $patch->{name}[0] . " ("
-			. scalar @pg . " changes)");
 
 		my @message;
 		push @message, { line => $_ } foreach (@{$patch->{name}});
@@ -400,16 +394,13 @@ sub rcs_getctime ($) {
 	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",
-			"--repodir", "$repodir", "$filer")
+			"--repodir", $config{srcdir}, $filer)
 		|| error("'darcs changes $filer' failed to run");
 	}