[PATCH 1/7] gitweb: Restore old git_blame using git-annotate under "annotate"
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Aug 26, 2006, 17:14 UTC
- Message-ID
- <11566124661001-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <1156612392716-git-send-email-jnareb@gmail.com>
Rename git_blame to git_annotate, and git_blame2 to git_blame. Link git_annotate under "annotate" action. Add link to "blame in git_annotate, and to "annotate" in git_blame.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- gitweb/gitweb.perl | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index e00a6ed..abd0f0d 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -229,7 +229,8 @@ if (defined $searchtext) { # dispatch my %actions = ( - "blame" => \&git_blame2, + "blame" => \&git_blame, + "annotate" => \&git_annotate, "blobdiff" => \&git_blobdiff, "blobdiff_plain" => \&git_blobdiff_plain, "blob" => \&git_blob, @@ -2166,7 +2167,7 @@ sub git_tag { git_footer_html(); } -sub git_blame2 { +sub git_blame { my $fd; my $ftype; @@ -2193,6 +2194,9 @@ sub git_blame2 { $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, "blob") . " | " . + $cgi->a({-href => href(action=>"annotate", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, + "annotate") . + " | " . $cgi->a({-href => href(action=>"blame", file_name=>$file_name)}, "head"); git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav); @@ -2236,7 +2240,7 @@ HTML git_footer_html(); } -sub git_blame { +sub git_annotate { my $fd; if (!gitweb_check_feature('blame')) { @@ -2258,6 +2262,9 @@ sub git_blame { $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, "blob") . " | " . + $cgi->a({-href => href(action=>"blame", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, + "blame") . + " | " . $cgi->a({-href => href(action=>"blame", file_name=>$file_name)}, "head"); git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-- 1.4.1.1