Merge commit '156f70912213b6520e9056050a8827de66e80176' into sipb

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 52b2bbd506b39baced0a4144405da4e335792dc4..7896625dffdb8086ce8fa1f6270548fdf435e236 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -4,6 +4,7 @@ package IkiWiki::Plugin::git;
 use warnings;
 use strict;
 use IkiWiki;
+use IkiWiki::UserInfo;
 use Encode;
 use open qw{:utf8 :std};
 
@@ -527,7 +528,8 @@ sub rcs_commit_helper (@) {
                }
                if (defined $u) {
                        $u=encode_utf8($u);
-                       $ENV{GIT_AUTHOR_NAME}=$u;
+                       # MITLOGIN This algorithm could be improved
+                       $ENV{GIT_AUTHOR_NAME}=IkiWiki::userinfo_get($u, "realname");
                }
                if (defined $params{session}->param("nickname")) {
                        $u=encode_utf8($params{session}->param("nickname"));
@@ -535,7 +537,7 @@ sub rcs_commit_helper (@) {
                        $u=~s/[^-_0-9[:alnum:]]+//g;
                }
                if (defined $u) {
-                       $ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+                       $ENV{GIT_AUTHOR_EMAIL}="$u\@mit.edu";
                }
        }
 
@@ -679,6 +681,7 @@ sub rcs_diff ($;$) {
                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) {
@@ -761,6 +764,7 @@ sub git_find_root {
 }
 
 sub git_parse_changes {
+       my $reverted = shift;
        my @changes = @_;
 
        my ($subdir, $rootdir) = git_find_root();
@@ -781,11 +785,11 @@ sub git_parse_changes {
                                $mode=$detail->{'mode_to'};
                        }
                        elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
-                               $action="add";
+                               $action= $reverted ? "remove" : "add";
                                $mode=$detail->{'mode_to'};
                        }
                        elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
-                               $action="remove";
+                               $action= $reverted ? "add" : "remove";
                                $mode=$detail->{'mode_from'};
                        }
                        else {
@@ -844,7 +848,7 @@ sub rcs_receive () {
                # 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;
        }
 
@@ -859,9 +863,8 @@ sub rcs_preprevert ($) {
        # 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;
 
+       my @commits=git_commit_info($sha1, 1);
        if (! @commits) {
                error "unknown commit"; # just in case
        }
@@ -872,7 +875,10 @@ sub rcs_preprevert ($) {
                error gettext("you are not allowed to revert a merge");
        }
 
-       return git_parse_changes(@commits);
+       my @ret=git_parse_changes(1, @commits);
+
+       $git_dir=undef;
+       return @ret;
 }
 
 sub rcs_revert ($) {