fix

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 3fedd64f189fd6c4b20a617a14b41076744fcbe5..a156f0b4e9d0e2796bc3602746c3acc194187e73 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -1,12 +1,10 @@
 #!/usr/bin/perl
-# Git backend for IkiWiki.
-# Copyright 2006  Recai Oktaş <roktas@debian.org>
-#
-# Licensed under the same terms as IkiWiki.
 
 use warnings;
 use strict;
 use IkiWiki;
+use Encode;
+use open qw{:utf8 :std};
 
 package IkiWiki;
 
@@ -14,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.
@@ -161,7 +159,7 @@ sub _parse_diff_tree (@) { #{{{
        my %ci;
        # Header line.
        HEADER: while (my $line = shift @{ $dt_ref }) {
-               return if $line !~ m/^diff-tree ($sha1_pattern)/;
+               return if $line !~ m/^(.+) ($sha1_pattern)/;
 
                my $sha1 = $1;
                $ci{'sha1'} = $sha1;
@@ -232,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,
                                };
@@ -264,6 +262,8 @@ sub git_commit_info (;$$) { #{{{
                push @ci, $parsed;
        }
 
+       warn "Cannot parse commit info for '$sha1' commit" if !@ci;
+
        return wantarray ? @ci : $ci[0];
 } #}}}
 
@@ -345,7 +345,6 @@ sub rcs_recentchanges ($) { #{{{
 
        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)) {
@@ -356,7 +355,7 @@ 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'} }) {
                        my $diffurl = $config{'diffurl'};
@@ -368,7 +367,7 @@ sub rcs_recentchanges ($) { #{{{
                        $diffurl =~ s/\[\[sha1_to\]\]/$bit->{'sha1_to'}/go;
 
                        push @pages, {
-                               link => htmllink("", "", pagename($file), 1),
+                               page => pagename($file),
                                diffurl => $diffurl,
                        },
                }
@@ -377,8 +376,8 @@ sub rcs_recentchanges ($) { #{{{
 
                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'};
@@ -386,7 +385,7 @@ sub rcs_recentchanges ($) { #{{{
 
                push @rets, {
                        rev        => $sha1,
-                       user       => htmllink("", "", $user, 1),
+                       user       => $user,
                        committype => $type,
                        when       => $when,
                        message    => [@message],
@@ -420,17 +419,14 @@ sub rcs_notify () { #{{{
        my $sha1 = 'HEAD'; # the commit which triggers this action
 
        my $ci = git_commit_info($sha1);
-       if (!defined $ci) {
-               warn "Cannot parse info for '$sha1' commit";
-               return;
-       }
+       return if !defined $ci;
 
        my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
 
        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'} };
@@ -454,9 +450,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,