* In the aggregator, check for and deal with post filenames that are

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 46adf16579bc02f7945159c9142f8f31ebd41010..ad829221c7db30304ea5511b5c558ea26128c7a8 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -153,14 +153,15 @@ sub _parse_diff_tree (@) { #{{{
        my ($dt_ref) = @_;
 
        # End of stream?
-       return if !defined @{ $dt_ref } || !length @{ $dt_ref }[0];
+       return if !defined @{ $dt_ref } ||
+                 !defined @{ $dt_ref }[0] || !length @{ $dt_ref }[0];
 
        my %ci;
        # Header line.
        HEADER: while (my $line = shift @{ $dt_ref }) {
                return if $line !~ m/^(.+) ($sha1_pattern)/;
 
-               my $sha1 = $1;
+               my $sha1 = $2;
                $ci{'sha1'} = $sha1;
                last HEADER;
        }
@@ -170,10 +171,12 @@ sub _parse_diff_tree (@) { #{{{
                # Regexps are semi-stolen from gitweb.cgi.
                if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                        $ci{'tree'} = $1;
-               } elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
+               }
+               elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
                        # XXX: collecting in reverse order
                        push @{ $ci{'parents'} }, $1;
-               } elsif ($line =~ m/^(author|committer) (.*) ([0-9]+) (.*)$/) {
+               }
+               elsif ($line =~ m/^(author|committer) (.*) ([0-9]+) (.*)$/) {
                        my ($who, $name, $epoch, $tz) =
                           ($1,   $2,    $3,     $4 );
 
@@ -185,20 +188,22 @@ sub _parse_diff_tree (@) { #{{{
                                my ($fullname, $username) = ($1, $2);
                                $ci{"${who}_fullname"}    = $fullname;
                                $ci{"${who}_username"}    = $username;
-                       } else {
+                       }
+                       else {
                                $ci{"${who}_fullname"} =
                                        $ci{"${who}_username"} = $name;
                        }
-               } elsif ($line =~ m/^$/) {
+               }
+               elsif ($line =~ m/^$/) {
                        # Trailing empty line signals next section.
                        last IDENT;
                }
        }
 
-       error("No 'tree' or 'parents' seen in diff-tree output")
+       debug("No 'tree' or 'parents' seen in diff-tree output")
            if !defined $ci{'tree'} || !defined $ci{'parents'};
 
-       $ci{'parent'} = @{ $ci{'parents'} }[0];
+       $ci{'parent'} = @{ $ci{'parents'} }[0] if defined $ci{'parents'};
 
        # Commit message.
        COMMENT: while (my $line = shift @{ $dt_ref }) {
@@ -239,14 +244,14 @@ sub _parse_diff_tree (@) { #{{{
                last FILE;
        }
 
-       warn "No detail in diff-tree output" if !defined $ci{'details'};
+       debug("No detail in diff-tree output") if !defined $ci{'details'};
 
        return \%ci;
 } #}}}
 
-sub git_commit_info (;$$) { #{{{
+sub git_commit_info ($;$) { #{{{
        # Return an array of commit info hashes of num commits (default: 1)
-       # starting from the given sha1sum (default: HEAD).
+       # starting from the given sha1sum.
 
        my ($sha1, $num) = @_;
 
@@ -254,7 +259,7 @@ sub git_commit_info (;$$) { #{{{
 
        my @raw_lines =
            run_or_die(qq{git-rev-list --max-count=$num $sha1 |
-                         git-diff-tree --stdin --pretty=raw -M -r});
+                         git-diff-tree --stdin --pretty=raw --always -M -m -r});
 
        my @ci;
        while (my $parsed = _parse_diff_tree(\@raw_lines)) {
@@ -294,12 +299,21 @@ sub rcs_prepedit ($) { #{{{
        return git_sha1($file);
 } #}}}
 
-sub rcs_commit ($$$) { #{{{
+sub rcs_commit ($$$;$$) { #{{{
        # Try to commit the page; returns undef on _success_ and
        # a version of the page with the rcs's conflict markers on
        # failure.
 
-       my ($file, $message, $rcstoken) = @_;
+       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
@@ -345,17 +359,19 @@ sub rcs_recentchanges ($) { #{{{
        eval q{use Date::Parse};
        error($@) if $@;
 
-       my ($sha1, $type, $when, $diffurl, $user, @pages, @message, @rets);
+       my @rets;
        INFO: foreach my $ci (git_commit_info('HEAD', $num)) {
                my $title = @{ $ci->{'comment'} }[0];
 
                # Skip redundant commits.
                next INFO if ($title eq $dummy_commit_msg);
 
-               $sha1 = $ci->{'sha1'};
-               $type = "web";
-               $when = time - $ci->{'author_epoch'};
+               my ($sha1, $when) = (
+                       $ci->{'sha1'},
+                       time - $ci->{'author_epoch'}
+               );
 
+               my (@pages, @messages);
                DETAIL: foreach my $detail (@{ $ci->{'details'} }) {
                        my $diffurl = $config{'diffurl'};
                        my $file    = $detail->{'file'};
@@ -370,14 +386,16 @@ sub rcs_recentchanges ($) { #{{{
                                diffurl => $diffurl,
                        };
                }
+               push @messages, { line => $title };
 
-               push @message, { line => $title };
+               my ($user, $type) = (q{}, "web");
 
-               if (defined $message[0] &&
-                   $message[0]->{line} =~ m/$config{web_commit_regexp}/) {
-                       $user=defined $2 ? "$2" : "$3";
-                       $message[0]->{line}=$4;
-               } else {
+               if (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'};
                }
@@ -387,12 +405,11 @@ sub rcs_recentchanges ($) { #{{{
                        user       => $user,
                        committype => $type,
                        when       => $when,
-                       message    => [@message],
+                       message    => [@messages],
                        pages      => [@pages],
-               } if @pages;
+               };
 
-               $sha1 = $type = $when = $diffurl = $user = undef;
-               @pages = @message = ();
+               last INFO if @rets >= $num;
        }
 
        return @rets;
@@ -426,7 +443,8 @@ sub rcs_notify () { #{{{
        if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
                $user    = defined $2 ? "$2" : "$3";
                $message = $4;
-       } else {
+       }
+       else {
                $user    = $ci->{'author_username'};
                $message = join "\n", @{ $ci->{'comment'} };
        }
@@ -438,7 +456,8 @@ sub rcs_notify () { #{{{
                },
                sub {
                        join "\n", run_or_die('git-diff', "${sha1}^", $sha1);
-               }, $user, @changed_pages);
+               }, $user, @changed_pages
+       );
 } #}}}
 
 sub rcs_getctime ($) { #{{{