add news item for ikiwiki 3.20101129

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 996ab6fba0f5e6076c3a793d4ec06ef57ec93b6f..3db4af7291b0d11dcdf8bc89386b93133c963e10 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -9,7 +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 $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;
+my $git_dir=undef;

 
 sub import {
        hook(type => "checkconfig", id => "git", call => \&checkconfig);
 
 sub import {
        hook(type => "checkconfig", id => "git", call => \&checkconfig);


@@ -164,9 +164,13 @@ sub safe_git (&@) {
        if (!$pid) {
                # In child.
                # Git commands want to be in wc.
        if (!$pid) {
                # In child.
                # Git commands want to be in wc.

-               if (! $no_chdir) {
+               if (! defined $git_dir) {

                        chdir $config{srcdir}
                        chdir $config{srcdir}

-                           or error("Cannot chdir to $config{srcdir}: $!");
+                           or error("cannot chdir to $config{srcdir}: $!");
+               }
+               else {
+                       chdir $git_dir
+                           or error("cannot chdir to $git_dir: $!");

                }
                exec @cmdline or error("Cannot exec '@cmdline': $!");
        }
                }
                exec @cmdline or error("Cannot exec '@cmdline': $!");
        }


@@ -492,16 +496,16 @@ sub rcs_commit (@) {
                return $conflict if defined $conflict;
        }
 
                return $conflict if defined $conflict;
        }
 

-       rcs_add($params{file});
-       return rcs_commit_staged(
-               message => $params{message},
-               session => $params{session},
-       );
+       return rcs_commit_helper(@_);

 }
 
 sub rcs_commit_staged (@) {
        # Commits all staged changes. Changes can be staged using rcs_add,
        # rcs_remove, and rcs_rename.
 }
 
 sub rcs_commit_staged (@) {
        # Commits all staged changes. Changes can be staged using rcs_add,
        # rcs_remove, and rcs_rename.

+       return rcs_commit_helper(@_);
+}
+
+sub rcs_commit_helper (@) {

        my %params=@_;
        
        my %env=%ENV;
        my %params=@_;
        
        my %env=%ENV;


@@ -542,10 +546,12 @@ sub rcs_commit_staged (@) {
                        $params{message}.=".";
                }
        }
                        $params{message}.=".";
                }
        }

