2006-03-26 04:30:44 +02:00
|
|
|
#!/usr/bin/perl
|
2006-03-23 07:51:15 +01:00
|
|
|
|
|
|
|
use warnings;
|
|
|
|
use strict;
|
2006-05-02 08:53:33 +02:00
|
|
|
use IkiWiki;
|
2006-07-29 23:04:31 +02:00
|
|
|
use POSIX qw(setlocale LC_CTYPE);
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2007-06-23 14:12:59 +02:00
|
|
|
package IkiWiki::Rcs::svn;
|
|
|
|
|
|
|
|
sub import { #{{{
|
|
|
|
if (exists $IkiWiki::config{svnpath}) {
|
|
|
|
# code depends on the path not having extraneous slashes
|
|
|
|
$IkiWiki::config{svnpath}=~tr#/#/#s;
|
|
|
|
$IkiWiki::config{svnpath}=~s/\/$//;
|
|
|
|
$IkiWiki::config{svnpath}=~s/^\///;
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
|
2006-03-23 07:51:15 +01:00
|
|
|
package IkiWiki;
|
2007-06-23 14:12:59 +02:00
|
|
|
|
2006-07-29 23:04:31 +02:00
|
|
|
# svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
|
|
|
|
sub find_lc_ctype() {
|
|
|
|
my $current = setlocale(LC_CTYPE());
|
|
|
|
return $current if $current =~ m/UTF-?8$/i;
|
|
|
|
|
|
|
|
# Make some obvious attempts to avoid calling `locale -a`
|
|
|
|
foreach my $locale ("$current.UTF-8", "en_US.UTF-8", "en_GB.UTF-8") {
|
|
|
|
return $locale if setlocale(LC_CTYPE(), $locale);
|
|
|
|
}
|
|
|
|
|
|
|
|
# Try to get all available locales and pick the first UTF-8 one found.
|
|
|
|
if (my @locale = grep(/UTF-?8$/i, `locale -a`)) {
|
|
|
|
chomp @locale;
|
|
|
|
return $locale[0] if setlocale(LC_CTYPE(), $locale[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
# fallback to the current locale
|
|
|
|
return $current;
|
|
|
|
} # }}}
|
|
|
|
$ENV{LC_CTYPE} = $ENV{LC_CTYPE} || find_lc_ctype();
|
|
|
|
|
2006-03-23 07:51:15 +01:00
|
|
|
sub svn_info ($$) { #{{{
|
|
|
|
my $field=shift;
|
|
|
|
my $file=shift;
|
|
|
|
|
|
|
|
my $info=`LANG=C svn info $file`;
|
|
|
|
my ($ret)=$info=~/^$field: (.*)$/m;
|
|
|
|
return $ret;
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub rcs_update () { #{{{
|
|
|
|
if (-d "$config{srcdir}/.svn") {
|
|
|
|
if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
|
|
|
|
warn("svn update failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub rcs_prepedit ($) { #{{{
|
|
|
|
# Prepares to edit a file under revision control. Returns a token
|
|
|
|
# that must be passed into rcs_commit when the file is ready
|
|
|
|
# for committing.
|
|
|
|
# The file is relative to the srcdir.
|
|
|
|
my $file=shift;
|
|
|
|
|
|
|
|
if (-d "$config{srcdir}/.svn") {
|
|
|
|
# For subversion, return the revision of the file when
|
|
|
|
# editing begins.
|
|
|
|
my $rev=svn_info("Revision", "$config{srcdir}/$file");
|
|
|
|
return defined $rev ? $rev : "";
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
2006-11-22 15:28:38 +01:00
|
|
|
sub rcs_commit ($$$;$$) { #{{{
|
2006-03-23 07:51:15 +01:00
|
|
|
# Tries to commit the page; returns undef on _success_ and
|
|
|
|
# a version of the page with the rcs's conflict markers on failure.
|
|
|
|
# The file is relative to the srcdir.
|
|
|
|
my $file=shift;
|
|
|
|
my $message=shift;
|
|
|
|
my $rcstoken=shift;
|
2006-11-22 15:28:38 +01:00
|
|
|
my $user=shift;
|
|
|
|
my $ipaddr=shift;
|
|
|
|
|
|
|
|
if (defined $user) {
|
|
|
|
$message="web commit by $user".(length $message ? ": $message" : "");
|
|
|
|
}
|
|
|
|
elsif (defined $ipaddr) {
|
|
|
|
$message="web commit from $ipaddr".(length $message ? ": $message" : "");
|
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
|
|
|
if (-d "$config{srcdir}/.svn") {
|
|
|
|
# Check to see if the page has been changed by someone
|
|
|
|
# else since rcs_prepedit was called.
|
|
|
|
my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
|
|
|
|
my $rev=svn_info("Revision", "$config{srcdir}/$file");
|
|
|
|
if (defined $rev && defined $oldrev && $rev != $oldrev) {
|
|
|
|
# Merge their changes into the file that we've
|
|
|
|
# changed.
|
|
|
|
if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
|
2007-01-28 01:06:01 +01:00
|
|
|
"$config{srcdir}/$file", "$config{srcdir}/$file") != 0) {
|
2006-03-23 07:51:15 +01:00
|
|
|
warn("svn merge -r$oldrev:$rev failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-02 06:02:08 +02:00
|
|
|
if (system("svn", "commit", "--quiet",
|
|
|
|
"--encoding", "UTF-8", "-m",
|
2006-03-23 07:51:15 +01:00
|
|
|
possibly_foolish_untaint($message),
|
2007-01-14 05:51:35 +01:00
|
|
|
$config{srcdir}) != 0) {
|
2006-03-23 07:51:15 +01:00
|
|
|
my $conflict=readfile("$config{srcdir}/$file");
|
|
|
|
if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
|
|
|
|
warn("svn revert failed\n");
|
|
|
|
}
|
|
|
|
return $conflict;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return undef # success
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub rcs_add ($) { #{{{
|
|
|
|
# filename is relative to the root of the srcdir
|
|
|
|
my $file=shift;
|
|
|
|
|
|
|
|
if (-d "$config{srcdir}/.svn") {
|
|
|
|
my $parent=dirname($file);
|
|
|
|
while (! -d "$config{srcdir}/$parent/.svn") {
|
|
|
|
$file=$parent;
|
|
|
|
$parent=dirname($file);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (system("svn", "add", "--quiet", "$config{srcdir}/$file") != 0) {
|
|
|
|
warn("svn add failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} #}}}
|
|
|
|
|
|
|
|
sub rcs_recentchanges ($) { #{{{
|
|
|
|
my $num=shift;
|
|
|
|
my @ret;
|
|
|
|
|
2006-07-02 04:18:31 +02:00
|
|
|
return unless -d "$config{srcdir}/.svn";
|
|
|
|
|
2006-11-08 22:03:33 +01:00
|
|
|
eval q{
|
|
|
|
use Date::Parse;
|
|
|
|
use XML::SAX;
|
|
|
|
use XML::Simple;
|
|
|
|
};
|
|
|
|
error($@) if $@;
|
2006-07-05 19:40:07 +02:00
|
|
|
|
2006-07-11 22:18:11 +02:00
|
|
|
# avoid using XML::SAX::PurePerl, it's buggy with UTF-8 data
|
|
|
|
my @parsers = map { ${$_}{Name} } @{XML::SAX->parsers()};
|
|
|
|
do {
|
|
|
|
$XML::Simple::PREFERRED_PARSER = pop @parsers;
|
|
|
|
} until $XML::Simple::PREFERRED_PARSER ne 'XML::SAX::PurePerl';
|
|
|
|
|
2006-07-05 19:40:07 +02:00
|
|
|
# --limit is only supported on Subversion 1.2.0+
|
|
|
|
my $svn_version=`svn --version -q`;
|
|
|
|
my $svn_limit='';
|
|
|
|
$svn_limit="--limit $num"
|
|
|
|
if $svn_version =~ /\d\.(\d)\.\d/ && $1 >= 2;
|
|
|
|
|
2006-07-02 04:18:31 +02:00
|
|
|
my $svn_url=svn_info("URL", $config{srcdir});
|
2006-07-05 19:40:07 +02:00
|
|
|
my $xml = XMLin(scalar `svn $svn_limit --xml -v log '$svn_url'`,
|
2006-07-02 04:18:31 +02:00
|
|
|
ForceArray => [ 'logentry', 'path' ],
|
|
|
|
GroupTags => { paths => 'path' },
|
|
|
|
KeyAttr => { path => 'content' },
|
|
|
|
);
|
|
|
|
foreach my $logentry (@{$xml->{logentry}}) {
|
|
|
|
my (@pages, @message);
|
|
|
|
|
|
|
|
my $rev = $logentry->{revision};
|
|
|
|
my $user = $logentry->{author};
|
|
|
|
|
2006-09-03 21:53:23 +02:00
|
|
|
my $when=time - str2time($logentry->{date}, 'UTC');
|
2006-07-02 04:18:31 +02:00
|
|
|
|
|
|
|
foreach my $msgline (split(/\n/, $logentry->{msg})) {
|
2006-09-04 06:29:18 +02:00
|
|
|
push @message, { line => $msgline };
|
2006-07-02 04:18:31 +02:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2006-07-02 04:18:31 +02:00
|
|
|
my $committype="web";
|
|
|
|
if (defined $message[0] &&
|
2006-11-20 03:46:58 +01:00
|
|
|
$message[0]->{line}=~/$config{web_commit_regexp}/) {
|
2006-07-11 22:55:14 +02:00
|
|
|
$user=defined $2 ? "$2" : "$3";
|
|
|
|
$message[0]->{line}=$4;
|
2006-07-02 04:18:31 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
$committype="svn";
|
2006-03-23 07:51:15 +01:00
|
|
|
}
|
2006-07-02 04:18:31 +02:00
|
|
|
|
2007-10-22 00:57:11 +02:00
|
|
|
foreach my $file (keys %{$logentry->{paths}}) {
|
|
|
|
if (length $config{svnpath}) {
|
|
|
|
next unless $file=~/^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;
|
|
|
|
$file=$1;
|
|
|
|
}
|
|
|
|
|
2006-07-02 04:18:31 +02:00
|
|
|
my $diffurl=$config{diffurl};
|
|
|
|
$diffurl=~s/\[\[file\]\]/$file/g;
|
|
|
|
$diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
|
|
|
|
$diffurl=~s/\[\[r2\]\]/$rev/g;
|
2007-10-22 00:57:11 +02:00
|
|
|
|
2006-07-02 04:18:31 +02:00
|
|
|
push @pages, {
|
2006-09-03 21:53:23 +02:00
|
|
|
page => pagename($file),
|
2006-07-02 04:18:31 +02:00
|
|
|
diffurl => $diffurl,
|
|
|
|
} if length $file;
|
|
|
|
}
|
2008-01-29 02:34:11 +01:00
|
|
|
push @ret, {
|
|
|
|
id => $rev,
|
2006-09-03 21:53:23 +02:00
|
|
|
user => $user,
|
2006-07-02 04:18:31 +02:00
|
|
|
committype => $committype,
|
|
|
|
when => $when,
|
|
|
|
message => [@message],
|
|
|
|
pages => [@pages],
|
|
|
|
} if @pages;
|
|
|
|
return @ret if @ret >= $num;
|
2006-03-23 07:51:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return @ret;
|
|
|
|
} #}}}
|
|
|
|
|
2006-04-25 01:09:26 +02:00
|
|
|
sub rcs_notify () { #{{{
|
|
|
|
if (! exists $ENV{REV}) {
|
2006-12-29 05:38:40 +01:00
|
|
|
error(gettext("REV is not set, not running from svn post-commit hook, cannot send notifications"));
|
2006-04-25 01:09:26 +02:00
|
|
|
}
|
2006-04-25 02:22:41 +02:00
|
|
|
my $rev=int(possibly_foolish_untaint($ENV{REV}));
|
2006-04-25 22:24:44 +02:00
|
|
|
|
|
|
|
my $user=`svnlook author $config{svnrepo} -r $rev`;
|
|
|
|
chomp $user;
|
2006-11-22 05:06:56 +01:00
|
|
|
|
|
|
|
my $message=`svnlook log $config{svnrepo} -r $rev`;
|
|
|
|
if ($message=~/$config{web_commit_regexp}/) {
|
|
|
|
$user=defined $2 ? "$2" : "$3";
|
|
|
|
$message=$4;
|
|
|
|
}
|
2006-04-25 01:09:26 +02:00
|
|
|
|
|
|
|
my @changed_pages;
|
2006-04-25 02:22:41 +02:00
|
|
|
foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) {
|
|
|
|
chomp $change;
|
2007-10-22 00:57:11 +02:00
|
|
|
if (length $config{svnpath}) {
|
|
|
|
if ($change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
|
|
|
|
push @changed_pages, $1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
push @changed_pages, $change;
|
2006-04-25 01:09:26 +02:00
|
|
|
}
|
|
|
|
}
|
2006-11-21 18:47:53 +01:00
|
|
|
|
2006-04-25 01:09:26 +02:00
|
|
|
require IkiWiki::UserInfo;
|
2006-11-21 18:47:53 +01:00
|
|
|
send_commit_mails(
|
|
|
|
sub {
|
|
|
|
return $message;
|
|
|
|
},
|
|
|
|
sub {
|
|
|
|
`svnlook diff $config{svnrepo} -r $rev --no-diff-deleted`;
|
|
|
|
}, $user, @changed_pages);
|
2006-04-25 01:09:26 +02:00
|
|
|
} #}}}
|
|
|
|
|
2006-05-26 17:22:43 +02:00
|
|
|
sub rcs_getctime ($) { #{{{
|
|
|
|
my $file=shift;
|
2006-07-02 04:18:31 +02:00
|
|
|
|
|
|
|
my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
|
2006-05-26 17:22:43 +02:00
|
|
|
|
|
|
|
my $child = open(SVNLOG, "-|");
|
|
|
|
if (! $child) {
|
|
|
|
exec("svn", "log", $file) || error("svn log $file failed to run");
|
|
|
|
}
|
2006-03-26 04:30:44 +02:00
|
|
|
|
2006-05-26 17:22:43 +02:00
|
|
|
my $date;
|
|
|
|
while (<SVNLOG>) {
|
|
|
|
if (/$svn_log_infoline/) {
|
2006-07-02 04:18:31 +02:00
|
|
|
$date=$1;
|
2006-05-26 17:22:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
close SVNLOG || warn "svn log $file exited $?";
|
2006-03-26 04:30:44 +02:00
|
|
|
|
2006-05-26 17:22:43 +02:00
|
|
|
if (! defined $date) {
|
|
|
|
warn "failed to parse svn log for $file\n";
|
|
|
|
return 0;
|
2006-03-26 04:30:44 +02:00
|
|
|
}
|
2006-05-26 17:22:43 +02:00
|
|
|
|
2006-09-04 01:07:07 +02:00
|
|
|
eval q{use Date::Parse};
|
2006-11-08 22:03:33 +01:00
|
|
|
error($@) if $@;
|
2006-05-26 17:22:43 +02:00
|
|
|
$date=str2time($date);
|
|
|
|
debug("found ctime ".localtime($date)." for $file");
|
|
|
|
return $date;
|
2006-03-26 04:30:44 +02:00
|
|
|
} #}}}
|
|
|
|
|
2006-03-23 07:51:15 +01:00
|
|
|
1
|