gitweb: use fullname as hash_base in heads link

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 83c4f097da30eb0da5b2d1db5c755aac9c42ef4dfc5f38172063b3ccd26e4cd6..26d0170b3216e4d707da214a67b36551de76e79752465f65de0c58a7abca5bca 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -7,6 +7,7 @@
 #
 # This program is licensed under the GPLv2
 
 #
 # This program is licensed under the GPLv2
 

+use 5.008;

 use strict;
 use warnings;
 use CGI qw(:standard :escapeHTML -nosticky);
 use strict;
 use warnings;
 use CGI qw(:standard :escapeHTML -nosticky);


@@ -16,12 +17,10 @@ use Encode;
 use Fcntl ':mode';
 use File::Find qw();
 use File::Basename qw(basename);
 use Fcntl ':mode';
 use File::Find qw();
 use File::Basename qw(basename);

+use Time::HiRes qw(gettimeofday tv_interval);

 binmode STDOUT, ':utf8';
 
 binmode STDOUT, ':utf8';
 

-our $t0;
-if (eval { require Time::HiRes; 1; }) {
-       $t0 = [Time::HiRes::gettimeofday()];
-}
+our $t0 = [ gettimeofday() ];

 our $number_of_git_cmds = 0;
 
 BEGIN {
 our $number_of_git_cmds = 0;
 
 BEGIN {


@@ -166,6 +165,12 @@ our @diff_opts = ('-M'); # taken from git_commit
 # the gitweb domain.
 our $prevent_xss = 0;
 
 # the gitweb domain.
 our $prevent_xss = 0;
 

+# Path to the highlight executable to use (must be the one from
+# http://www.andre-simon.de due to assumptions about parameters and output).
+# Useful if highlight is not installed on your webserver's PATH.
+# [Default: highlight]
+our $highlight_bin = "++HIGHLIGHT_BIN++";
+

 # information about snapshot formats that gitweb is capable of serving
 our %known_snapshot_formats = (
        # name => {
 # information about snapshot formats that gitweb is capable of serving
 our %known_snapshot_formats = (
        # name => {


@@ -775,10 +780,10 @@ sub evaluate_path_info {
                'history',
        );
 
                'history',
        );
 

-       # we want to catch
+       # we want to catch, among others

        # [$hash_parent_base[:$file_parent]..]$hash_parent[:$file_name]
        my ($parentrefname, $parentpathname, $refname, $pathname) =
        # [$hash_parent_base[:$file_parent]..]$hash_parent[:$file_name]
        my ($parentrefname, $parentpathname, $refname, $pathname) =

-               ($path_info =~ /^(?:(.+?)(?::(.+))?\.\.)?(.+?)(?::(.+))?$/);
+               ($path_info =~ /^(?:(.+?)(?::(.+))?\.\.)?([^:]+?)?(?::(.+))?$/);

 
        # first, analyze the 'current' part
        if (defined $pathname) {
 
        # first, analyze the 'current' part
        if (defined $pathname) {


@@ -814,8 +819,15 @@ sub evaluate_path_info {
                # hash_base instead. It should also be noted that hand-crafted
                # links having 'history' as an action and no pathname or hash
                # set will fail, but that happens regardless of PATH_INFO.
                # hash_base instead. It should also be noted that hand-crafted
                # links having 'history' as an action and no pathname or hash
                # set will fail, but that happens regardless of PATH_INFO.

-               $input_params{'action'} ||= "shortlog";
-               if (grep { $_ eq $input_params{'action'} } @wants_base) {
+               if (defined $parentrefname) {
+                       # if there is parent let the default be 'shortlog' action
+                       # (for http://git.example.com/repo.git/A..B links); if there
+                       # is no parent, dispatch will detect type of object and set
+                       # action appropriately if required (if action is not set)
+                       $input_params{'action'} ||= "shortlog";
+               }
+               if ($input_params{'action'} &&
+                   grep { $_ eq $input_params{'action'} } @wants_base) {

                        $input_params{'hash_base'} ||= $refname;
                } else {
                        $input_params{'hash'} ||= $refname;
                        $input_params{'hash_base'} ||= $refname;
                } else {
                        $input_params{'hash'} ||= $refname;


@@ -1052,7 +1064,7 @@ sub dispatch {
 }
 
 sub reset_timer {
 }
 
 sub reset_timer {

-       our $t0 = [Time::HiRes::gettimeofday()]
+       our $t0 = [ gettimeofday() ]

                if defined $t0;
        our $number_of_git_cmds = 0;
 }
                if defined $t0;
        our $number_of_git_cmds = 0;
 }


@@ -1062,6 +1074,7 @@ sub run_request {
 
        evaluate_uri();
        evaluate_gitweb_config();
 
        evaluate_uri();
        evaluate_gitweb_config();

+       evaluate_git_version();

        check_loadavg();
 
        # $projectroot and $projects_list might be set in gitweb config file
        check_loadavg();
 
        # $projectroot and $projects_list might be set in gitweb config file


@@ -1114,7 +1127,6 @@ sub evaluate_argv {
 
 sub run {
        evaluate_argv();
 
 sub run {
        evaluate_argv();

-       evaluate_git_version();

 
        $pre_listen_hook->()
                if $pre_listen_hook;
 
        $pre_listen_hook->()
                if $pre_listen_hook;


@@ -3361,7 +3373,8 @@ sub run_highlighter {
        close $fd
                or die_error(404, "Reading blob failed");
        open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
        close $fd
                or die_error(404, "Reading blob failed");
        open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".

-                 "highlight --xhtml --fragment --syntax $syntax |"
+                 quote_command($highlight_bin).
+                 " --xhtml --fragment --syntax $syntax |"

                or die_error(500, "Couldn't open file or run syntax highlighter");
        return $fd;
 }
                or die_error(500, "Couldn't open file or run syntax highlighter");
        return $fd;
 }


@@ -3576,7 +3589,7 @@ sub git_footer_html {
                print "<div id=\"generating_info\">\n";
                print 'This page took '.
                      '<span id="generating_time" class="time_span">'.
                print "<div id=\"generating_info\">\n";
                print 'This page took '.
                      '<span id="generating_time" class="time_span">'.

-                     Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).
+                     tv_interval($t0, [ gettimeofday() ]).

                      ' seconds </span>'.
                      ' and '.
                      '<span id="generating_cmd">'.
                      ' seconds </span>'.
                      ' and '.
                      '<span id="generating_cmd">'.


@@ -4946,7 +4959,7 @@ sub git_heads_body {
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(action=>"shortlog", hash=>$ref{'fullname'})}, "shortlog") . " | " .
                      $cgi->a({-href => href(action=>"log", hash=>$ref{'fullname'})}, "log") . " | " .
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(action=>"shortlog", hash=>$ref{'fullname'})}, "shortlog") . " | " .
                      $cgi->a({-href => href(action=>"log", hash=>$ref{'fullname'})}, "log") . " | " .

-                     $cgi->a({-href => href(action=>"tree", hash=>$ref{'fullname'}, hash_base=>$ref{'name'})}, "tree") .
+                     $cgi->a({-href => href(action=>"tree", hash=>$ref{'fullname'}, hash_base=>$ref{'fullname'})}, "tree") .

                      "</td>\n" .
                      "</tr>";
        }
                      "</td>\n" .
                      "</tr>";
        }


@@ -5192,15 +5205,15 @@ sub git_summary {
 }
 
 sub git_tag {
 }
 
 sub git_tag {

-       my $head = git_get_head_hash($project);
-       git_header_html();
-       git_print_page_nav('','', $head,undef,$head);

        my %tag = parse_tag($hash);
 
        if (! %tag) {
                die_error(404, "Unknown tag object");
        }
 
        my %tag = parse_tag($hash);
 
        if (! %tag) {
                die_error(404, "Unknown tag object");
        }
 

+       my $head = git_get_head_hash($project);
+       git_header_html();
+       git_print_page_nav('','', $head,undef,$head);

        git_print_header_div('commit', esc_html($tag{'name'}), $hash);
        print "<div class=\"title_text\">\n" .
              "<table class=\"object_header\">\n" .
        git_print_header_div('commit', esc_html($tag{'name'}), $hash);
        print "<div class=\"title_text\">\n" .
              "<table class=\"object_header\">\n" .


@@ -5284,7 +5297,7 @@ sub git_blame_common {
                print 'END';
                if (defined $t0 && gitweb_check_feature('timed')) {
                        print ' '.
                print 'END';
                if (defined $t0 && gitweb_check_feature('timed')) {
                        print ' '.

-                             Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).
+                             tv_interval($t0, [ gettimeofday() ]).

                              ' '.$number_of_git_cmds;
                }
                print "\n";
                              ' '.$number_of_git_cmds;
                }
                print "\n";