X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/14cd75746a2c73b50548b6fdb3583d536b6ef9bd..812f775e0a3cd953782edcbe8a0eb727752df03f:/IkiWiki/Plugin/bzr.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 5df522f6e..101e91b93 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
-
-package IkiWiki;
+package IkiWiki::Plugin::bzr;
 
 use warnings;
 use strict;
@@ -8,24 +7,40 @@ use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
-hook(type => "checkconfig", id => "bzr", call => sub { #{{{
-	if (! defined $config{diffurl}) {
-		$config{diffurl}="";
-	}
-	if (length $config{bzr_wrapper}) {
+sub import { #{{{
+	hook(type => "checkconfig", id => "bzr", call => \&checkconfig);
+	hook(type => "getsetup", id => "bzr", call => \&getsetup);
+	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
+	hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
+	hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
+	hook(type => "rcs", id => "rcs_commit_staged", call => \&rcs_commit_staged);
+	hook(type => "rcs", id => "rcs_add", call => \&rcs_add);
+	hook(type => "rcs", id => "rcs_remove", call => \&rcs_remove);
+	hook(type => "rcs", id => "rcs_rename", call => \&rcs_rename);
+	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);
+} #}}}
+
+sub checkconfig () { #{{{
+	if (defined $config{bzr_wrapper} && length $config{bzr_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{bzr_wrapper},
 			wrappermode => (defined $config{bzr_wrappermode} ? $config{bzr_wrappermode} : "06755"),
 		};
 	}
-}); #}}}
+} #}}}
 
-hook(type => "getsetup", id => "bzr", call => sub { #{{{
+sub getsetup () { #{{{
 	return
+		plugin => {
+			safe => 0, # rcs plugin
+			rebuild => undef,
+		},
 		bzr_wrapper => {
 			type => "string",
 			#example => "", # FIXME add example
-			description => "bzr post-commit executable to generate",
+			description => "bzr post-commit hook to generate",
 			safe => 0, # file
 			rebuild => 0,
 		},
@@ -50,7 +65,7 @@ hook(type => "getsetup", id => "bzr", call => sub { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-}); #}}}
+} #}}}
 
 sub bzr_log ($) { #{{{
 	my $out = shift;
@@ -101,10 +116,10 @@ sub bzr_author ($$) { #{{{
 	my ($user, $ipaddr) = @_;
 
 	if (defined $user) {
-		return possibly_foolish_untaint($user);
+		return IkiWiki::possibly_foolish_untaint($user);
 	}
 	elsif (defined $ipaddr) {
-		return "Anonymous from ".possibly_foolish_untaint($ipaddr);
+		return "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
 	}
 	else {
 		return "Anonymous";
@@ -116,7 +131,7 @@ sub rcs_commit ($$$;$$) { #{{{
 
 	$user = bzr_author($user, $ipaddr);
 
-	$message = possibly_foolish_untaint($message);
+	$message = IkiWiki::possibly_foolish_untaint($message);
 	if (! length $message) {
 		$message = "no message given";
 	}
@@ -137,7 +152,7 @@ sub rcs_commit_staged ($$$) {
 
 	$user = bzr_author($user, $ipaddr);
 
-	$message = possibly_foolish_untaint($message);
+	$message = IkiWiki::possibly_foolish_untaint($message);
 	if (! length $message) {
 		$message = "no message given";
 	}
@@ -172,7 +187,7 @@ sub rcs_remove ($) { # {{{
 sub rcs_rename ($$) { # {{{
 	my ($src, $dest) = @_;
 
-	my $parent = dirname($dest);
+	my $parent = IkiWiki::dirname($dest);
 	if (system("bzr", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
 		warn("bzr add $parent failed\n");
 	}
@@ -211,7 +226,7 @@ sub rcs_recentchanges ($) { #{{{
 			# Skip source name in renames
 			$filename =~ s/^.* => //;
 
-			my $diffurl = $config{'diffurl'};
+			my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
 			$diffurl =~ s/\[\[file\]\]/$filename/go;
 			$diffurl =~ s/\[\[file-id\]\]/$fileid/go;
 			$diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;