web commit by JoshTriplett: Add shortcut for wikitravel.

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index ce23848974fb69f40c8dd7887fee04bcd336864b..7f33148e396751852488b92264245219b208f59b 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -8,8 +8,6 @@ use open qw{:utf8 :std};
 
 package IkiWiki;
 
-my $origin_branch    = 'origin';            # Git ref for main repository
-my $master_branch    = 'master';            # working branch
 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
 
@@ -112,8 +110,8 @@ sub _merge_past ($$$) { #{{{
 
                # Switch to throw-away branch for the merge operation.
                push @undo, sub {
-                       if (!run_or_cry('git-checkout', $master_branch)) {
-                               run_or_cry('git-checkout','-f',$master_branch);
+                       if (!run_or_cry('git-checkout', $config{gitmaster_branch})) {
+                               run_or_cry('git-checkout','-f',$config{gitmaster_branch});
                        }
                };
                run_or_die('git-checkout', $branch);
@@ -125,7 +123,7 @@ sub _merge_past ($$$) { #{{{
                # _Silently_ commit all modifications in the current branch.
                run_or_non('git-commit', '-m', $message, '-a');
                # ... and re-switch to master.
-               run_or_die('git-checkout', $master_branch);
+               run_or_die('git-checkout', $config{gitmaster_branch});
 
                # Attempt to merge without complaining.
                if (!run_or_non('git-pull', '--no-commit', '.', $branch)) {
@@ -171,10 +169,12 @@ sub _parse_diff_tree (@) { #{{{
                # Regexps are semi-stolen from gitweb.cgi.
                if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                        $ci{'tree'} = $1;
-               } elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
+               }
+               elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
                        # XXX: collecting in reverse order
                        push @{ $ci{'parents'} }, $1;
-               } elsif ($line =~ m/^(author|committer) (.*) ([0-9]+) (.*)$/) {
+               }
+               elsif ($line =~ m/^(author|committer) (.*) ([0-9]+) (.*)$/) {
                        my ($who, $name, $epoch, $tz) =
                           ($1,   $2,    $3,     $4 );
 
@@ -186,11 +186,13 @@ sub _parse_diff_tree (@) { #{{{
                                my ($fullname, $username) = ($1, $2);
                                $ci{"${who}_fullname"}    = $fullname;
                                $ci{"${who}_username"}    = $username;
-                       } else {
+                       }
+                       else {
                                $ci{"${who}_fullname"} =
                                        $ci{"${who}_username"} = $name;
                        }
-               } elsif ($line =~ m/^$/) {
+               }
+               elsif ($line =~ m/^$/) {
                        # Trailing empty line signals next section.
                        last IDENT;
                }
@@ -283,7 +285,7 @@ sub git_sha1 (;$) { #{{{
 sub rcs_update () { #{{{
        # Update working directory.
 
-       run_or_cry('git-pull', $origin_branch);
+       run_or_cry('git-pull', $config{gitorigin_branch});
 } #}}}
 
 sub rcs_prepedit ($) { #{{{
@@ -303,10 +305,12 @@ sub rcs_commit ($$$;$$) { #{{{
        my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
        if (defined $user) {
-               $message="web commit by $user".(length $message ? ": $message" : "");
+               $message = "web commit by $user" .
+                   (length $message ? ": $message" : "");
        }
        elsif (defined $ipaddr) {
-               $message="web commit from $ipaddr".(length $message ? ": $message" : "");
+               $message = "web commit from $ipaddr" .
+                   (length $message ? ": $message" : "");
        }
 
        # XXX: Wiki directory is in the unlocked state when starting this
@@ -331,7 +335,7 @@ sub rcs_commit ($$$;$$) { #{{{
        $message = possibly_foolish_untaint($message);
        if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
                unlockwiki();
-               run_or_cry('git-push', $origin_branch);
+               run_or_cry('git-push', $config{gitorigin_branch});
        }
 
        return undef; # success
@@ -386,9 +390,10 @@ sub rcs_recentchanges ($) { #{{{
 
                if (defined $messages[0] &&
                    $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
-                       $user=defined $2 ? "$2" : "$3";
-                       $messages[0]->{line}=$4;
-               } else {
+                       $user = defined $2 ? "$2" : "$3";
+                       $messages[0]->{line} = $4;
+               }
+               else {
                        $type ="git";
                        $user = $ci->{'author_username'};
                }
@@ -436,7 +441,8 @@ sub rcs_notify () { #{{{
        if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
                $user    = defined $2 ? "$2" : "$3";
                $message = $4;
-       } else {
+       }
+       else {
                $user    = $ci->{'author_username'};
                $message = join "\n", @{ $ci->{'comment'} };
        }
@@ -448,7 +454,8 @@ sub rcs_notify () { #{{{
                },
                sub {
                        join "\n", run_or_die('git-diff', "${sha1}^", $sha1);
-               }, $user, @changed_pages);
+               }, $user, @changed_pages
+       );
 } #}}}
 
 sub rcs_getctime ($) { #{{{