X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f401d6617a11efcedda1c956b2ccea061a7540f..7373f0185fb67dc44db465f022607bf6ebb46b4b:/IkiWiki/Plugin/bzr.pm

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 562d5d389..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 {
@@ -132,10 +133,10 @@ sub bzr_author ($) {
 	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";
@@ -194,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: $!";
 	}
@@ -242,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;
 
@@ -271,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;
@@ -281,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;
 	}
@@ -295,7 +302,7 @@ sub extract_timestamp (@) {
 	open (my $out, "-|", @_);
 	my @log = bzr_log($out);
 
-	if (length @log < 1) {
+	if (length(scalar(@log)) < 1) {
 		return 0;
 	}