Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
web commit from 217.16.16.218: poll vote (Accept only password logins)
[git.ikiwiki.info.git]
/
IkiWiki
/
Rcs
/
mercurial.pm
diff --git
a/IkiWiki/Rcs/mercurial.pm
b/IkiWiki/Rcs/mercurial.pm
index 67002ac57148bbf7fd1edda1b644d1bccba36949..15edb324581dc33e912dc17f214117b419fa689f 100644
(file)
--- a/
IkiWiki/Rcs/mercurial.pm
+++ b/
IkiWiki/Rcs/mercurial.pm
@@
-55,7
+55,7
@@
sub mercurial_log($) {
}
sub rcs_update () { #{{{
}
sub rcs_update () { #{{{
- my @cmdline = ("hg", "-R", "$config{srcdir}", "update");
+ my @cmdline = ("hg", "-
q", "-
R", "$config{srcdir}", "update");
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
@@
-72,16
+72,19
@@
sub rcs_commit ($$$;$$) { #{{{
$user = possibly_foolish_untaint($user);
}
elsif (defined $ipaddr) {
$user = possibly_foolish_untaint($user);
}
elsif (defined $ipaddr) {
- $user = "Anonymous from
$ipaddr"
;
+ $user = "Anonymous from
".possibly_foolish_untaint($ipaddr)
;
}
else {
$user = "Anonymous";
}
$message = possibly_foolish_untaint($message);
}
else {
$user = "Anonymous";
}
$message = possibly_foolish_untaint($message);
+ if (! length $message) {
+ $message = "no message given";
+ }
- my @cmdline = ("hg", "-
R", "$config{srcdir}"
, "commit",
- "-m",
"$message", "-u", "$user"
);
+ my @cmdline = ("hg", "-
q", "-R", $config{srcdir}
, "commit",
+ "-m",
$message, "-u", $user
);
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
@@
-92,7
+95,7
@@
sub rcs_commit ($$$;$$) { #{{{
sub rcs_add ($) { # {{{
my ($file) = @_;
sub rcs_add ($) { # {{{
my ($file) = @_;
- my @cmdline = ("hg", "-
R", "$config{srcdir}", "add", "
$file");
+ my @cmdline = ("hg", "-
q", "-R", "$config{srcdir}", "add", "$config{srcdir}/
$file");
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
@@
-104,7
+107,8
@@
sub rcs_recentchanges ($) { #{{{
eval q{use CGI 'escapeHTML'};
error($@) if $@;
eval q{use CGI 'escapeHTML'};
error($@) if $@;
- my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num);
+ my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,
+ "--style", "default");
open (my $out, "@cmdline |");
eval q{use Date::Parse};
open (my $out, "@cmdline |");
eval q{use Date::Parse};
@@
-138,7
+142,7
@@
sub rcs_recentchanges ($) { #{{{
rev => $info->{"changeset"},
user => $user,
committype => "mercurial",
rev => $info->{"changeset"},
user => $user,
committype => "mercurial",
- when => str2time($info->{"date"}),
+ when =>
time -
str2time($info->{"date"}),
message => [@message],
pages => [@pages],
};
message => [@message],
pages => [@pages],
};
@@
-156,7
+160,8
@@
sub rcs_getctime ($) { #{{{
# XXX filename passes through the shell here, should try to avoid
# that just in case
# XXX filename passes through the shell here, should try to avoid
# that just in case
- my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", '1', $file);
+ my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", '1',
+ "--style", "default", "$config{srcdir}/$file");
open (my $out, "@cmdline |");
my @log = mercurial_log($out);
open (my $out, "@cmdline |");
my @log = mercurial_log($out);