X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2a15f9415979e809ef332bdcffa83ff168d5bbef..c0d0482f99634c1ac156bd628d51c7f72e62e5bc:/IkiWiki/Plugin/bzr.pm

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 7eb5cfe93..5ec254f84 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -5,6 +5,7 @@ use warnings;
 use strict;
 use IkiWiki;
 use Encode;
+use URI::Escape q{uri_escape_utf8};
 use open qw{:utf8 :std};
 
 sub import {
@@ -20,6 +21,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_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -83,15 +85,13 @@ sub bzr_log ($) {
 		}
 		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
 			$key = "files";
-			unless (defined($info{$key})) { $info{$key} = ""; }
+			$info{$key} = "" unless defined $info{$key};
 		}
 		elsif (defined($key) and $line =~ /^  (.*)/) {
 			$info{$key} .= "$1\n";
 		}
 		elsif ($line eq "------------------------------------------------------------\n") {
-			if (keys %info) {
-				push (@infos, {%info});
-			}
+			push @infos, {%info} if keys %info;
 			%info = ();
 			$key = undef;
 		}
@@ -108,6 +108,7 @@ sub bzr_log ($) {
 		}
 	}
 	close $out;
+	push @infos, {%info} if keys %info;
 
 	return @infos;
 }
@@ -123,32 +124,38 @@ sub rcs_prepedit ($) {
 	return "";
 }
 
-sub bzr_author ($$) {
-	my ($user, $ipaddr) = @_;
+sub bzr_author ($) {
+	my $session=shift;
+
+	return unless defined $session;
+
+	my $user=$session->param("name");
+	my $ipaddr=$session->remote_addr();
 
 	if (defined $user) {
-		return IkiWiki::possibly_foolish_untaint($user);
+		return IkiWiki::possibly_foolish_untaint(IkiWiki::cloak($user));
 	}
 	elsif (defined $ipaddr) {
-		return "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
+		return "Anonymous from ".IkiWiki::possibly_foolish_untaint(IkiWiki::cloak($ipaddr));
 	}
 	else {
 		return "Anonymous";
 	}
 }
 
-sub rcs_commit ($$$;$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit (@) {
+	my %params=@_;
 
-	$user = bzr_author($user, $ipaddr);
+	my $user=bzr_author($params{session});
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
-	my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
-	               $config{srcdir}."/".$file);
+	my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+	               (defined $user ? ("--author", $user) : ()),
+	               $config{srcdir}."/".$params{file});
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
@@ -156,19 +163,18 @@ sub rcs_commit ($$$;$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$) {
-	# Commits all staged changes. Changes can be staged using rcs_add,
-	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+sub rcs_commit_staged (@) {
+	my %params=@_;
 
-	$user = bzr_author($user, $ipaddr);
+	my $user=bzr_author($params{session});
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
-	my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
+	my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+	               (defined $user ? ("--author", $user) : ()),
 	               $config{srcdir});
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
@@ -189,7 +195,7 @@ sub rcs_add ($) {
 sub rcs_remove ($) {
 	my ($file) = @_;
 
-	my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
+	my @cmdline = ("bzr", "rm", "--quiet", "$config{srcdir}/$file");
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
@@ -237,8 +243,10 @@ sub rcs_recentchanges ($) {
 			# Skip source name in renames
 			$filename =~ s/^.* => //;
 
+			my $efilename = uri_escape_utf8($filename);
+
 			my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
-			$diffurl =~ s/\[\[file\]\]/$filename/go;
+			$diffurl =~ s/\[\[file\]\]/$efilename/go;
 			$diffurl =~ s/\[\[file-id\]\]/$fileid/go;
 			$diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
 
@@ -266,8 +274,9 @@ sub rcs_recentchanges ($) {
 	return @ret;
 }
 
-sub rcs_diff ($) {
+sub rcs_diff ($;$) {
 	my $taintedrev=shift;
+	my $maxlines=shift;
 	my ($rev) = $taintedrev =~ /^(\d+(\.\d+)*)$/; # untaint
 
 	my $prevspec = "before:" . $rev;
@@ -276,8 +285,11 @@ sub rcs_diff ($) {
 		"--new", $config{srcdir},
 		"-r", $prevspec . ".." . $revspec);
 	open (my $out, "@cmdline |");
-
-	my @lines = <$out>;
+	my @lines;
+	while (my $line=<$out>) {
+		last if defined $maxlines && @lines == $maxlines;
+		push @lines, $line;
+	}
 	if (wantarray) {
 		return @lines;
 	}
@@ -286,25 +298,33 @@ sub rcs_diff ($) {
 	}
 }
 
-sub rcs_getctime ($) {
-	my ($file) = @_;
-
-	# XXX filename passes through the shell here, should try to avoid
-	# that just in case
-	my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
-	open (my $out, "@cmdline |");
-
+sub extract_timestamp (@) {
+	open (my $out, "-|", @_);
 	my @log = bzr_log($out);
 
-	if (length @log < 1) {
+	if (length(scalar(@log)) < 1) {
 		return 0;
 	}
 
 	eval q{use Date::Parse};
 	error($@) if $@;
 	
-	my $ctime = str2time($log[0]->{"timestamp"});
-	return $ctime;
+	my $time = str2time($log[0]->{"timestamp"});
+	return $time;
+}
+
+sub rcs_getctime ($) {
+	my ($file) = @_;
+
+	my @cmdline = ("bzr", "log", "--forward", "--limit", '1', "$config{srcdir}/$file");
+	return extract_timestamp(@cmdline);
+}
+
+sub rcs_getmtime ($) {
+	my ($file) = @_;
+
+	my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
+	return extract_timestamp(@cmdline);
 }
 
 1