#!/usr/bin/perl
+package IkiWiki;
+
use warnings;
use strict;
use IkiWiki;
use Encode;
use open qw{:utf8 :std};
-package IkiWiki;
-
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes
$ci{ "${who}_epoch" } = $epoch;
$ci{ "${who}_tz" } = $tz;
- if ($name =~ m/^([^<]+) <([^@>]+)/) {
- my ($fullname, $username) = ($1, $2);
- $ci{"${who}_fullname"} = $fullname;
- $ci{"${who}_username"} = $username;
+ if ($name =~ m/^[^<]+\s+<([^@>]+)/) {
+ $ci{"${who}_username"} = $1;
+ }
+ elsif ($name =~ m/^([^<]+)\s+<>$/) {
+ $ci{"${who}_username"} = $1;
}
else {
- $ci{"${who}_fullname"} =
- $ci{"${who}_username"} = $name;
+ $ci{"${who}_username"} = $name;
}
}
elsif ($line =~ m/^$/) {
last;
}
- debug("No detail in diff-tree output") if !defined $ci{'details'};
-
return \%ci;
} #}}}
my $file = shift || q{--};
# Ignore error since a non-existing file might be given.
- my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD', $file);
+ my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD',
+ '--', $file);
if ($sha1) {
($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
} else { debug("Empty sha1sum for '$file'.") }
my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
- if (defined $user) {
- $message = "web commit by $user" .
- (length $message ? ": $message" : "");
- }
- elsif (defined $ipaddr) {
- $message = "web commit from $ipaddr" .
- (length $message ? ": $message" : "");
- }
-
- # XXX: Wiki directory is in the unlocked state when starting this
- # action. But it takes time for a Git process to finish its job
- # (especially if a merge required), so we must re-lock to prevent
- # race conditions. Only when the time of the real commit action
- # (i.e. git push) comes, we'll unlock the directory.
- lockwiki();
-
# Check to see if the page has been changed by someone else since
# rcs_prepedit was called.
my $cur = git_sha1($file);
my $conflict = _merge_past($prev, $file, $dummy_commit_msg);
return $conflict if defined $conflict;
}
+
+ # Set the commit author to the web committer.
+ my %env=%ENV;
+ if (defined $user || defined $ipaddr) {
+ $ENV{GIT_AUTHOR_NAME}=(defined $user ? $user : $ipaddr)." (web)";
+ $ENV{GIT_AUTHOR_EMAIL}="";
+ }
# git commit returns non-zero if file has not been really changed.
# so we should ignore its exit status (hence run_or_non).
$message = possibly_foolish_untaint($message);
- if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) {
- unlockwiki();
+ if (run_or_non('git', 'commit', '--cleanup=verbatim', '-q', '-m', $message, '-i', $file)) {
if (length $config{gitorigin_branch}) {
run_or_cry('git', 'push', $config{gitorigin_branch});
}
}
-
+
+ %ENV=%env;
return undef; # success
} #}}}
my ($sha1, $when) = (
$ci->{'sha1'},
- time - $ci->{'author_epoch'}
+ $ci->{'author_epoch'}
);
- my (@pages, @messages);
+ my @pages;
foreach my $detail (@{ $ci->{'details'} }) {
my $file = $detail->{'file'};
diffurl => $diffurl,
};
}
- push @messages, { line => $_ } foreach @{$ci->{'comment'}};
- my ($user, $type) = (q{}, "web");
+ my @messages;
+ my $pastblank=0;
+ foreach my $line (@{$ci->{'comment'}}) {
+ $pastblank=1 if $line eq '';
+ next if $pastblank && $line=~m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i;
+ push @messages, { line => $line };
+ }
- if (defined $messages[0] &&
- $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
+ my $user=$ci->{'author_username'};
+ my $web_commit = ($user=~s/\s+\(web\)$//);
+
+ # compatability code for old web commit messages
+ if (! $web_commit &&
+ defined $messages[0] &&
+ $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
$user = defined $2 ? "$2" : "$3";
$messages[0]->{line} = $4;
}
- else {
- $type ="git";
- $user = $ci->{'author_username'};
- }
push @rets, {
rev => $sha1,
user => $user,
- committype => $type,
+ committype => $web_commit ? "web" : "git",
when => $when,
message => [@messages],
pages => [@pages],
return @rets;
} #}}}
-sub rcs_notify () { #{{{
- # Send notification mail to subscribed users.
- #
- # In usual Git usage, hooks/update script is presumed to send
- # notification mails (see git-receive-pack(1)). But we prefer
- # hooks/post-update to support IkiWiki commits coming from a
- # cloned repository (through command line) because post-update
- # is called _after_ each ref in repository is updated (update
- # hook is called _before_ the repository is updated).
- #
- # Here, we rely on a simple fact: we can extract all parts of the
- # notification content by parsing the "HEAD" commit.
-
- my $ci = git_commit_info('HEAD');
- return if !defined $ci;
-
- my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
-
- my ($user, $message);
- if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
- $user = defined $2 ? "$2" : "$3";
- $message = $4;
+sub rcs_diff ($) { #{{{
+ my $rev=shift;
+ my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
+ my @lines;
+ foreach my $line (run_or_non("git", "show", $sha1)) {
+ if (@lines || $line=~/^diff --git/) {
+ push @lines, $line."\n";
+ }
+ }
+ if (wantarray) {
+ return @lines;
}
else {
- $user = $ci->{'author_username'};
- $message = join "\n", @{ $ci->{'comment'} };
+ return join("", @lines);
}
-
- my $sha1 = $ci->{'sha1'};
-
- require IkiWiki::UserInfo;
- send_commit_mails(
- sub {
- $message;
- },
- sub {
- join "\n", run_or_die('git', 'diff', "${sha1}^", $sha1);
- }, $user, @changed_pages
- );
} #}}}
sub rcs_getctime ($) { #{{{
sipb-www / ikiwiki.git / blobdiff