Added a comment

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 892b711d8e871b3a24ade2f5e13287d88f06140c..3117e42914d5f8b8f4f5d49ec3e3f0b5865d1891 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -152,10 +152,11 @@ sub genwrapper {
 }
 
 sub safe_git (&@) {
 }
 
 sub safe_git (&@) {

-       # Start a child process safely without resorting /bin/sh.
-       # Return command output or success state (in scalar context).
+       # Start a child process safely without resorting to /bin/sh.
+       # Returns command output (in list content) or success state
+       # (in scalar context), or runs the specified data handler.

 
 

-       my ($error_handler, @cmdline) = @_;
+       my ($error_handler, $data_handler, @cmdline) = @_;

 
        my $pid = open my $OUT, "-|";
 
 
        my $pid = open my $OUT, "-|";
 


@@ -187,7 +188,12 @@ sub safe_git (&@) {
 
                chomp;
 
 
                chomp;
 

-               push @lines, $_;
+               if (! defined $data_handler) {
+                       push @lines, $_;
+               }
+               else {
+                       last unless $data_handler->($_);
+               }

        }
 
        close $OUT;
        }
 
        close $OUT;


@@ -197,9 +203,9 @@ sub safe_git (&@) {
        return wantarray ? @lines : ($? == 0);
 }
 # Convenient wrappers.
        return wantarray ? @lines : ($? == 0);
 }
 # Convenient wrappers.

-sub run_or_die ($@) { safe_git(\&error, @_) }
-sub run_or_cry ($@) { safe_git(sub { warn @_ },  @_) }
-sub run_or_non ($@) { safe_git(undef,            @_) }
+sub run_or_die ($@) { safe_git(\&error, undef, @_) }
+sub run_or_cry ($@) { safe_git(sub { warn @_ }, undef, @_) }
+sub run_or_non ($@) { safe_git(undef, undef, @_) }

 
 
 sub merge_past ($$$) {
 
 
 sub merge_past ($$$) {


@@ -496,16 +502,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;


@@ -546,10 +552,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});
                }


@@ -661,15 +669,19 @@ sub rcs_recentchanges ($) {
        return @rets;
 }
 
        return @rets;
 }
 

-sub rcs_diff ($) {
+sub rcs_diff ($;$) {

        my $rev=shift;
        my $rev=shift;

+       my $maxlines=shift;

        my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
        my @lines;
        my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
        my @lines;

-       foreach my $line (run_or_non("git", "show", $sha1)) {
-               if (@lines || $line=~/^diff --git/) {
-                       push @lines, $line."\n";
-               }
-       }
+       my $addlines=sub {
+               my $line=shift;
+               return if defined $maxlines && @lines == $maxlines;
+               push @lines, $line."\n"
+                       if (@lines || $line=~/^diff --git/);
+               return 1;
+       };
+       safe_git(undef, $addlines, "git", "show", $sha1);

        if (wantarray) {
                return @lines;
        }
        if (wantarray) {
                return @lines;
        }


@@ -688,7 +700,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;


@@ -750,6 +762,7 @@ sub git_find_root {
 }
 
 sub git_parse_changes {
 }
 
 sub git_parse_changes {

+       my $reverted = shift;

        my @changes = @_;
 
        my ($subdir, $rootdir) = git_find_root();
        my @changes = @_;
 
        my ($subdir, $rootdir) = git_find_root();


@@ -770,11 +783,11 @@ sub git_parse_changes {
                                $mode=$detail->{'mode_to'};
                        }
                        elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
                                $mode=$detail->{'mode_to'};
                        }
                        elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {

-                               $action="add";
+                               $action= $reverted ? "remove" : "add";

                                $mode=$detail->{'mode_to'};
                        }
                        elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
                                $mode=$detail->{'mode_to'};
                        }
                        elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {

-                               $action="remove";
+                               $action= $reverted ? "add" : "remove";

                                $mode=$detail->{'mode_from'};
                        }
                        else {
                                $mode=$detail->{'mode_from'};
                        }
                        else {


@@ -797,7 +810,7 @@ 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);
+                               ($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1);

                                my $cmd = "cd $git_dir && ".
                                          "git show $detail->{sha1_to} > '$path'";
                                if (system($cmd) != 0) {
                                my $cmd = "cd $git_dir && ".
                                          "git show $detail->{sha1_to} > '$path'";
                                if (system($cmd) != 0) {


@@ -833,7 +846,7 @@ sub rcs_receive () {
                # it and only see changes in it.)
                # The pre-receive hook already puts us in the right place.
                $git_dir=".";
                # it and only see changes in it.)
                # The pre-receive hook already puts us in the right place.
                $git_dir=".";

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

                $git_dir=undef;
        }
 
                $git_dir=undef;
        }
 


@@ -848,8 +861,22 @@ sub rcs_preprevert ($) {
        # in order to see all changes.
        my ($subdir, $rootdir) = git_find_root();
        $git_dir=$rootdir;
        # in order to see all changes.
        my ($subdir, $rootdir) = git_find_root();
        $git_dir=$rootdir;

-       return git_parse_changes(git_commit_info($sha1, 1));
+
+       my @commits=git_commit_info($sha1, 1);
+       if (! @commits) {
+               error "unknown commit"; # just in case
+       }
+
+       # 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");
+       }
+
+       my @ret=git_parse_changes(1, @commits);
+

        $git_dir=undef;
        $git_dir=undef;

+       return @ret;

 }
 
 sub rcs_revert ($) {
 }
 
 sub rcs_revert ($) {