-       push @opts, '-q';
-       # git commit returns non-zero if file has not been really changed.
-       # so we should ignore its exit status (hence run_or_non).
-       if (run_or_non('git', 'commit', @opts, '-m', $params{message})) {
+       if (exists $params{file}) {
+               push @opts, '--', $params{file};
+       }
+       # git commit returns non-zero if nothing really changed.
+       # So we should ignore its exit status (hence run_or_non).
+       if (run_or_non('git', 'commit', '-m', $params{message}, '-q', @opts)) {

                if (length $config{gitorigin_branch}) {
                        run_or_cry('git', 'push', $config{gitorigin_branch});
                }
                if (length $config{gitorigin_branch}) {
                        run_or_cry('git', 'push', $config{gitorigin_branch});
                }


@@ -684,7 +690,7 @@ sub findtimes ($$) {
        if (! keys %time_cache) {
                my $date;
                foreach my $line (run_or_die('git', 'log',
        if (! keys %time_cache) {
                my $date;
                foreach my $line (run_or_die('git', 'log',

-                               '--pretty=format:%ct',
+                               '--pretty=format:%at',

                                '--name-only', '--relative')) {
                        if (! defined $date && $line =~ /^(\d+)$/) {
                                $date=$line;
                                '--name-only', '--relative')) {
                        if (! defined $date && $line =~ /^(\d+)$/) {
                                $date=$line;


@@ -721,14 +727,13 @@ sub rcs_getmtime ($) {
 }
 
 {
 }
 
 {

-my $git_root;
-
+my $ret;

 sub git_find_root {
        # The wiki may not be the only thing in the git repo.
        # Determine if it is in a subdirectory by examining the srcdir,
        # and its parents, looking for the .git directory.
 
 sub git_find_root {
        # The wiki may not be the only thing in the git repo.
        # Determine if it is in a subdirectory by examining the srcdir,
        # and its parents, looking for the .git directory.
 

-       return $git_root if defined $git_root;
+       return @$ret if defined $ret;

        
        my $subdir="";
        my $dir=$config{srcdir};
        
        my $subdir="";
        my $dir=$config{srcdir};


@@ -740,7 +745,8 @@ sub git_find_root {
                }
        }
 
                }
        }
 

-       return $git_root=$subdir;
+       $ret=[$subdir, $dir];
+       return @$ret;

 }
 
 }
 }
 
 }


@@ -748,7 +754,7 @@ sub git_find_root {
 sub git_parse_changes {
        my @changes = @_;
 
 sub git_parse_changes {
        my @changes = @_;
 

-       my $subdir = git_find_root();
+       my ($subdir, $rootdir) = git_find_root();

        my @rets;
        foreach my $ci (@changes) {
                foreach my $detail (@{ $ci->{'details'} }) {
        my @rets;
        foreach my $ci (@changes) {
                foreach my $detail (@{ $ci->{'details'} }) {


@@ -793,11 +799,9 @@ sub git_parse_changes {
                                eval q{use File::Temp};
                                die $@ if $@;
                                my $fh;
                                eval q{use File::Temp};
                                die $@ if $@;
                                my $fh;

-                               ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
-                               # Ensure we run this in the right place,
-                               # see comments in rcs_receive.
-                               my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ")
-                                       . "git show $detail->{sha1_to} > '$path'";
+                               ($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1);
+                               my $cmd = "cd $git_dir && ".
+                                         "git show $detail->{sha1_to} > '$path'";

                                if (system($cmd) != 0) {
                                        error("failed writing temp file '$path'.");
                                }
                                if (system($cmd) != 0) {
                                        error("failed writing temp file '$path'.");
                                }


@@ -827,35 +831,52 @@ sub rcs_receive () {
 
                # Avoid chdir when running git here, because the changes
                # are in the master git repo, not the srcdir repo.
 
                # Avoid chdir when running git here, because the changes
                # are in the master git repo, not the srcdir repo.

+               # (Also, if a subdir is involved, we don't want to chdir to
+               # it and only see changes in it.)

                # The pre-receive hook already puts us in the right place.
                # The pre-receive hook already puts us in the right place.

-               $no_chdir=1;
+               $git_dir=".";

                push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev));
                push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev));

-               $no_chdir=0;
+               $git_dir=undef;

        }
 
        return reverse @rets;
 }
 
        }
 
        return reverse @rets;
 }
 

-sub rcs_preprevert (@) {
-       my %params = @_;
-       my $rev = $params{rev};
+sub rcs_preprevert ($) {
+       my $rev=shift;
+       my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
+
+       # Examine changes from root of git repo, not from any subdir,
+       # in order to see all changes.
+       my ($subdir, $rootdir) = git_find_root();
+       $git_dir=$rootdir;
+       my @commits=git_commit_info($sha1, 1);
+       $git_dir=undef;
+
+       if (! @commits) {
+               error "unknown commit"; # just in case
+       }

 
 

-       # Note test_changes expects 'cgi' and 'session' parameters.
-       require IkiWiki::Receive;
-       IkiWiki::Receive::test_changes(%params, changes =>
-               [git_parse_changes(git_commit_info($rev, 1))]);
+       # git revert will fail on merge commits. Add a nice message.
+       if (exists $commits[0]->{parents} &&
+           @{$commits[0]->{parents}} > 1) {
+               error gettext("you are not allowed to revert a merge");
+       }
+
+       return git_parse_changes(@commits);

 }
 
 sub rcs_revert ($) {
        # Try to revert the given rev; returns undef on _success_.
 }
 
 sub rcs_revert ($) {
        # Try to revert the given rev; returns undef on _success_.

-       my $rev = $shift;
+       my $rev = shift;
+       my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint

 
 

-       if (run_or_non('git', 'revert', '--no-commit', $rev)) {
+       if (run_or_non('git', 'revert', '--no-commit', $sha1)) {

                return undef;
        }
        else {
                run_or_die('git', 'reset', '--hard');
                return undef;
        }
        else {
                run_or_die('git', 'reset', '--hard');

-               return sprintf(gettext("Failed to revert commit %s"), $rev);
+               return sprintf(gettext("Failed to revert commit %s"), $sha1);

        }
 }
 
        }
 }