2008-01-28 06:16:56 +01:00
|
|
|
#!/usr/bin/perl
|
2008-07-27 04:27:58 +02:00
|
|
|
package IkiWiki::Plugin::bzr;
|
2008-07-11 12:07:48 +02:00
|
|
|
|
2008-01-28 06:16:56 +01:00
|
|
|
use warnings;
|
|
|
|
use strict;
|
|
|
|
use IkiWiki;
|
|
|
|
use Encode;
|
|
|
|
use open qw{:utf8 :std};
|
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub import {
|
2008-07-27 04:27:58 +02:00
|
|
|
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);
|
2010-04-16 23:02:29 +02:00
|
|
|
hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-27 04:27:58 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub checkconfig () {
|
2008-07-27 04:27:58 +02:00
|
|
|
if (defined $config{bzr_wrapper} && length $config{bzr_wrapper}) {
|
2008-07-27 03:00:11 +02:00
|
|
|
push @{$config{wrappers}}, {
|
|
|
|
wrapper => $config{bzr_wrapper},
|
|
|
|
wrappermode => (defined $config{bzr_wrappermode} ? $config{bzr_wrappermode} : "06755"),
|
|
|
|
};
|
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-27 03:00:11 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub getsetup () {
|
2008-07-27 00:26:39 +02:00
|
|
|
return
|
2008-08-03 22:40:12 +02:00
|
|
|
plugin => {
|
|
|
|
safe => 0, # rcs plugin
|
|
|
|
rebuild => undef,
|
2010-02-12 04:24:15 +01:00
|
|
|
section => "rcs",
|
2008-08-03 22:40:12 +02:00
|
|
|
},
|
2008-07-27 03:00:11 +02:00
|
|
|
bzr_wrapper => {
|
|
|
|
type => "string",
|
|
|
|
#example => "", # FIXME add example
|
2008-08-03 04:46:16 +02:00
|
|
|
description => "bzr post-commit hook to generate",
|
2008-07-27 03:00:11 +02:00
|
|
|
safe => 0, # file
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
|
|
|
bzr_wrappermode => {
|
|
|
|
type => "string",
|
|
|
|
example => '06755',
|
|
|
|
description => "mode for bzr_wrapper (can safely be made suid)",
|
|
|
|
safe => 0,
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
2008-07-27 00:26:39 +02:00
|
|
|
historyurl => {
|
|
|
|
type => "string",
|
|
|
|
#example => "", # FIXME add example
|
|
|
|
description => "url to show file history, using loggerhead ([[file]] substituted)",
|
|
|
|
safe => 1,
|
|
|
|
rebuild => 1,
|
|
|
|
},
|
|
|
|
diffurl => {
|
|
|
|
type => "string",
|
|
|
|
example => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s",
|
|
|
|
description => "url to view a diff, using loggerhead ([[file]] and [[r2]] substituted)",
|
|
|
|
safe => 1,
|
|
|
|
rebuild => 1,
|
|
|
|
},
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-27 00:26:39 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub bzr_log ($) {
|
2008-01-28 06:16:56 +01:00
|
|
|
my $out = shift;
|
2008-01-28 07:30:37 +01:00
|
|
|
my @infos = ();
|
|
|
|
my $key = undef;
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2010-04-04 18:20:26 +02:00
|
|
|
my %info;
|
2008-01-28 06:16:56 +01:00
|
|
|
while (<$out>) {
|
|
|
|
my $line = $_;
|
2008-01-28 07:30:37 +01:00
|
|
|
my ($value);
|
|
|
|
if ($line =~ /^message:/) {
|
|
|
|
$key = "message";
|
2010-04-04 18:20:26 +02:00
|
|
|
$info{$key} = "";
|
2008-01-30 01:36:35 +01:00
|
|
|
}
|
|
|
|
elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
|
2008-01-28 07:30:37 +01:00
|
|
|
$key = "files";
|
2010-04-04 18:23:12 +02:00
|
|
|
$info{$key} = "" unless defined $info{$key};
|
2008-01-30 01:36:35 +01:00
|
|
|
}
|
|
|
|
elsif (defined($key) and $line =~ /^ (.*)/) {
|
2010-04-04 18:20:26 +02:00
|
|
|
$info{$key} .= "$1\n";
|
2008-01-30 01:36:35 +01:00
|
|
|
}
|
|
|
|
elsif ($line eq "------------------------------------------------------------\n") {
|
2010-04-04 18:23:12 +02:00
|
|
|
push @infos, {%info} if keys %info;
|
2010-04-04 18:20:26 +02:00
|
|
|
%info = ();
|
2008-01-28 07:30:37 +01:00
|
|
|
$key = undef;
|
2008-01-30 01:36:35 +01:00
|
|
|
}
|
2010-04-04 11:05:07 +02:00
|
|
|
elsif ($line =~ /: /) {
|
2008-01-28 07:30:37 +01:00
|
|
|
chomp $line;
|
2010-04-04 11:05:07 +02:00
|
|
|
if ($line =~ /^revno: (\d+)/) {
|
|
|
|
$key = "revno";
|
|
|
|
$value = $1;
|
2010-04-04 18:17:03 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
($key, $value) = split /: +/, $line, 2;
|
|
|
|
}
|
2010-04-04 18:20:26 +02:00
|
|
|
$info{$key} = $value;
|
2010-04-04 18:17:03 +02:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
}
|
|
|
|
close $out;
|
2010-04-04 23:06:28 +02:00
|
|
|
push @infos, {%info} if keys %info;
|
2008-01-28 06:16:56 +01:00
|
|
|
|
|
|
|
return @infos;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_update () {
|
2008-04-10 23:44:40 +02:00
|
|
|
my @cmdline = ("bzr", "update", "--quiet", $config{srcdir});
|
2008-01-28 06:16:56 +01:00
|
|
|
if (system(@cmdline) != 0) {
|
|
|
|
warn "'@cmdline' failed: $!";
|
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_prepedit ($) {
|
2008-01-28 06:16:56 +01:00
|
|
|
return "";
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
sub bzr_author ($) {
|
|
|
|
my $session=shift;
|
|
|
|
|
|
|
|
return unless defined $session;
|
|
|
|
|
|
|
|
my $user=$session->param("name");
|
|
|
|
my $ipaddr=$session->remote_addr();
|
2008-01-28 06:16:56 +01:00
|
|
|
|
|
|
|
if (defined $user) {
|
2008-07-27 04:27:58 +02:00
|
|
|
return IkiWiki::possibly_foolish_untaint($user);
|
2008-01-28 06:16:56 +01:00
|
|
|
}
|
|
|
|
elsif (defined $ipaddr) {
|
2008-07-27 04:27:58 +02:00
|
|
|
return "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
|
2008-01-28 06:16:56 +01:00
|
|
|
}
|
|
|
|
else {
|
2008-07-24 22:43:57 +02:00
|
|
|
return "Anonymous";
|
2008-01-28 06:16:56 +01:00
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-24 22:43:57 +02:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
sub rcs_commit (@) {
|
|
|
|
my %params=@_;
|
2008-07-24 22:43:57 +02:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
my $user=bzr_author($params{session});
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
|
|
|
|
if (! length $params{message}) {
|
|
|
|
$params{message} = "no message given";
|
2008-01-28 06:16:56 +01:00
|
|
|
}
|
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
|
|
|
|
(defined $user ? ("--author", $user) : ()),
|
|
|
|
$config{srcdir}."/".$params{file});
|
2008-01-28 06:16:56 +01:00
|
|
|
if (system(@cmdline) != 0) {
|
|
|
|
warn "'@cmdline' failed: $!";
|
|
|
|
}
|
|
|
|
|
|
|
|
return undef; # success
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
sub rcs_commit_staged (@) {
|
|
|
|
my %params=@_;
|
2008-07-24 22:43:57 +02:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
my $user=bzr_author($params{session});
|
2008-07-24 22:43:57 +02:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
|
|
|
|
if (! length $params{message}) {
|
|
|
|
$params{message} = "no message given";
|
2008-07-24 22:43:57 +02:00
|
|
|
}
|
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
|
|
|
|
(defined $user ? ("--author", $user) : ()),
|
2008-07-24 22:43:57 +02:00
|
|
|
$config{srcdir});
|
|
|
|
if (system(@cmdline) != 0) {
|
|
|
|
warn "'@cmdline' failed: $!";
|
|
|
|
}
|
|
|
|
|
|
|
|
return undef; # success
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-22 22:14:33 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_add ($) {
|
2008-01-28 06:16:56 +01:00
|
|
|
my ($file) = @_;
|
|
|
|
|
2008-04-10 23:44:40 +02:00
|
|
|
my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file");
|
2008-01-28 06:16:56 +01:00
|
|
|
if (system(@cmdline) != 0) {
|
|
|
|
warn "'@cmdline' failed: $!";
|
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_remove ($) {
|
2008-07-21 19:40:06 +02:00
|
|
|
my ($file) = @_;
|
|
|
|
|
2008-07-24 22:43:57 +02:00
|
|
|
my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
|
|
|
|
if (system(@cmdline) != 0) {
|
|
|
|
warn "'@cmdline' failed: $!";
|
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-21 19:40:06 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_rename ($$) {
|
2008-07-22 22:14:33 +02:00
|
|
|
my ($src, $dest) = @_;
|
|
|
|
|
2008-07-27 04:27:58 +02:00
|
|
|
my $parent = IkiWiki::dirname($dest);
|
2008-07-25 20:13:45 +02:00
|
|
|
if (system("bzr", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
|
|
|
|
warn("bzr add $parent failed\n");
|
|
|
|
}
|
|
|
|
|
2008-07-24 22:43:57 +02:00
|
|
|
my @cmdline = ("bzr", "mv", "--quiet", "$config{srcdir}/$src", "$config{srcdir}/$dest");
|
|
|
|
if (system(@cmdline) != 0) {
|
|
|
|
warn "'@cmdline' failed: $!";
|
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-22 22:14:33 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_recentchanges ($) {
|
2008-01-28 06:16:56 +01:00
|
|
|
my ($num) = @_;
|
|
|
|
|
2008-01-30 02:29:28 +01:00
|
|
|
my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num,
|
|
|
|
$config{srcdir});
|
2008-01-28 06:16:56 +01:00
|
|
|
open (my $out, "@cmdline |");
|
|
|
|
|
|
|
|
eval q{use Date::Parse};
|
|
|
|
error($@) if $@;
|
|
|
|
|
|
|
|
my @ret;
|
2008-01-30 01:48:30 +01:00
|
|
|
foreach my $info (bzr_log($out)) {
|
2008-01-28 06:16:56 +01:00
|
|
|
my @pages = ();
|
|
|
|
my @message = ();
|
2010-04-04 18:17:03 +02:00
|
|
|
|
2008-01-28 07:30:37 +01:00
|
|
|
foreach my $msgline (split(/\n/, $info->{message})) {
|
2008-01-28 06:16:56 +01:00
|
|
|
push @message, { line => $msgline };
|
|
|
|
}
|
|
|
|
|
2008-01-28 07:30:37 +01:00
|
|
|
foreach my $file (split(/\n/, $info->{files})) {
|
2008-07-25 20:13:45 +02:00
|
|
|
my ($filename, $fileid) = ($file =~ /^(.*?) +([^ ]+)$/);
|
|
|
|
|
|
|
|
# Skip directories
|
|
|
|
next if ($filename =~ /\/$/);
|
|
|
|
|
|
|
|
# Skip source name in renames
|
|
|
|
$filename =~ s/^.* => //;
|
|
|
|
|
2008-07-27 06:54:15 +02:00
|
|
|
my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
|
2008-01-30 02:29:28 +01:00
|
|
|
$diffurl =~ s/\[\[file\]\]/$filename/go;
|
|
|
|
$diffurl =~ s/\[\[file-id\]\]/$fileid/go;
|
2008-01-28 07:30:37 +01:00
|
|
|
$diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
|
2008-01-28 06:16:56 +01:00
|
|
|
|
|
|
|
push @pages, {
|
2008-01-30 02:29:28 +01:00
|
|
|
page => pagename($filename),
|
2008-01-28 06:16:56 +01:00
|
|
|
diffurl => $diffurl,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2008-01-28 07:30:37 +01:00
|
|
|
my $user = $info->{"committer"};
|
|
|
|
if (defined($info->{"author"})) { $user = $info->{"author"}; }
|
2008-01-28 06:16:56 +01:00
|
|
|
$user =~ s/\s*<.*>\s*$//;
|
|
|
|
$user =~ s/^\s*//;
|
|
|
|
|
|
|
|
push @ret, {
|
2008-01-28 07:30:37 +01:00
|
|
|
rev => $info->{"revno"},
|
2008-01-28 06:16:56 +01:00
|
|
|
user => $user,
|
2008-01-30 01:48:30 +01:00
|
|
|
committype => "bzr",
|
2008-11-11 19:44:39 +01:00
|
|
|
when => str2time($info->{"timestamp"}),
|
2008-01-28 06:16:56 +01:00
|
|
|
message => [@message],
|
|
|
|
pages => [@pages],
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
return @ret;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2009-02-25 22:56:02 +01:00
|
|
|
sub rcs_diff ($) {
|
2009-02-26 20:09:26 +01:00
|
|
|
my $taintedrev=shift;
|
|
|
|
my ($rev) = $taintedrev =~ /^(\d+(\.\d+)*)$/; # untaint
|
|
|
|
|
|
|
|
my $prevspec = "before:" . $rev;
|
|
|
|
my $revspec = "revno:" . $rev;
|
|
|
|
my @cmdline = ("bzr", "diff", "--old", $config{srcdir},
|
|
|
|
"--new", $config{srcdir},
|
|
|
|
"-r", $prevspec . ".." . $revspec);
|
|
|
|
open (my $out, "@cmdline |");
|
|
|
|
|
|
|
|
my @lines = <$out>;
|
|
|
|
if (wantarray) {
|
|
|
|
return @lines;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return join("", @lines);
|
|
|
|
}
|
2009-02-25 22:56:02 +01:00
|
|
|
}
|
|
|
|
|
2010-04-17 19:55:32 +02:00
|
|
|
sub extract_timestamp (@) {
|
2010-06-18 18:50:31 +02:00
|
|
|
open (my $out, "-|", @_);
|
2008-01-30 01:48:30 +01:00
|
|
|
my @log = bzr_log($out);
|
2008-01-28 06:16:56 +01:00
|
|
|
|
|
|
|
if (length @log < 1) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
eval q{use Date::Parse};
|
|
|
|
error($@) if $@;
|
|
|
|
|
2010-04-17 19:55:32 +02:00
|
|
|
my $time = str2time($log[0]->{"timestamp"});
|
|
|
|
return $time;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-01-28 06:16:56 +01:00
|
|
|
|
2010-04-17 18:45:23 +02:00
|
|
|
sub rcs_getctime ($) {
|
|
|
|
my ($file) = @_;
|
|
|
|
|
|
|
|
my @cmdline = ("bzr", "log", "--forward", "--limit", '1', "$config{srcdir}/$file");
|
2010-04-17 19:55:32 +02:00
|
|
|
return extract_timestamp(@cmdline);
|
2010-04-17 18:45:23 +02:00
|
|
|
}
|
|
|
|
|
2010-04-16 23:02:29 +02:00
|
|
|
sub rcs_getmtime ($) {
|
2010-04-17 18:45:23 +02:00
|
|
|
my ($file) = @_;
|
|
|
|
|
|
|
|
my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
|
2010-04-17 19:55:32 +02:00
|
|
|
return extract_timestamp(@cmdline);
|
2010-04-16 23:02:29 +02:00
|
|
|
}
|
|
|
|
|
2008-01-28 06:16:56 +01:00
|
|
|
1
|