2006-03-26 04:30:44 +02:00
|
|
|
#!/usr/bin/perl
|
2008-07-27 04:27:58 +02:00
|
|
|
package IkiWiki::Plugin::svn;
|
2008-07-11 12:07:48 +02:00
|
|
|
|
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);
|
2012-03-13 16:49:29 +01:00
|
|
|
use URI::Escape q{uri_escape_utf8};
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub import {
|
2008-07-27 04:27:58 +02:00
|
|
|
hook(type => "checkconfig", id => "svn", call => \&checkconfig);
|
|
|
|
hook(type => "getsetup", id => "svn", 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 00:26:39 +02:00
|
|
|
if (! defined $config{svnpath}) {
|
|
|
|
$config{svnpath}="trunk";
|
|
|
|
}
|
|
|
|
if (exists $config{svnpath}) {
|
2007-06-23 14:12:59 +02:00
|
|
|
# code depends on the path not having extraneous slashes
|
2008-07-27 00:26:39 +02:00
|
|
|
$config{svnpath}=~tr#/#/#s;
|
|
|
|
$config{svnpath}=~s/\/$//;
|
|
|
|
$config{svnpath}=~s/^\///;
|
2007-06-23 14:12:59 +02:00
|
|
|
}
|
2008-07-27 04:27:58 +02:00
|
|
|
if (defined $config{svn_wrapper} && length $config{svn_wrapper}) {
|
2008-07-27 03:00:11 +02:00
|
|
|
push @{$config{wrappers}}, {
|
|
|
|
wrapper => $config{svn_wrapper},
|
|
|
|
wrappermode => (defined $config{svn_wrappermode} ? $config{svn_wrappermode} : "04755"),
|
|
|
|
};
|
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2007-06-23 14:12:59 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub getsetup () {
|
2008-07-27 00:26:39 +02:00
|
|
|
return
|
2008-08-04 01:35:35 +02:00
|
|
|
plugin => {
|
|
|
|
safe => 0, # rcs plugin
|
|
|
|
rebuild => undef,
|
2010-02-12 04:24:15 +01:00
|
|
|
section => "rcs",
|
2008-08-04 01:35:35 +02:00
|
|
|
},
|
2008-07-27 00:26:39 +02:00
|
|
|
svnrepo => {
|
|
|
|
type => "string",
|
|
|
|
example => "/svn/wiki",
|
|
|
|
description => "subversion repository location",
|
|
|
|
safe => 0, # path
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
|
|
|
svnpath => {
|
|
|
|
type => "string",
|
2008-07-27 03:00:11 +02:00
|
|
|
example => "trunk",
|
2008-07-27 00:26:39 +02:00
|
|
|
description => "path inside repository where the wiki is located",
|
|
|
|
safe => 0, # paranoia
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
2008-07-27 03:00:11 +02:00
|
|
|
svn_wrapper => {
|
|
|
|
type => "string",
|
|
|
|
example => "/svn/wikirepo/hooks/post-commit",
|
2008-08-03 04:46:16 +02:00
|
|
|
description => "svn post-commit hook to generate",
|
2008-07-27 03:00:11 +02:00
|
|
|
safe => 0, # file
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
|
|
|
svn_wrappermode => {
|
|
|
|
type => "string",
|
|
|
|
example => '04755',
|
|
|
|
description => "mode for svn_wrapper (can safely be made suid)",
|
|
|
|
safe => 0,
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
2008-07-27 00:26:39 +02:00
|
|
|
historyurl => {
|
|
|
|
type => "string",
|
|
|
|
example => "http://svn.example.org/trunk/[[file]]",
|
|
|
|
description => "viewvc url to show file history ([[file]] substituted)",
|
|
|
|
safe => 1,
|
|
|
|
rebuild => 1,
|
|
|
|
},
|
|
|
|
diffurl => {
|
|
|
|
type => "string",
|
|
|
|
example => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
|
|
|
|
description => "viewvc url to show a diff ([[file]], [[r1]], and [[r2]] substituted)",
|
|
|
|
safe => 1,
|
|
|
|
rebuild => 1,
|
|
|
|
},
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
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;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-07-29 23:04:31 +02:00
|
|
|
$ENV{LC_CTYPE} = $ENV{LC_CTYPE} || find_lc_ctype();
|
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub svn_info ($$) {
|
2006-03-23 07:51:15 +01:00
|
|
|
my $field=shift;
|
|
|
|
my $file=shift;
|
|
|
|
|
|
|
|
my $info=`LANG=C svn info $file`;
|
|
|
|
my ($ret)=$info=~/^$field: (.*)$/m;
|
|
|
|
return $ret;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_update () {
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
|
|
|
|
warn("svn update failed\n");
|
2006-03-23 07:51:15 +01:00
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_prepedit ($) {
|
2006-03-23 07:51:15 +01:00
|
|
|
# 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;
|
|
|
|
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
# For subversion, return the revision of the file when
|
|
|
|
# editing begins.
|
|
|
|
my $rev=svn_info("Revision", "$config{srcdir}/$file");
|
|
|
|
return defined $rev ? $rev : "";
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
sub commitmessage (@) {
|
|
|
|
my %params=@_;
|
|
|
|
|
|
|
|
if (defined $params{session}) {
|
|
|
|
if (defined $params{session}->param("name")) {
|
|
|
|
return "web commit by ".
|
2015-05-14 17:37:47 +02:00
|
|
|
IkiWiki::cloak($params{session}->param("name")).
|
2010-06-23 23:35:21 +02:00
|
|
|
(length $params{message} ? ": $params{message}" : "");
|
|
|
|
}
|
|
|
|
elsif (defined $params{session}->remote_addr()) {
|
|
|
|
return "web commit from ".
|
2015-05-14 17:37:47 +02:00
|
|
|
IkiWiki::cloak($params{session}->remote_addr()).
|
2010-06-23 23:35:21 +02:00
|
|
|
(length $params{message} ? ": $params{message}" : "");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return $params{message};
|
|
|
|
}
|
|
|
|
|
|
|
|
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.
|
2010-06-23 23:35:21 +02:00
|
|
|
my %params=@_;
|
2006-03-23 07:51:15 +01:00
|
|
|
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
# Check to see if the page has been changed by someone
|
|
|
|
# else since rcs_prepedit was called.
|
|
|
|
my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
|
|
|
|
my $rev=svn_info("Revision", "$config{srcdir}/$params{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",
|
|
|
|
"$config{srcdir}/$params{file}", "$config{srcdir}/$params{file}") != 0) {
|
|
|
|
warn("svn merge -r$oldrev:$rev failed\n");
|
2006-03-23 07:51:15 +01:00
|
|
|
}
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
if (system("svn", "commit", "--quiet",
|
|
|
|
"--encoding", "UTF-8", "-m",
|
|
|
|
IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
|
|
|
|
$config{srcdir}) != 0) {
|
|
|
|
my $conflict=readfile("$config{srcdir}/$params{file}");
|
|
|
|
if (system("svn", "revert", "--quiet", "$config{srcdir}/$params{file}") != 0) {
|
|
|
|
warn("svn revert failed\n");
|
2006-03-23 07:51:15 +01:00
|
|
|
}
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
return $conflict;
|
2006-03-23 07:51:15 +01:00
|
|
|
}
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
|
2006-03-23 07:51:15 +01:00
|
|
|
return undef # success
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
sub rcs_commit_staged (@) {
|
2008-07-22 22:14:33 +02:00
|
|
|
# Commits all staged changes. Changes can be staged using rcs_add,
|
|
|
|
# rcs_remove, and rcs_rename.
|
2010-06-23 23:35:21 +02:00
|
|
|
my %params=@_;
|
2008-07-22 22:14:33 +02:00
|
|
|
|
|
|
|
if (system("svn", "commit", "--quiet",
|
|
|
|
"--encoding", "UTF-8", "-m",
|
2010-06-23 23:35:21 +02:00
|
|
|
IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
|
2008-07-22 22:14:33 +02:00
|
|
|
$config{srcdir}) != 0) {
|
|
|
|
warn("svn commit failed\n");
|
|
|
|
return 1; # failure
|
|
|
|
}
|
|
|
|
return undef # success
|
|
|
|
}
|
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_add ($) {
|
2006-03-23 07:51:15 +01:00
|
|
|
# filename is relative to the root of the srcdir
|
|
|
|
my $file=shift;
|
|
|
|
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
if (system("svn", "add", "--parents", "--quiet", "$config{srcdir}/$file") != 0) {
|
|
|
|
warn("svn add failed\n");
|
2006-03-23 07:51:15 +01:00
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_remove ($) {
|
2008-07-21 19:40:06 +02:00
|
|
|
# filename is relative to the root of the srcdir
|
|
|
|
my $file=shift;
|
|
|
|
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
|
|
|
|
warn("svn rm failed\n");
|
2008-07-21 19:40:06 +02:00
|
|
|
}
|
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
|
|
|
# filenames relative to the root of the srcdir
|
|
|
|
my ($src, $dest)=@_;
|
|
|
|
|
svn: Support subversion 1.7, which does not have .svn in each subdirectory.
Involved dropping some checks for .svn which didn't add anything, since if
svn is enabled and you point it at a non-svn checkout, you get both pieces.
The tricky part is add and rename, in both cases the new file can be in
some subdirectory that is not added to svn.
For add, turns out svn has a --parents that will deal with this by adding
the intermediate directories to svn as well.
For rename though, --parents fails if the directories exist but are not
yet in svn -- which is exactly the case, since ikiwiki makes them
by calling prep_writefile. So instead, svn add the parent directory,
recursively.
tldr; svn made a reasonable change in dropping the .svn directories from
everywhere, but the semantics of other svn commands, particularly their
pickiness about whether parent directories are in svn or not, means
that without the easy crutch of checking for those .svn directories,
code has to tiptoe around svn to avoid pissing it off.
2011-10-13 01:05:17 +02:00
|
|
|
if (system("svn", "mv", "--parents", "--force", "--quiet",
|
|
|
|
"$config{srcdir}/$src", "$config{srcdir}/$dest") != 0) {
|
|
|
|
warn("svn rename failed\n");
|
2008-07-22 22:14:33 +02:00
|
|
|
}
|
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 ($) {
|
2006-03-23 07:51:15 +01:00
|
|
|
my $num=shift;
|
|
|
|
my @ret;
|
|
|
|
|
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};
|
|
|
|
|
2008-01-29 04:57:22 +01:00
|
|
|
my $when=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;
|
|
|
|
}
|
|
|
|
|
2008-07-27 06:54:15 +02:00
|
|
|
my $diffurl=defined $config{diffurl} ? $config{diffurl} : "";
|
2012-03-13 16:49:29 +01:00
|
|
|
my $efile = uri_escape_utf8($file);
|
|
|
|
$diffurl=~s/\[\[file\]\]/$efile/g;
|
2006-07-02 04:18:31 +02:00
|
|
|
$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, {
|
2008-01-29 03:23:56 +01:00
|
|
|
rev => $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;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-03-23 07:51:15 +01:00
|
|
|
|
2010-12-30 00:58:49 +01:00
|
|
|
sub rcs_diff ($;$) {
|
2008-07-27 04:27:58 +02:00
|
|
|
my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
|
2010-12-30 00:58:49 +01:00
|
|
|
my $maxlines=shift;
|
2008-03-12 20:45:10 +01:00
|
|
|
return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-03-03 21:53:34 +01:00
|
|
|
|
2010-04-17 00:43:51 +02:00
|
|
|
{
|
|
|
|
|
|
|
|
my ($lastfile, $lastmtime, $lastctime);
|
|
|
|
|
|
|
|
sub findtimes ($) {
|
2006-05-26 17:22:43 +02:00
|
|
|
my $file=shift;
|
2006-07-02 04:18:31 +02:00
|
|
|
|
2010-04-17 01:23:11 +02:00
|
|
|
if (defined $lastfile && $lastfile eq $file) {
|
2010-04-17 00:43:51 +02:00
|
|
|
return $lastmtime, $lastctime;
|
|
|
|
}
|
|
|
|
$lastfile=$file;
|
|
|
|
|
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) {
|
2010-06-24 01:32:53 +02:00
|
|
|
exec("svn", "log", "$config{srcdir}/$file") || error("svn log failed to run");
|
2006-05-26 17:22:43 +02:00
|
|
|
}
|
2006-03-26 04:30:44 +02:00
|
|
|
|
2010-04-17 00:43:51 +02:00
|
|
|
my ($cdate, $mdate);
|
2006-05-26 17:22:43 +02:00
|
|
|
while (<SVNLOG>) {
|
|
|
|
if (/$svn_log_infoline/) {
|
2010-04-17 00:43:51 +02:00
|
|
|
$cdate=$1;
|
|
|
|
$mdate=$1 unless defined $mdate;
|
2006-05-26 17:22:43 +02:00
|
|
|
}
|
|
|
|
}
|
2010-06-24 01:32:53 +02:00
|
|
|
close SVNLOG || error "svn log exited $?";
|
2006-03-26 04:30:44 +02:00
|
|
|
|
2010-04-17 00:43:51 +02:00
|
|
|
if (! defined $cdate) {
|
2010-06-24 01:32:53 +02:00
|
|
|
error "failed to parse svn log for $file";
|
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 $@;
|
2010-04-17 00:43:51 +02:00
|
|
|
|
|
|
|
$lastctime=str2time($cdate);
|
|
|
|
$lastmtime=str2time($mdate);
|
|
|
|
return $lastmtime, $lastctime;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
sub rcs_getctime ($) {
|
|
|
|
my $file=shift;
|
|
|
|
|
|
|
|
return (findtimes($file))[1];
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-03-26 04:30:44 +02:00
|
|
|
|
2010-04-16 23:02:29 +02:00
|
|
|
sub rcs_getmtime ($) {
|
2010-04-17 00:43:51 +02:00
|
|
|
my $file=shift;
|
|
|
|
|
|
|
|
return (findtimes($file))[0];
|
2010-04-16 23:02:29 +02:00
|
|
|
}
|
|
|
|
|
2006-03-23 07:51:15 +01:00
|
|
|
1
|