gitweb: link to patch(es) view in commit(diff) and (short)log view

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index e9847469b36a70376e7904c5f1165913f9bb46e6218517d93a698cb4da77dc09..f49abf14e72872171ffbbbc4d26f53902c390f693b00df6b406fc3caf0e3cc1d 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -508,6 +508,7 @@ our %actions = (
        "history" => \&git_history,
        "log" => \&git_log,
        "patch" => \&git_patch,
+       "patches" => \&git_patches,
        "rss" => \&git_rss,
        "atom" => \&git_atom,
        "search" => \&git_search,
@@ -5017,6 +5018,15 @@ sub git_log {
 
        my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#commitlist >= 100);
 
+       my ($patch_max) = gitweb_get_feature('patches');
+       if ($patch_max) {
+               if ($patch_max < 0 || @commitlist <= $patch_max) {
+                       $paging_nav .= " &sdot; " .
+                               $cgi->a({-href => href(action=>"patches", -replay=>1)},
+                                       "patches");
+               }
+       }
+
        git_header_html();
        git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
 
@@ -5096,6 +5106,11 @@ sub git_commit {
                        } @$parents ) .
                        ')';
        }
+       if (gitweb_check_feature('patches')) {
+               $formats_nav .= " | " .
+                       $cgi->a({-href => href(action=>"patch", -replay=>1)},
+                               "patch");
+       }
 
        if (!defined $parent) {
                $parent = "--root";
@@ -5372,11 +5387,11 @@ sub git_blobdiff_plain {
 }
 
 sub git_commitdiff {
-       my $format = shift || 'html';
+       my %params = @_;
+       my $format = $params{-format} || 'html';
 
-       my $patch_max;
+       my ($patch_max) = gitweb_get_feature('patches');
        if ($format eq 'patch') {
-               ($patch_max) = gitweb_get_feature('patches');
                die_error(403, "Patch view not allowed") unless $patch_max;
        }
 
@@ -5394,6 +5409,11 @@ sub git_commitdiff {
                $formats_nav =
                        $cgi->a({-href => href(action=>"commitdiff_plain", -replay=>1)},
                                "raw");
+               if ($patch_max) {
+                       $formats_nav .= " | " .
+                               $cgi->a({-href => href(action=>"patch", -replay=>1)},
+                                       "patch");
+               }
 
                if (defined $hash_parent &&
                    $hash_parent ne '-c' && $hash_parent ne '--cc') {
@@ -5489,7 +5509,15 @@ sub git_commitdiff {
                        }
                        push @commit_spec, '-n', "$hash_parent..$hash";
                } else {
-                       push @commit_spec, '-1', '--root', $hash;
+                       if ($params{-single}) {
+                               push @commit_spec, '-1';
+                       } else {
+                               if ($patch_max > 0) {
+                                       push @commit_spec, "-$patch_max";
+                               }
+                               push @commit_spec, "-n";
+                       }
+                       push @commit_spec, '--root', $hash;
                }
                open $fd, "-|", git_cmd(), "format-patch", '--encoding=utf8',
                        '--stdout', @commit_spec
@@ -5580,12 +5608,16 @@ sub git_commitdiff {
 }
 
 sub git_commitdiff_plain {
-       git_commitdiff('plain');
+       git_commitdiff(-format => 'plain');
 }
 
 # format-patch-style patches
 sub git_patch {
-       git_commitdiff('patch');
+       git_commitdiff(-format => 'patch', -single=> 1);
+}
+
+sub git_patches {
+       git_commitdiff(-format => 'patch');
 }
 
 sub git_history {
@@ -5938,6 +5970,14 @@ sub git_shortlog {
                        $cgi->a({-href => href(-replay=>1, page=>$page+1),
                                 -accesskey => "n", -title => "Alt-n"}, "next");
        }
+       my $patch_max = gitweb_check_feature('patches');
+       if ($patch_max) {
+               if ($patch_max < 0 || @commitlist <= $patch_max) {
+                       $paging_nav .= " &sdot; " .
+                               $cgi->a({-href => href(action=>"patches", -replay=>1)},
+                                       "patches");
+               }
+       }
 
        git_header_html();
        git_print_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);