gitweb: refactor repository URL printing

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 8936b0ef21da989a5f02e4b78cb40665d4a2248aeed600d00079b90d22ce017a..85110d689472b9c22e955215b82d4555ed7280c57e69904c920e6eaf407a5031 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 => {


@@ -269,7 +274,7 @@ our %feature = (
        # return value of feature-sub indicates if to enable specified feature
        #
        # if there is no 'sub' key (no feature-sub), then feature cannot be
        # return value of feature-sub indicates if to enable specified feature
        #
        # if there is no 'sub' key (no feature-sub), then feature cannot be

-       # overriden
+       # overridden

        #
        # use gitweb_get_feature(<feature>) to retrieve the <feature> value
        # (an array) or gitweb_check_feature(<feature>) to check if <feature>
        #
        # use gitweb_get_feature(<feature>) to retrieve the <feature> value
        # (an array) or gitweb_check_feature(<feature>) to check if <feature>


@@ -487,6 +492,18 @@ our %feature = (
                'sub' => sub { feature_bool('highlight', @_) },
                'override' => 0,
                'default' => [0]},
                'sub' => sub { feature_bool('highlight', @_) },
                'override' => 0,
                'default' => [0]},

+
+       # Enable displaying of remote heads in the heads list
+
+       # To enable system wide have in $GITWEB_CONFIG
+       # $feature{'remote_heads'}{'default'} = [1];
+       # To have project specific config enable override in $GITWEB_CONFIG
+       # $feature{'remote_heads'}{'override'} = 1;
+       # and in project config gitweb.remote_heads = 0|1;
+       'remote_heads' => {
+               'sub' => sub { feature_bool('remote_heads', @_) },
+               'override' => 0,
+               'default' => [0]},

 );
 
 sub gitweb_get_feature {
 );
 
 sub gitweb_get_feature {


@@ -701,6 +718,7 @@ our %actions = (
        "log" => \&git_log,
        "patch" => \&git_patch,
        "patches" => \&git_patches,
        "log" => \&git_log,
        "patch" => \&git_patch,
        "patches" => \&git_patches,

+       "remotes" => \&git_remotes,

        "rss" => \&git_rss,
        "atom" => \&git_atom,
        "search" => \&git_search,
        "rss" => \&git_rss,
        "atom" => \&git_atom,
        "search" => \&git_search,


@@ -775,10 +793,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 +832,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 +1077,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 +1087,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 +1140,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;


@@ -1126,7 +1151,7 @@ sub run {
 
                run_request();
 
 
                run_request();
 

-               $pre_dispatch_hook->()
+               $post_dispatch_hook->()

                        if $post_dispatch_hook;
 
                last REQUEST if ($is_last_request->());
                        if $post_dispatch_hook;
 
                last REQUEST if ($is_last_request->());


@@ -1347,7 +1372,7 @@ sub esc_param {
        return $str;
 }
 
        return $str;
 }
 

-# quote unsafe chars in whole URL, so some charactrs cannot be quoted
+# quote unsafe chars in whole URL, so some characters cannot be quoted

 sub esc_url {
        my $str = shift;
        return undef unless defined $str;
 sub esc_url {
        my $str = shift;
        return undef unless defined $str;


@@ -3144,13 +3169,15 @@ sub parse_from_to_diffinfo {
 ## parse to array of hashes functions
 
 sub git_get_heads_list {
 ## parse to array of hashes functions
 
 sub git_get_heads_list {

-       my $limit = shift;
+       my ($limit, @classes) = @_;
+       @classes = ('heads') unless @classes;
+       my @patterns = map { "refs/$_" } @classes;

        my @headslist;
 
        open my $fd, '-|', git_cmd(), 'for-each-ref',
                ($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
                '--format=%(objectname) %(refname) %(subject)%00%(committer)',
        my @headslist;
 
        open my $fd, '-|', git_cmd(), 'for-each-ref',
                ($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
                '--format=%(objectname) %(refname) %(subject)%00%(committer)',

-               'refs/heads'
+               @patterns

                or return;
        while (my $line = <$fd>) {
                my %ref_item;
                or return;
        while (my $line = <$fd>) {
                my %ref_item;


@@ -3161,7 +3188,7 @@ sub git_get_heads_list {
                my ($committer, $epoch, $tz) =
                        ($committerinfo =~ /^(.*) ([0-9]+) (.*)$/);
                $ref_item{'fullname'}  = $name;
                my ($committer, $epoch, $tz) =
                        ($committerinfo =~ /^(.*) ([0-9]+) (.*)$/);
                $ref_item{'fullname'}  = $name;

-               $name =~ s!^refs/heads/!!;
+               $name =~ s!^refs/(?:head|remote)s/!!;

 
                $ref_item{'name'}  = $name;
                $ref_item{'id'}    = $hash;
 
                $ref_item{'name'}  = $name;
                $ref_item{'id'}    = $hash;


@@ -3361,7 +3388,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;
 }


@@ -3497,7 +3525,15 @@ EOF
        if (defined $project) {
                print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                if (defined $action) {
        if (defined $project) {
                print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                if (defined $action) {

-                       print " / $action";
+                       my $action_print = $action ;
+                       if (defined $opts{-action_extra}) {
+                               $action_print = $cgi->a({-href => href(action=>$action)},
+                                       $action);
+                       }
+                       print " / $action_print";
+               }
+               if (defined $opts{-action_extra}) {
+                       print " / $opts{-action_extra}";

                }
                print "\n";
        }
                }
                print "\n";
        }


@@ -3576,7 +3612,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">'.


@@ -3704,6 +3740,19 @@ sub git_print_page_nav {
              "</div>\n";
 }
 
              "</div>\n";
 }
 

+# returns a submenu for the nagivation of the refs views (tags, heads,
+# remotes) with the current view disabled and the remotes view only
+# available if the feature is enabled
+sub format_ref_views {
+       my ($current) = @_;
+       my @ref_views = qw{tags heads};
+       push @ref_views, 'remotes' if gitweb_check_feature('remote_heads');
+       return join " | ", map {
+               $_ eq $current ? $_ :
+               $cgi->a({-href => href(action=>$_)}, $_)
+       } @ref_views
+}
+

 sub format_paging_nav {
        my ($action, $page, $has_next_link) = @_;
        my $paging_nav;
 sub format_paging_nav {
        my ($action, $page, $has_next_link) = @_;
        my $paging_nav;


@@ -3747,6 +3796,11 @@ sub git_print_header_div {
              "\n</div>\n";
 }
 
              "\n</div>\n";
 }
 

+sub format_repo_url {
+       my ($name, $url) = @_;
+       return "<tr class=\"metadata_url\"><td>$name</td><td>$url</td></tr>\n";
+}
+

 sub print_local_time {
        print format_local_time(@_);
 }
 sub print_local_time {
        print format_local_time(@_);
 }


@@ -3782,9 +3836,9 @@ sub git_print_authorship {
 }
 
 # Outputs table rows containing the full author or committer information,
 }
 
 # Outputs table rows containing the full author or committer information,

-# in the format expected for 'commit' view (& similia).
+# in the format expected for 'commit' view (& similar).

 # Parameters are a commit hash reference, followed by the list of people
 # Parameters are a commit hash reference, followed by the list of people

-# to output information for. If the list is empty it defalts to both
+# to output information for. If the list is empty it defaults to both

 # author and committer.
 sub git_print_authorship_rows {
        my $co = shift;
 # author and committer.
 sub git_print_authorship_rows {
        my $co = shift;


@@ -4513,8 +4567,8 @@ sub git_patchset_body {
                print "</div>\n"; # class="patch"
        }
 
                print "</div>\n"; # class="patch"
        }
 

-       # for compact combined (--cc) format, with chunk and patch simpliciaction
-       # patchset might be empty, but there might be unprocessed raw lines
+       # for compact combined (--cc) format, with chunk and patch simplification
+       # the patchset might be empty, but there might be unprocessed raw lines

        for (++$patch_idx if $patch_number > 0;
             $patch_idx < @$difftree;
             ++$patch_idx) {
        for (++$patch_idx if $patch_number > 0;
             $patch_idx < @$difftree;
             ++$patch_idx) {


@@ -4946,7 +5000,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>";
        }


@@ -5095,6 +5149,7 @@ sub git_summary {
        my %co = parse_commit("HEAD");
        my %cd = %co ? parse_date($co{'committer_epoch'}, $co{'committer_tz'}) : ();
        my $head = $co{'id'};
        my %co = parse_commit("HEAD");
        my %cd = %co ? parse_date($co{'committer_epoch'}, $co{'committer_tz'}) : ();
        my $head = $co{'id'};

+       my $remote_heads = gitweb_check_feature('remote_heads');

 
        my $owner = git_get_project_owner($project);
 
 
        my $owner = git_get_project_owner($project);
 


@@ -5103,6 +5158,7 @@ sub git_summary {
        # there are more ...
        my @taglist  = git_get_tags_list(16);
        my @headlist = git_get_heads_list(16);
        # there are more ...
        my @taglist  = git_get_tags_list(16);
        my @headlist = git_get_heads_list(16);

+       my @remotelist = $remote_heads ? git_get_heads_list(16, 'remotes') : ();

        my @forklist;
        my $check_forks = gitweb_check_feature('forks');
 
        my @forklist;
        my $check_forks = gitweb_check_feature('forks');
 


@@ -5128,7 +5184,7 @@ sub git_summary {
        @url_list = map { "$_/$project" } @git_base_url_list unless @url_list;
        foreach my $git_url (@url_list) {
                next unless $git_url;
        @url_list = map { "$_/$project" } @git_base_url_list unless @url_list;
        foreach my $git_url (@url_list) {
                next unless $git_url;

-               print "<tr class=\"metadata_url\"><td>$url_tag</td><td>$git_url</td></tr>\n";
+               print format_repo_url($url_tag, $git_url);

                $url_tag = "";
        }
 
                $url_tag = "";
        }
 


@@ -5180,6 +5236,13 @@ sub git_summary {
                               $cgi->a({-href => href(action=>"heads")}, "..."));
        }
 
                               $cgi->a({-href => href(action=>"heads")}, "..."));
        }
 

+       if (@remotelist) {
+               git_print_header_div('remotes');
+               git_heads_body(\@remotelist, $head, 0, 15,
+                              $#remotelist <= 15 ? undef :
+                              $cgi->a({-href => href(action=>"remotes")}, "..."));
+       }
+

        if (@forklist) {
                git_print_header_div('forks');
                git_project_list_body(\@forklist, 'age', 0, 15,
        if (@forklist) {
                git_print_header_div('forks');
                git_project_list_body(\@forklist, 'age', 0, 15,


@@ -5192,15 +5255,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 +5347,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";


@@ -5471,7 +5534,7 @@ sub git_blame_data {
 sub git_tags {
        my $head = git_get_head_hash($project);
        git_header_html();
 sub git_tags {
        my $head = git_get_head_hash($project);
        git_header_html();

-       git_print_page_nav('','', $head,undef,$head);
+       git_print_page_nav('','', $head,undef,$head,format_ref_views('tags'));

        git_print_header_div('summary', $project);
 
        my @tagslist = git_get_tags_list();
        git_print_header_div('summary', $project);
 
        my @tagslist = git_get_tags_list();


@@ -5484,7 +5547,7 @@ sub git_tags {
 sub git_heads {
        my $head = git_get_head_hash($project);
        git_header_html();
 sub git_heads {
        my $head = git_get_head_hash($project);
        git_header_html();

-       git_print_page_nav('','', $head,undef,$head);
+       git_print_page_nav('','', $head,undef,$head,format_ref_views('heads'));

        git_print_header_div('summary', $project);
 
        my @headslist = git_get_heads_list();
        git_print_header_div('summary', $project);
 
        my @headslist = git_get_heads_list();


@@ -5494,6 +5557,44 @@ sub git_heads {
        git_footer_html();
 }
 
        git_footer_html();
 }
 

+sub git_remotes {
+       gitweb_check_feature('remote_heads')
+               or die_error(403, "Remote heads view is disabled");
+
+       my $head = git_get_head_hash($project);
+       my $remote = $input_params{'hash'};
+
+       my @remotelist;
+
+       if (defined $remote) {
+               # only display the heads in a given remote, stripping the
+               # remote name which is already visible elsewhere
+               @remotelist = map {
+                       my $ref = $_ ;
+                       $ref->{'name'} =~ s!^$remote/!!;
+                       $ref
+               } git_get_heads_list(undef, "remotes/$remote");
+       } else {
+               @remotelist = git_get_heads_list(undef, 'remotes');
+       }
+
+       git_header_html(undef, undef, -action_extra => $remote);
+       git_print_page_nav('', '',  $head, undef, $head,
+               format_ref_views($remote ? '' : 'remotes'));
+
+       if (defined $remote) {
+               git_print_header_div('remotes', "$remote remote for $project");
+       } else {
+               git_print_header_div('summary', "$project remotes");
+       }
+
+       if (@remotelist) {
+               git_heads_body(\@remotelist, $head);
+       }
+
+       git_footer_html();
+}
+

 sub git_blob_plain {
        my $type = shift;
        my $expires;
 sub git_blob_plain {
        my $type = shift;
        my $expires;


@@ -6522,12 +6623,13 @@ sub git_search {
                        $paging_nav .= " &sdot; next";
                }
 
                        $paging_nav .= " &sdot; next";
                }
 

-               if ($#commitlist >= 100) {
-               }
-

                git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
                git_print_header_div('commit', esc_html($co{'title'}), $hash);
                git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
                git_print_header_div('commit', esc_html($co{'title'}), $hash);

-               git_search_grep_body(\@commitlist, 0, 99, $next_link);
+               if ($page == 0 && !@commitlist) {
+                       print "<p>No match.</p>\n";
+               } else {
+                       git_search_grep_body(\@commitlist, 0, 99, $next_link);
+               }

        }
 
        if ($searchtype eq 'pickaxe') {
        }
 
        if ($searchtype eq 'pickaxe') {