po: reorder nearly all of the module code

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 234e7af2e0fbb847704ab0388f84671d4c619d51..1a39d87e5533bccb48e25d4382c72af43901e50d 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -9,6 +9,7 @@ use open qw{:utf8 :std};
 
 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 $no_chdir=0;
 
 sub import { #{{{
        hook(type => "checkconfig", id => "git", call => \&checkconfig);
@@ -45,7 +46,7 @@ sub checkconfig () { #{{{
                push @{$config{wrappers}}, {
                        test_receive => 1,
                        wrapper => $config{git_test_receive_wrapper},
-                       wrappermode => "0755",
+                       wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
                };
        }
 } #}}}
@@ -94,7 +95,7 @@ sub getsetup () { #{{{
                diffurl => {
                        type => "string",
                        example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-                       description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)",
+                       description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], [[sha1_commit]] and [[file]] substituted)",
                        safe => 1,
                        rebuild => 1,
                },
@@ -127,8 +128,10 @@ sub safe_git (&@) { #{{{
        if (!$pid) {
                # In child.
                # Git commands want to be in wc.
-               chdir $config{srcdir}
-                   or error("Cannot chdir to $config{srcdir}: $!");
+               if (! $no_chdir) {
+                       chdir $config{srcdir}
+                           or error("Cannot chdir to $config{srcdir}: $!");
+               }
                exec @cmdline or error("Cannot exec '@cmdline': $!");
        }
        # In parent.
@@ -362,8 +365,10 @@ sub git_commit_info ($;$) { #{{{
        # starting from the given sha1sum.
        my ($sha1, $num) = @_;
 
-       my @raw_lines = run_or_die('git', 'log',
-               (defined $num ? "--max-count=$num" : ""), 
+       my @opts;
+       push @opts, "--max-count=$num" if defined $num;
+
+       my @raw_lines = run_or_die('git', 'log', @opts,
                '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
                '-r', $sha1, '--', '.');
        my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
@@ -516,6 +521,7 @@ sub rcs_recentchanges ($) { #{{{
                        $diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
                        $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
                        $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
+                       $diffurl =~ s/\[\[sha1_commit\]\]/$sha1/go;
 
                        push @pages, {
                                page => pagename($file),
@@ -606,13 +612,20 @@ sub rcs_receive () { #{{{
        while (<>) {
                chomp;
                my ($oldrev, $newrev, $refname) = split(' ', $_, 3);
-
+               
                # only allow changes to gitmaster_branch
                if ($refname !~ /^refs\/heads\/\Q$config{gitmaster_branch}\E$/) {
                        error sprintf(gettext("you are not allowed to change %s"), $refname);
                }
-
-               foreach my $ci (git_commit_info($oldrev."..".$newrev)) {
+               
+               # Avoid chdir when running git here, because the changes
+               # are in the master git repo, not the srcdir repo.
+               # The pre-recieve hook already puts us in the right place.
+               $no_chdir=1;
+               my @changes=git_commit_info($oldrev."..".$newrev);
+               $no_chdir=0;
+
+               foreach my $ci (@changes) {
                        foreach my $detail (@{ $ci->{'details'} }) {
                                my $file = $detail->{'file'};
 
@@ -623,8 +636,7 @@ sub rcs_receive () { #{{{
                                        error sprintf(gettext("you are not allowed to change %s"), $file);
                                }
 
-                               my $action;
-                               my $mode;                       
+                               my ($action, $mode, $path);
                                if ($detail->{'status'} =~ /^[M]+\d*$/) {
                                        $action="change";
                                        $mode=$detail->{'mode_to'};
@@ -650,16 +662,29 @@ sub rcs_receive () { #{{{
                                                error gettext("you are not allowed to change file modes");
                                        }
                                }
+                               
+                               # extract attachment to temp file
+                               if (($action eq 'add' || $action eq 'change') &&
+                                    ! pagetype($file)) {
+                                       eval q{use File::Temp};
+                                       die $@ if $@;
+                                       my $fh;
+                                       ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
+                                       if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
+                                               error("failed writing temp file");
+                                       }
+                               }
 
                                push @rets, {
                                        file => $file,
                                        action => $action,
+                                       path => $path,
                                };
                        }
                }
        }
 
-       return @rets;
+       return reverse @rets;
 } #}}}
 
 1