2006-09-06 22:31:55 +02:00
|
|
|
#!/usr/bin/perl
|
2008-07-27 04:27:58 +02:00
|
|
|
package IkiWiki::Plugin::mercurial;
|
2008-07-11 12:07:48 +02:00
|
|
|
|
2006-09-06 22:31:55 +02: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 => "mercurial", call => \&checkconfig);
|
|
|
|
hook(type => "getsetup", id => "mercurial", 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 (exists $config{mercurial_wrapper} && length $config{mercurial_wrapper}) {
|
2008-07-27 03:00:11 +02:00
|
|
|
push @{$config{wrappers}}, {
|
|
|
|
wrapper => $config{mercurial_wrapper},
|
|
|
|
wrappermode => (defined $config{mercurial_wrappermode} ? $config{mercurial_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:13:16 +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
|
|
|
mercurial_wrapper => {
|
|
|
|
type => "string",
|
|
|
|
#example => # FIXME add example
|
2008-08-03 04:46:16 +02:00
|
|
|
description => "mercurial post-commit hook to generate",
|
2008-07-27 03:00:11 +02:00
|
|
|
safe => 0, # file
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
|
|
|
mercurial_wrappermode => {
|
|
|
|
type => "string",
|
|
|
|
example => '06755',
|
|
|
|
description => "mode for mercurial_wrapper (can safely be made suid)",
|
|
|
|
safe => 0,
|
|
|
|
rebuild => 0,
|
|
|
|
},
|
2008-07-27 00:13:16 +02:00
|
|
|
historyurl => {
|
|
|
|
type => "string",
|
|
|
|
example => "http://example.com:8000/log/tip/[[file]]",
|
|
|
|
description => "url to hg serve'd repository, to show file history ([[file]] substituted)",
|
|
|
|
safe => 1,
|
|
|
|
rebuild => 1,
|
|
|
|
},
|
|
|
|
diffurl => {
|
|
|
|
type => "string",
|
|
|
|
example => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
|
|
|
|
description => "url to hg serve'd repository, to show diff ([[file]] and [[r2]] substituted)",
|
|
|
|
safe => 1,
|
|
|
|
rebuild => 1,
|
|
|
|
},
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-07-27 00:13:16 +02:00
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
sub safe_hg (&@) {
|
|
|
|
# Start a child process safely without resorting to /bin/sh.
|
|
|
|
# Returns command output (in list content) or success state
|
|
|
|
# (in scalar context), or runs the specified data handler.
|
|
|
|
|
|
|
|
my ($error_handler, $data_handler, @cmdline) = @_;
|
|
|
|
|
|
|
|
my $pid = open my $OUT, "-|";
|
|
|
|
|
|
|
|
error("Cannot fork: $!") if !defined $pid;
|
|
|
|
|
|
|
|
if (!$pid) {
|
|
|
|
# In child.
|
|
|
|
# hg commands want to be in wc.
|
|
|
|
chdir $config{srcdir}
|
|
|
|
or error("cannot chdir to $config{srcdir}: $!");
|
|
|
|
|
|
|
|
exec @cmdline or error("Cannot exec '@cmdline': $!");
|
|
|
|
}
|
|
|
|
# In parent.
|
|
|
|
|
|
|
|
my @lines;
|
|
|
|
while (<$OUT>) {
|
|
|
|
chomp;
|
|
|
|
|
|
|
|
if (! defined $data_handler) {
|
|
|
|
push @lines, $_;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
last unless $data_handler->($_);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
close $OUT;
|
|
|
|
|
|
|
|
$error_handler->("'@cmdline' failed: $!") if $? && $error_handler;
|
|
|
|
|
|
|
|
return wantarray ? @lines : ($? == 0);
|
|
|
|
}
|
|
|
|
# Convenient wrappers.
|
|
|
|
sub run_or_die ($@) { safe_hg(\&error, undef, @_) }
|
|
|
|
sub run_or_cry ($@) { safe_hg(sub { warn @_ }, undef, @_) }
|
|
|
|
sub run_or_non ($@) { safe_hg(undef, undef, @_) }
|
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub mercurial_log ($) {
|
2006-09-06 22:31:55 +02:00
|
|
|
my $out = shift;
|
|
|
|
my @infos;
|
|
|
|
|
|
|
|
while (<$out>) {
|
|
|
|
my $line = $_;
|
|
|
|
my ($key, $value);
|
|
|
|
|
|
|
|
if (/^description:/) {
|
|
|
|
$key = "description";
|
|
|
|
$value = "";
|
|
|
|
|
|
|
|
# slurp everything as the description text
|
|
|
|
# until the next changeset
|
|
|
|
while (<$out>) {
|
|
|
|
if (/^changeset: /) {
|
|
|
|
$line = $_;
|
|
|
|
last;
|
|
|
|
}
|
|
|
|
|
|
|
|
$value .= $_;
|
|
|
|
}
|
|
|
|
|
|
|
|
local $/ = "";
|
|
|
|
chomp $value;
|
|
|
|
$infos[$#infos]{$key} = $value;
|
|
|
|
}
|
|
|
|
|
|
|
|
chomp $line;
|
|
|
|
($key, $value) = split /: +/, $line, 2;
|
|
|
|
|
|
|
|
if ($key eq "changeset") {
|
|
|
|
push @infos, {};
|
|
|
|
|
|
|
|
# remove the revision index, which is strictly
|
|
|
|
# local to the repository
|
|
|
|
$value =~ s/^\d+://;
|
|
|
|
}
|
|
|
|
|
|
|
|
$infos[$#infos]{$key} = $value;
|
|
|
|
}
|
|
|
|
close $out;
|
|
|
|
|
|
|
|
return @infos;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_update () {
|
2011-07-19 17:26:14 +02:00
|
|
|
run_or_cry('hg', '-q', 'update');
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_prepedit ($) {
|
2006-09-06 22:31:55 +02:00
|
|
|
return "";
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
sub rcs_commit (@) {
|
|
|
|
my %params=@_;
|
2006-11-22 15:28:38 +01:00
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
return rcs_commit_helper(@_);
|
|
|
|
}
|
|
|
|
|
|
|
|
sub rcs_commit_helper (@) {
|
|
|
|
my %params=@_;
|
|
|
|
|
|
|
|
my %env=%ENV;
|
|
|
|
$ENV{HGENCODING} = 'utf-8';
|
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
my $user="Anonymous";
|
|
|
|
if (defined $params{session}) {
|
|
|
|
if (defined $params{session}->param("name")) {
|
|
|
|
$user = $params{session}->param("name");
|
|
|
|
}
|
|
|
|
elsif (defined $params{session}->remote_addr()) {
|
2011-07-19 17:26:14 +02:00
|
|
|
$user = $params{session}->remote_addr();
|
2010-06-23 23:35:21 +02:00
|
|
|
}
|
2011-07-19 17:26:14 +02:00
|
|
|
|
2011-07-30 10:46:26 +02:00
|
|
|
my $nickname=$user;
|
2011-07-19 17:26:14 +02:00
|
|
|
if (defined $params{session}->param("nickname")) {
|
|
|
|
$nickname=encode_utf8($params{session}->param("nickname"));
|
|
|
|
$nickname=~s/\s+/_/g;
|
|
|
|
$nickname=~s/[^-_0-9[:alnum:]]+//g;
|
|
|
|
}
|
|
|
|
$ENV{HGUSER} = encode_utf8($user . ' <' . $nickname . '@web>');
|
2006-11-22 15:28:38 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2010-06-23 23:35:21 +02:00
|
|
|
if (! length $params{message}) {
|
|
|
|
$params{message} = "no message given";
|
2007-03-24 16:14:53 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
|
|
|
|
|
|
|
|
my @opts;
|
|
|
|
|
|
|
|
if (exists $params{file}) {
|
|
|
|
push @opts, '--', $params{file};
|
2006-09-06 22:31:55 +02:00
|
|
|
}
|
2011-07-19 17:26:14 +02:00
|
|
|
# hg commit returns non-zero if nothing really changed.
|
|
|
|
# So we should ignore its exit status (hence run_or_non).
|
|
|
|
run_or_non('hg', 'commit', '-m', $params{message}, '-q', @opts);
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
%ENV=%env;
|
2006-09-06 22:31:55 +02:00
|
|
|
return undef; # success
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02: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.
|
2011-07-19 17:26:14 +02:00
|
|
|
return rcs_commit_helper(@_);
|
2008-07-22 22:14:33 +02:00
|
|
|
}
|
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_add ($) {
|
2006-09-06 22:31:55 +02:00
|
|
|
my ($file) = @_;
|
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
run_or_cry('hg', 'add', $file);
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2008-12-17 21:22:16 +01:00
|
|
|
sub rcs_remove ($) {
|
2011-07-19 17:26:14 +02:00
|
|
|
# Remove file from archive.
|
2008-07-21 19:40:06 +02:00
|
|
|
my ($file) = @_;
|
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
run_or_cry('hg', 'remove', '-f', $file);
|
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) = @_;
|
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
run_or_cry('hg', 'rename', '-f', $src, $dest);
|
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-09-06 22:31:55 +02:00
|
|
|
my ($num) = @_;
|
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
my %env=%ENV;
|
|
|
|
$ENV{HGENCODING} = 'utf-8';
|
|
|
|
|
2007-08-29 04:01:23 +02:00
|
|
|
my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,
|
2007-08-29 04:09:43 +02:00
|
|
|
"--style", "default");
|
2006-09-06 22:31:55 +02:00
|
|
|
open (my $out, "@cmdline |");
|
|
|
|
|
2006-11-26 21:01:43 +01:00
|
|
|
eval q{use Date::Parse};
|
|
|
|
error($@) if $@;
|
|
|
|
|
2006-09-06 22:31:55 +02:00
|
|
|
my @ret;
|
|
|
|
foreach my $info (mercurial_log($out)) {
|
|
|
|
my @pages = ();
|
|
|
|
my @message = ();
|
2011-07-19 17:39:32 +02:00
|
|
|
|
2006-09-06 22:31:55 +02:00
|
|
|
foreach my $msgline (split(/\n/, $info->{description})) {
|
|
|
|
push @message, { line => $msgline };
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach my $file (split / /,$info->{files}) {
|
2008-07-27 06:54:15 +02:00
|
|
|
my $diffurl = defined $config{diffurl} ? $config{'diffurl'} : "";
|
2006-09-06 22:31:55 +02:00
|
|
|
$diffurl =~ s/\[\[file\]\]/$file/go;
|
|
|
|
$diffurl =~ s/\[\[r2\]\]/$info->{changeset}/go;
|
|
|
|
|
|
|
|
push @pages, {
|
|
|
|
page => pagename($file),
|
|
|
|
diffurl => $diffurl,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
#"user <email@domain.net>": parse out "user".
|
2006-09-06 22:31:55 +02:00
|
|
|
my $user = $info->{"user"};
|
|
|
|
$user =~ s/\s*<.*>\s*$//;
|
|
|
|
$user =~ s/^\s*//;
|
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
#"user <nickname@web>": if "@web" hits, set $web_commit=true.
|
|
|
|
my $web_commit = ($info->{'user'} =~ /\@web>/);
|
|
|
|
|
|
|
|
#"user <nickname@web>": if user is a URL (hits "://") and "@web"
|
|
|
|
#was present, parse out nick.
|
|
|
|
my $nickname;
|
|
|
|
if ($user =~ /:\/\// && $web_commit) {
|
|
|
|
$nickname = $info->{'user'};
|
|
|
|
$nickname =~ s/^[^<]*<([^\@]+)\@web>\s*$/$1/;
|
|
|
|
}
|
|
|
|
|
2006-09-06 22:31:55 +02:00
|
|
|
push @ret, {
|
2008-01-29 03:23:56 +01:00
|
|
|
rev => $info->{"changeset"},
|
2006-09-06 22:31:55 +02:00
|
|
|
user => $user,
|
2011-07-19 17:26:14 +02:00
|
|
|
nickname => $nickname,
|
|
|
|
committype => $web_commit ? "web" : "hg",
|
2008-01-29 04:57:22 +01:00
|
|
|
when => str2time($info->{"date"}),
|
2006-09-06 22:31:55 +02:00
|
|
|
message => [@message],
|
|
|
|
pages => [@pages],
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2011-07-19 17:26:14 +02:00
|
|
|
%ENV=%env;
|
|
|
|
|
2006-09-06 22:31:55 +02:00
|
|
|
return @ret;
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2010-12-30 00:58:49 +01:00
|
|
|
sub rcs_diff ($;$) {
|
2011-07-19 17:44:09 +02:00
|
|
|
my $rev=shift;
|
|
|
|
my $maxlines=shift;
|
|
|
|
my @lines;
|
|
|
|
my $addlines=sub {
|
|
|
|
my $line=shift;
|
|
|
|
return if defined $maxlines && @lines == $maxlines;
|
|
|
|
push @lines, $line."\n"
|
|
|
|
if (@lines || $line=~/^diff --git/);
|
|
|
|
return 1;
|
|
|
|
};
|
|
|
|
safe_hg(undef, $addlines, "hg", "diff", "-c", $rev, "-g");
|
|
|
|
if (wantarray) {
|
|
|
|
return @lines;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return join("", @lines);
|
|
|
|
}
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2008-03-03 21:53:34 +01:00
|
|
|
|
2011-07-19 17:39:32 +02:00
|
|
|
{
|
|
|
|
my %time_cache;
|
|
|
|
|
|
|
|
sub findtimes ($$) {
|
|
|
|
my $file=shift;
|
|
|
|
my $id=shift; # 0 = mtime ; 1 = ctime
|
|
|
|
|
|
|
|
if (! keys %time_cache) {
|
|
|
|
my $date;
|
|
|
|
|
|
|
|
# It doesn't seem possible to specify the format wanted for the
|
|
|
|
# changelog (same format as is generated in git.pm:findtimes(),
|
|
|
|
# though the date differs slightly) without using a style
|
|
|
|
# _file_. There is a "hg log" switch "--template" to directly
|
|
|
|
# control simple output formatting, but in this case, the
|
|
|
|
# {file} directive must be redefined, which can only be done
|
|
|
|
# with "--style".
|
|
|
|
#
|
|
|
|
# If {file} is not redefined, all files are output on a single
|
|
|
|
# line separated with a space. It is not possible to conclude
|
|
|
|
# if the space is part of a filename or just a separator, and
|
|
|
|
# thus impossible to use in this case.
|
|
|
|
#
|
|
|
|
# Some output filters are available in hg, but they are not fit
|
|
|
|
# for this cause (and would slow down the process
|
|
|
|
# unnecessarily).
|
|
|
|
|
|
|
|
eval q{use File::Temp};
|
|
|
|
error $@ if $@;
|
|
|
|
my ($tmpl_fh, $tmpl_filename) = File::Temp::tempfile(UNLINK => 1);
|
|
|
|
|
|
|
|
print $tmpl_fh 'changeset = "{date}\\n{files}\\n"' . "\n";
|
|
|
|
print $tmpl_fh 'file = "{file}\\n"' . "\n";
|
|
|
|
|
|
|
|
foreach my $line (run_or_die('hg', 'log', '--style', $tmpl_filename)) {
|
2011-07-30 10:52:49 +02:00
|
|
|
if (! defined $date && $line =~ /^(\d+)/) {
|
|
|
|
$date=$1;
|
2011-07-19 17:39:32 +02:00
|
|
|
}
|
|
|
|
elsif (! length $line) {
|
|
|
|
$date=undef;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
my $f=$line;
|
2006-11-26 21:01:43 +01:00
|
|
|
|
2011-07-19 17:39:32 +02:00
|
|
|
if (! $time_cache{$f}) {
|
|
|
|
$time_cache{$f}[0]=$date; # mtime
|
|
|
|
}
|
|
|
|
$time_cache{$f}[1]=$date; # ctime
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-11-26 21:01:43 +01:00
|
|
|
|
2011-07-19 17:39:32 +02:00
|
|
|
return exists $time_cache{$file} ? $time_cache{$file}[$id] : 0;
|
|
|
|
}
|
2006-11-26 21:01:43 +01:00
|
|
|
|
2011-07-19 17:39:32 +02:00
|
|
|
}
|
2006-11-26 21:01:43 +01:00
|
|
|
|
2011-07-19 17:39:32 +02:00
|
|
|
sub rcs_getctime ($) {
|
|
|
|
my $file = shift;
|
|
|
|
|
|
|
|
return findtimes($file, 1);
|
2008-12-17 21:22:16 +01:00
|
|
|
}
|
2006-09-06 22:31:55 +02:00
|
|
|
|
2010-04-16 23:02:29 +02:00
|
|
|
sub rcs_getmtime ($) {
|
2011-07-19 17:39:32 +02:00
|
|
|
my $file = shift;
|
|
|
|
|
|
|
|
return findtimes($file, 0);
|
2010-04-16 23:02:29 +02:00
|
|
|
}
|
|
|
|
|
2006-09-06 22:31:55 +02:00
|
|
|
1
|