cutpaste: Fix bug that occured in some cases involving inlines when text was pasted...

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index bb3f89a82878c19766587a94e14a01b4092633c6..fd57ce1e466de034e457a365a13f8960d04957f3 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -41,11 +41,14 @@ sub checkconfig () {
                push @{$config{wrappers}}, {
                        wrapper => $config{git_wrapper},
                        wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
                push @{$config{wrappers}}, {
                        wrapper => $config{git_wrapper},
                        wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),

+                       wrapper_background_command => $config{git_wrapper_background_command},

                };
        }
 
        if (defined $config{git_test_receive_wrapper} &&
                };
        }
 
        if (defined $config{git_test_receive_wrapper} &&

-           length $config{git_test_receive_wrapper}) {
+           length $config{git_test_receive_wrapper} &&
+           defined $config{untrusted_committers} &&
+           @{$config{untrusted_committers}}) {

                push @{$config{wrappers}}, {
                        test_receive => 1,
                        wrapper => $config{git_test_receive_wrapper},
                push @{$config{wrappers}}, {
                        test_receive => 1,
                        wrapper => $config{git_test_receive_wrapper},


@@ -78,6 +81,13 @@ sub getsetup () {
                        safe => 0, # file
                        rebuild => 0,
                },
                        safe => 0, # file
                        rebuild => 0,
                },

+               git_wrapper_background_command => {
+                       type => "string",
+                       example => "git push github",
+                       description => "shell command for git_wrapper to run, in the background",
+                       safe => 0, # command
+                       rebuild => 0,
+               },

                git_wrappermode => {
                        type => "string",
                        example => '06755',
                git_wrappermode => {
                        type => "string",
                        example => '06755',


@@ -101,7 +111,7 @@ sub getsetup () {
                },
                historyurl => {
                        type => "string",
                },
                historyurl => {
                        type => "string",

-                       example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
+                       example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=HEAD",

                        description => "gitweb url to show file history ([[file]] substituted)",
                        safe => 1,
                        rebuild => 1,
                        description => "gitweb url to show file history ([[file]] substituted)",
                        safe => 1,
                        rebuild => 1,


@@ -294,7 +304,7 @@ sub decode_git_file ($) {
 
        # strip prefix if in a subdir
        if (! defined $prefix) {
 
        # strip prefix if in a subdir
        if (! defined $prefix) {

-               $prefix = run_or_die('git', 'rev-parse', '--show-prefix');
+               ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');

                if (! defined $prefix) {
                        $prefix="";
                }
                if (! defined $prefix) {
                        $prefix="";
                }


@@ -342,8 +352,9 @@ sub parse_diff_tree ($) {
                        $ci{ "${who}_epoch" } = $epoch;
                        $ci{ "${who}_tz"    } = $tz;
 
                        $ci{ "${who}_epoch" } = $epoch;
                        $ci{ "${who}_tz"    } = $tz;
 

-                       if ($name =~ m/^[^<]+\s+<([^@>]+)/) {
-                               $ci{"${who}_username"} = $1;
+                       if ($name =~ m/^([^<]+)\s+<([^@>]+)/) {
+                               $ci{"${who}_name"} = $1;
+                               $ci{"${who}_username"} = $2;

                        }
                        elsif ($name =~ m/^([^<]+)\s+<>$/) {
                                $ci{"${who}_username"} = $1;
                        }
                        elsif ($name =~ m/^([^<]+)\s+<>$/) {
                                $ci{"${who}_username"} = $1;


@@ -451,7 +462,7 @@ sub rcs_update () {
        # Update working directory.
 
        if (length $config{gitorigin_branch}) {
        # Update working directory.
 
        if (length $config{gitorigin_branch}) {

-               run_or_cry('git', 'pull', $config{gitorigin_branch});
+               run_or_cry('git', 'pull', '--prune', $config{gitorigin_branch});

        }
 }
 
        }
 }
 


@@ -463,43 +474,62 @@ sub rcs_prepedit ($) {
        return git_sha1($file);
 }
 
        return git_sha1($file);
 }
 

-sub rcs_commit ($$$;$$) {
+sub rcs_commit (@) {

        # Try to commit the page; returns undef on _success_ and
        # a version of the page with the rcs's conflict markers on
        # failure.
        # Try to commit the page; returns undef on _success_ and
        # a version of the page with the rcs's conflict markers on
        # failure.

-
-       my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+       my %params=@_;

 
        # Check to see if the page has been changed by someone else since
        # rcs_prepedit was called.
 
        # Check to see if the page has been changed by someone else since
        # rcs_prepedit was called.

-       my $cur    = git_sha1($file);
-       my ($prev) = $rcstoken =~ /^($sha1_pattern)$/; # untaint
+       my $cur    = git_sha1($params{file});
+       my ($prev) = $params{token} =~ /^($sha1_pattern)$/; # untaint

 
        if (defined $cur && defined $prev && $cur ne $prev) {
 
        if (defined $cur && defined $prev && $cur ne $prev) {

-               my $conflict = merge_past($prev, $file, $dummy_commit_msg);
+               my $conflict = merge_past($prev, $params{file}, $dummy_commit_msg);

                return $conflict if defined $conflict;
        }
 
                return $conflict if defined $conflict;
        }
 

-       rcs_add($file); 
-       return rcs_commit_staged($message, $user, $ipaddr);
+       rcs_add($params{file});
+       return rcs_commit_staged(
+               message => $params{message},
+               session => $params{session},
+       );

 }
 
 }
 

-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged (@) {

        # Commits all staged changes. Changes can be staged using rcs_add,
        # rcs_remove, and rcs_rename.
        # 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 %params=@_;
+       

        my %env=%ENV;
        my %env=%ENV;

-       if (defined $user || defined $ipaddr) {
-               my $u=encode_utf8(defined $user ? $user : $ipaddr);
-               $ENV{GIT_AUTHOR_NAME}=$u;
-               $ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+
+       if (defined $params{session}) {
+               # Set the commit author and email based on web session info.
+               my $u;
+               if (defined $params{session}->param("name")) {
+                       $u=$params{session}->param("name");
+               }
+               elsif (defined $params{session}->remote_addr()) {
+                       $u=$params{session}->remote_addr();
+               }
+               if (defined $u) {
+                       $u=encode_utf8($u);
+                       $ENV{GIT_AUTHOR_NAME}=$u;
+               }
+               if (defined $params{session}->param("nickname")) {
+                       $u=encode_utf8($params{session}->param("nickname"));
+                       $u=~s/\s+/_/g;
+                       $u=~s/[^-_0-9[:alnum:]]+//g;
+               }
+               if (defined $u) {
+                       $ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+               }

        }
 
        }
 

-       $message = IkiWiki::possibly_foolish_untaint($message);
+       $params{message} = IkiWiki::possibly_foolish_untaint($params{message});

        my @opts;
        my @opts;

-       if ($message !~ /\S/) {
+       if ($params{message} !~ /\S/) {

                # Force git to allow empty commit messages.
                # (If this version of git supports it.)
                my ($version)=`git --version` =~ /git version (.*)/;
                # Force git to allow empty commit messages.
                # (If this version of git supports it.)
                my ($version)=`git --version` =~ /git version (.*)/;


@@ -507,13 +537,13 @@ sub rcs_commit_staged ($$$) {
                        push @opts, '--cleanup=verbatim';
                }
                else {
                        push @opts, '--cleanup=verbatim';
                }
                else {

-                       $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).
                }
        }
        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', $message)) {
+       if (run_or_non('git', 'commit', @opts, '-m', $params{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});
                }


@@ -590,7 +620,16 @@ sub rcs_recentchanges ($) {
 
                my $user=$ci->{'author_username'};
                my $web_commit = ($ci->{'author'} =~ /\@web>/);
 
                my $user=$ci->{'author_username'};
                my $web_commit = ($ci->{'author'} =~ /\@web>/);

-               
+               my $nickname;
+
+               # Set nickname only if a non-url author_username is available,
+               # and author_name is an url.
+               if ($user !~ /:\/\// && defined $ci->{'author_name'} &&
+                   $ci->{'author_name'} =~ /:\/\//) {
+                       $nickname=$user;
+                       $user=$ci->{'author_name'};
+               }
+

                # compatability code for old web commit messages
                if (! $web_commit &&
                      defined $messages[0] &&
                # compatability code for old web commit messages
                if (! $web_commit &&
                      defined $messages[0] &&


@@ -603,6 +642,7 @@ sub rcs_recentchanges ($) {
                push @rets, {
                        rev        => $sha1,
                        user       => $user,
                push @rets, {
                        rev        => $sha1,
                        user       => $user,

+                       nickname   => $nickname,

                        committype => $web_commit ? "web" : "git",
                        when       => $when,
                        message    => [@messages],
                        committype => $web_commit ? "web" : "git",
                        when       => $when,
                        message    => [@messages],


@@ -639,9 +679,6 @@ sub findtimes ($$) {
        my $file=shift;
        my $id=shift; # 0 = mtime ; 1 = ctime
 
        my $file=shift;
        my $id=shift; # 0 = mtime ; 1 = ctime
 

-       # Remove srcdir prefix
-       $file =~ s/^\Q$config{srcdir}\E\/?//;
-

        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',