Add test for old versions of git that don't support --cleanup=verbatim, and munge...

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 26f2a39f266b88e477f75545533b2b4d5dfc524a..1fa9188aa3c29fbfa35065382bb0c92ef5eb25b8 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -318,18 +318,41 @@ sub rcs_commit ($$$;$$) { #{{{
                my $conflict = _merge_past($prev, $file, $dummy_commit_msg);
                return $conflict if defined $conflict;
        }
                my $conflict = _merge_past($prev, $file, $dummy_commit_msg);
                return $conflict if defined $conflict;
        }

-       
-       # Set the commit author to the web committer.
+
+       rcs_add($file); 
+       return rcs_commit_staged($message, $user, $ipaddr);
+} #}}}
+
+sub rcs_commit_staged ($$$) {
+       # Commits all staged changes. Changes can be staged using rcs_add,
+       # rcs_remove, and rcs_rename.
+       my ($message, $user, $ipaddr)=@_;
+
+       # Set the commit author and email to the web committer.

        my %env=%ENV;
        if (defined $user || defined $ipaddr) {
        my %env=%ENV;
        if (defined $user || defined $ipaddr) {

-               $ENV{GIT_AUTHOR_NAME}=(defined $user ? $user : $ipaddr)." (web)";
-               $ENV{GIT_AUTHOR_EMAIL}="";
+               my $u=defined $user ? $user : $ipaddr;
+               $ENV{GIT_AUTHOR_NAME}=$u;
+               $ENV{GIT_AUTHOR_EMAIL}="$u\@web";

        }
 
        }
 

+       $message = possibly_foolish_untaint($message);
+       my @opts;
+       if ($message !~ /\S/) {
+               # Force git to allow empty commit messages.
+               # (If this version of git supports it.)
+               my ($version)=`git --version` =~ /git version (.*)/;
+               if ($version ge "1.5.4") {
+                       push @opts, '--cleanup=verbatim';
+               }
+               else {
+                       $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).
        # git commit returns non-zero if file has not been really changed.
        # so we should ignore its exit status (hence run_or_non).

-       $message = possibly_foolish_untaint($message);
-       if (run_or_non('git', 'commit', '--cleanup=verbatim', '-q', '-m', $message, '-i', $file)) {
+       if (run_or_non('git', 'commit', @opts, '-m', $message)) {

                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});
                }


@@ -337,7 +360,7 @@ sub rcs_commit ($$$;$$) { #{{{
        
        %ENV=%env;
        return undef; # success
        
        %ENV=%env;
        return undef; # success

-} #}}}
+}

 
 sub rcs_add ($) { # {{{
        # Add file to archive.
 
 sub rcs_add ($) { # {{{
        # Add file to archive.


@@ -347,6 +370,20 @@ sub rcs_add ($) { # {{{
        run_or_cry('git', 'add', $file);
 } #}}}
 
        run_or_cry('git', 'add', $file);
 } #}}}
 

+sub rcs_remove ($) { # {{{
+       # Remove file from archive.
+
+       my ($file) = @_;
+
+       run_or_cry('git', 'rm', '-f', $file);
+} #}}}
+
+sub rcs_rename ($$) { # {{{
+       my ($src, $dest) = @_;
+
+       run_or_cry('git', 'mv', '-f', $src, $dest);
+} #}}}
+

 sub rcs_recentchanges ($) { #{{{
        # List of recent changes.
 
 sub rcs_recentchanges ($) { #{{{
        # List of recent changes.
 


@@ -390,7 +427,7 @@ sub rcs_recentchanges ($) { #{{{
                }
 
                my $user=$ci->{'author_username'};
                }
 
                my $user=$ci->{'author_username'};

-               my $web_commit = ($user=~s/\s+\(web\)$//);
+               my $web_commit = ($ci->{'author'} =~ /\@web>/);

                
                # compatability code for old web commit messages
                if (! $web_commit &&
                
                # compatability code for old web commit messages
                if (! $web_commit &&


@@ -398,6 +435,7 @@ sub rcs_recentchanges ($) { #{{{
                      $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
                        $user = defined $2 ? "$2" : "$3";
                        $messages[0]->{line} = $4;
                      $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
                        $user = defined $2 ? "$2" : "$3";
                        $messages[0]->{line} = $4;

+                       $web_commit=1;

                }
 
                push @rets, {
                }
 
                push @rets, {