fix a bug

[git.ikiwiki.info.git] / IkiWiki / Rcs / git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index f29ffa16238fb1826377eda6ccfdf491485cfa10..09275fe5f550868fac8c692665b63ce299bf2073 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -3,6 +3,8 @@
 use warnings;
 use strict;
 use IkiWiki;
+use Encode;
+use open qw{:utf8 :std};
 
 package IkiWiki;
 
@@ -10,7 +12,7 @@ my $origin_branch    = 'origin';            # Git ref for main repository
 my $master_branch    = 'master';            # working branch
 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
-my $web_commit_msg   = qr/^web commit by (\w+):?(.*)/; # pattern for web commits
+my $web_commit_msg   = qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
 
 sub _safe_git (&@) { #{{{
        # Start a child process safely without resorting /bin/sh.
@@ -46,7 +48,7 @@ sub _safe_git (&@) { #{{{
        return wantarray ? @lines : ($? == 0);
 }
 # Convenient wrappers.
-sub run_or_die ($@) { _safe_git(\&IkiWiki::error, @_) }
+sub run_or_die ($@) { _safe_git(\&error, @_) }
 sub run_or_cry ($@) { _safe_git(sub { warn @_ },  @_) }
 sub run_or_non ($@) { _safe_git(undef,            @_) }
 #}}}
@@ -228,7 +230,7 @@ sub _parse_diff_tree (@) { #{{{
                        }
                        if (length $file) {
                                push @{ $ci{'details'} }, {
-                                       'file'      => $file,
+                                       'file'      => decode_utf8($file),
                                        'sha1_from' => $sha1_from,
                                        'sha1_to'   => $sha1_to,
                                };
@@ -341,9 +343,7 @@ sub rcs_recentchanges ($) { #{{{
 
        my ($num) = @_;
 
-       eval q{use CGI 'escapeHTML'};
        eval q{use Date::Parse};
-       eval q{use Time::Duration};
 
        my ($sha1, $type, $when, $diffurl, $user, @pages, @message, @rets);
        INFO: foreach my $ci (git_commit_info('HEAD', $num)) {
@@ -354,29 +354,29 @@ sub rcs_recentchanges ($) { #{{{
 
                $sha1 = $ci->{'sha1'};
                $type = "web";
-               $when = concise(ago(time - $ci->{'author_epoch'}));
+               $when = time - $ci->{'author_epoch'};
 
-               foreach my $bit (@{ $ci->{'details'} }) {
+               DETAIL: foreach my $detail (@{ $ci->{'details'} }) {
                        my $diffurl = $config{'diffurl'};
-                       my $file    = $bit->{'file'};
+                       my $file    = $detail->{'file'};
 
                        $diffurl =~ s/\[\[file\]\]/$file/go;
                        $diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
-                       $diffurl =~ s/\[\[sha1_from\]\]/$bit->{'sha1_from'}/go;
-                       $diffurl =~ s/\[\[sha1_to\]\]/$bit->{'sha1_to'}/go;
+                       $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
+                       $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
 
                        push @pages, {
-                               link => htmllink("", "", pagename($file), 1),
+                               page => pagename($file),
                                diffurl => $diffurl,
-                       },
+                       };
                }
 
-               push @message, { line => escapeHTML($title) };
+               push @message, { line => $title };
 
                if (defined $message[0] &&
                    $message[0]->{line} =~ m/$web_commit_msg/) {
-                       $user = "$1";
-                       $message[0]->{line} = $2;
+                       $user=defined $2 ? "$2" : "$3";
+                       $message[0]->{line}=$4;
                } else {
                        $type ="git";
                        $user = $ci->{'author_username'};
@@ -384,7 +384,7 @@ sub rcs_recentchanges ($) { #{{{
 
                push @rets, {
                        rev        => $sha1,
-                       user       => htmllink("", "", $user, 1),
+                       user       => $user,
                        committype => $type,
                        when       => $when,
                        message    => [@message],
@@ -424,8 +424,8 @@ sub rcs_notify () { #{{{
 
        my ($user, $message);
        if (@{ $ci->{'comment'} }[0] =~ m/$web_commit_msg/) {
-               $user    = "$1";
-               $message = $2;
+               $user    = defined $2 ? "$2" : "$3";
+               $message = $4;
        } else {
                $user    = $ci->{'author_username'};
                $message = join "\n", @{ $ci->{'comment'} };
@@ -449,9 +449,7 @@ sub rcs_notify () { #{{{
        }
        $subject .= " by $user";
 
-       my $template = HTML::Template->new(
-               filename => "$config{templatedir}/notifymail.tmpl"
-       );
+       my $template = template("notifymail.tmpl");
        $template->param(
                wikiname => $config{wikiname},
                diff     => $diff,