Skip to content

Commit

Permalink
gitweb: link to patch(es) view in commit(diff) and (short)log view
Browse files Browse the repository at this point in the history
We link to patch view in commit and commitdiff view, and to patches view
in log and shortlog view.

In (short)log view, the link is only offered when the number of commits
shown is no more than the allowed maximum number of patches.

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Giuseppe Bilotta authored and Junio C Hamano committed Dec 21, 2008
1 parent a3411f8 commit 75bf2cb
Showing 1 changed file with 28 additions and 2 deletions.
30 changes: 28 additions & 2 deletions gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -5023,6 +5023,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);

Expand Down Expand Up @@ -5102,6 +5111,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";
Expand Down Expand Up @@ -5415,9 +5429,8 @@ sub git_commitdiff {
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;
}

Expand All @@ -5435,6 +5448,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') {
Expand Down Expand Up @@ -5991,6 +6009,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);
Expand Down

0 comments on commit 75bf2cb

Please sign in to comment.