web commit by JoshTriplett: poll vote (It's fast enough)

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 46adf16579bc02f7945159c9142f8f31ebd41010..7f33148e396751852488b92264245219b208f59b 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -8,8 +8,6 @@ use open qw{:utf8 :std};
 
 package IkiWiki;
 
 
 package IkiWiki;
 

-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 $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
 


@@ -112,8 +110,8 @@ sub _merge_past ($$$) { #{{{
 
                # Switch to throw-away branch for the merge operation.
                push @undo, sub {
 
                # Switch to throw-away branch for the merge operation.
                push @undo, sub {

-                       if (!run_or_cry('git-checkout', $master_branch)) {
-                               run_or_cry('git-checkout','-f',$master_branch);
+                       if (!run_or_cry('git-checkout', $config{gitmaster_branch})) {
+                               run_or_cry('git-checkout','-f',$config{gitmaster_branch});

                        }
                };
                run_or_die('git-checkout', $branch);
                        }
                };
                run_or_die('git-checkout', $branch);


@@ -125,7 +123,7 @@ sub _merge_past ($$$) { #{{{
                # _Silently_ commit all modifications in the current branch.
                run_or_non('git-commit', '-m', $message, '-a');
                # ... and re-switch to master.
                # _Silently_ commit all modifications in the current branch.
                run_or_non('git-commit', '-m', $message, '-a');
                # ... and re-switch to master.

-               run_or_die('git-checkout', $master_branch);
+               run_or_die('git-checkout', $config{gitmaster_branch});

 
                # Attempt to merge without complaining.
                if (!run_or_non('git-pull', '--no-commit', '.', $branch)) {
 
                # Attempt to merge without complaining.
                if (!run_or_non('git-pull', '--no-commit', '.', $branch)) {


@@ -153,14 +151,15 @@ sub _parse_diff_tree (@) { #{{{
        my ($dt_ref) = @_;
 
        # End of stream?
        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 %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;
        }
                $ci{'sha1'} = $sha1;
                last HEADER;
        }


@@ -170,10 +169,12 @@ sub _parse_diff_tree (@) { #{{{
                # Regexps are semi-stolen from gitweb.cgi.
                if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                        $ci{'tree'} = $1;
                # 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;
                        # 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 );
 
                        my ($who, $name, $epoch, $tz) =
                           ($1,   $2,    $3,     $4 );
 


@@ -185,20 +186,22 @@ sub _parse_diff_tree (@) { #{{{
                                my ($fullname, $username) = ($1, $2);
                                $ci{"${who}_fullname"}    = $fullname;
                                $ci{"${who}_username"}    = $username;
                                my ($fullname, $username) = ($1, $2);
                                $ci{"${who}_fullname"}    = $fullname;
                                $ci{"${who}_username"}    = $username;

-                       } else {
+                       }
+                       else {

                                $ci{"${who}_fullname"} =
                                        $ci{"${who}_username"} = $name;
                        }
                                $ci{"${who}_fullname"} =
                                        $ci{"${who}_username"} = $name;
                        }

-               } elsif ($line =~ m/^$/) {
+               }
+               elsif ($line =~ m/^$/) {

                        # Trailing empty line signals next section.
                        last IDENT;
                }
        }
 
                        # 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'};
 
            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 }) {
 
        # Commit message.
        COMMENT: while (my $line = shift @{ $dt_ref }) {


@@ -239,14 +242,14 @@ sub _parse_diff_tree (@) { #{{{
                last FILE;
        }
 
                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;
 } #}}}
 
 
        return \%ci;
 } #}}}
 

-sub git_commit_info (;$$) { #{{{
+sub git_commit_info ($;$) { #{{{

        # Return an array of commit info hashes of num commits (default: 1)
        # 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) = @_;
 
 
        my ($sha1, $num) = @_;
 


@@ -254,7 +257,7 @@ sub git_commit_info (;$$) { #{{{
 
        my @raw_lines =
            run_or_die(qq{git-rev-list --max-count=$num $sha1 |
 
        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)) {
 
        my @ci;
        while (my $parsed = _parse_diff_tree(\@raw_lines)) {


@@ -282,7 +285,7 @@ sub git_sha1 (;$) { #{{{
 sub rcs_update () { #{{{
        # Update working directory.
 
 sub rcs_update () { #{{{
        # Update working directory.
 

-       run_or_cry('git-pull', $origin_branch);
+       run_or_cry('git-pull', $config{gitorigin_branch});

 } #}}}
 
 sub rcs_prepedit ($) { #{{{
 } #}}}
 
 sub rcs_prepedit ($) { #{{{


@@ -294,12 +297,21 @@ sub rcs_prepedit ($) { #{{{
        return git_sha1($file);
 } #}}}
 
        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.
 
        # 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
 
        # XXX: Wiki directory is in the unlocked state when starting this
        # action.  But it takes time for a Git process to finish its job


@@ -323,7 +335,7 @@ sub rcs_commit ($$$) { #{{{
        $message = possibly_foolish_untaint($message);
        if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
                unlockwiki();
        $message = possibly_foolish_untaint($message);
        if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
                unlockwiki();

-               run_or_cry('git-push', $origin_branch);
+               run_or_cry('git-push', $config{gitorigin_branch});

        }
 
        return undef; # success
        }
 
        return undef; # success


@@ -345,17 +357,19 @@ sub rcs_recentchanges ($) { #{{{
        eval q{use Date::Parse};
        error($@) if $@;
 
        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);
 
        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'};
                DETAIL: foreach my $detail (@{ $ci->{'details'} }) {
                        my $diffurl = $config{'diffurl'};
                        my $file    = $detail->{'file'};


@@ -370,14 +384,16 @@ sub rcs_recentchanges ($) { #{{{
                                diffurl => $diffurl,
                        };
                }
                                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'};
                }
                        $type ="git";
                        $user = $ci->{'author_username'};
                }


@@ -387,12 +403,11 @@ sub rcs_recentchanges ($) { #{{{
                        user       => $user,
                        committype => $type,
                        when       => $when,
                        user       => $user,
                        committype => $type,
                        when       => $when,

-                       message    => [@message],
+                       message    => [@messages],

                        pages      => [@pages],
                        pages      => [@pages],

-               } if @pages;
+               };

 
 

-               $sha1 = $type = $when = $diffurl = $user = undef;
-               @pages = @message = ();
+               last INFO if @rets >= $num;

        }
 
        return @rets;
        }
 
        return @rets;


@@ -426,7 +441,8 @@ sub rcs_notify () { #{{{
        if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
                $user    = defined $2 ? "$2" : "$3";
                $message = $4;
        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'} };
        }
                $user    = $ci->{'author_username'};
                $message = join "\n", @{ $ci->{'comment'} };
        }


@@ -438,7 +454,8 @@ sub rcs_notify () { #{{{
                },
                sub {
                        join "\n", run_or_die('git-diff', "${sha1}^", $sha1);
                },
                sub {
                        join "\n", run_or_die('git-diff', "${sha1}^", $sha1);

-               }, $user, @changed_pages);
+               }, $user, @changed_pages
+       );

 } #}}}
 
 sub rcs_getctime ($) { #{{{
 } #}}}
 
 sub rcs_getctime ($) { #{{{