gitweb: Add charset info to "raw" output of 'text/plain' blobs

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 43302b19cdb734d9a0a4661816ed5ac654b2677babb7f8a1677c83b9085e322a..da235e3bfaa3cf89a63bfdb436ef8bcf29a5b0686a0c0d95aebe7ecb7d64490b 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -512,7 +512,7 @@ sub evaluate_path_info {
        }
        # do not change any parameters if an action is given using the query string
        return if $action;
        }
        # do not change any parameters if an action is given using the query string
        return if $action;

-       $path_info =~ s,^$project/*,,;
+       $path_info =~ s,^\Q$project\E/*,,;

        my ($refname, $pathname) = split(/:/, $path_info, 2);
        if (defined $pathname) {
                # we got "project.git/branch:filename" or "project.git/branch:dir/"
        my ($refname, $pathname) = split(/:/, $path_info, 2);
        if (defined $pathname) {
                # we got "project.git/branch:filename" or "project.git/branch:dir/"


@@ -593,7 +593,7 @@ exit;
 ## ======================================================================
 ## action links
 
 ## ======================================================================
 ## action links
 

-sub href(%) {
+sub href (%) {

        my %params = @_;
        # default is to use -absolute url() i.e. $my_uri
        my $href = $params{-full} ? $my_url : $my_uri;
        my %params = @_;
        # default is to use -absolute url() i.e. $my_uri
        my $href = $params{-full} ? $my_url : $my_uri;


@@ -634,7 +634,7 @@ sub href(%) {
        my ($use_pathinfo) = gitweb_check_feature('pathinfo');
        if ($use_pathinfo) {
                # use PATH_INFO for project name
        my ($use_pathinfo) = gitweb_check_feature('pathinfo');
        if ($use_pathinfo) {
                # use PATH_INFO for project name

-               $href .= "/$params{'project'}" if defined $params{'project'};
+               $href .= "/".esc_url($params{'project'}) if defined $params{'project'};

                delete $params{'project'};
 
                # Summary just uses the project path URL
                delete $params{'project'};
 
                # Summary just uses the project path URL


@@ -867,6 +867,10 @@ sub chop_str {
        my $add_len = shift || 10;
        my $where = shift || 'right'; # 'left' | 'center' | 'right'
 
        my $add_len = shift || 10;
        my $where = shift || 'right'; # 'left' | 'center' | 'right'
 

+       # Make sure perl knows it is utf8 encoded so we don't
+       # cut in the middle of a utf8 multibyte char.
+       $str = to_utf8($str);
+

        # allow only $len chars, but don't cut a word if it would fit in $add_len
        # if it doesn't fit, cut it if it's still longer than the dots we would add
        # remove chopped character entities entirely
        # allow only $len chars, but don't cut a word if it would fit in $add_len
        # if it doesn't fit, cut it if it's still longer than the dots we would add
        # remove chopped character entities entirely


@@ -1449,6 +1453,46 @@ sub format_snapshot_links {
        }
 }
 
        }
 }
 

+## ......................................................................
+## functions returning values to be passed, perhaps after some
+## transformation, to other functions; e.g. returning arguments to href()
+
+# returns hash to be passed to href to generate gitweb URL
+# in -title key it returns description of link
+sub get_feed_info {
+       my $format = shift || 'Atom';
+       my %res = (action => lc($format));
+
+       # feed links are possible only for project views
+       return unless (defined $project);
+       # some views should link to OPML, or to generic project feed,
+       # or don't have specific feed yet (so they should use generic)
+       return if ($action =~ /^(?:tags|heads|forks|tag|search)$/x);
+
+       my $branch;
+       # branches refs uses 'refs/heads/' prefix (fullname) to differentiate
+       # from tag links; this also makes possible to detect branch links
+       if ((defined $hash_base && $hash_base =~ m!^refs/heads/(.*)$!) ||
+           (defined $hash      && $hash      =~ m!^refs/heads/(.*)$!)) {
+               $branch = $1;
+       }
+       # find log type for feed description (title)
+       my $type = 'log';
+       if (defined $file_name) {
+               $type  = "history of $file_name";
+               $type .= "/" if ($action eq 'tree');
+               $type .= " on '$branch'" if (defined $branch);
+       } else {
+               $type = "log of $branch" if (defined $branch);
+       }
+
+       $res{-title} = $type;
+       $res{'hash'} = (defined $branch ? "refs/heads/$branch" : undef);
+       $res{'file_name'} = $file_name;
+
+       return %res;
+}
+

 ## ----------------------------------------------------------------------
 ## git utility subroutines, invoking git commands
 
 ## ----------------------------------------------------------------------
 ## git utility subroutines, invoking git commands
 


@@ -2438,8 +2482,7 @@ sub blob_mimetype {
        return $default_blob_plain_mimetype unless $fd;
 
        if (-T $fd) {
        return $default_blob_plain_mimetype unless $fd;
 
        if (-T $fd) {

-               return 'text/plain' .
-                      ($default_text_plain_charset ? '; charset='.$default_text_plain_charset : '');
+               return 'text/plain';

        } elsif (! $filename) {
                return 'application/octet-stream';
        } elsif ($filename =~ m/\.png$/i) {
        } elsif (! $filename) {
                return 'application/octet-stream';
        } elsif ($filename =~ m/\.png$/i) {


@@ -2453,6 +2496,17 @@ sub blob_mimetype {
        }
 }
 
        }
 }
 

+sub blob_contenttype {
+       my ($fd, $file_name, $type) = @_;
+
+       $type ||= blob_mimetype($fd, $file_name);
+       if ($type eq 'text/plain' && defined $default_text_plain_charset) {
+               $type .= "; charset=$default_text_plain_charset";
+       }
+
+       return $type;
+}
+

 ## ======================================================================
 ## functions printing HTML: header, footer, error page
 
 ## ======================================================================
 ## functions printing HTML: header, footer, error page
 


@@ -2511,30 +2565,49 @@ EOF
                }
        }
        if (defined $project) {
                }
        }
        if (defined $project) {

-               printf('<link rel="alternate" title="%s log RSS feed" '.
-                      'href="%s" type="application/rss+xml" />'."\n",
-                      esc_param($project), href(action=>"rss"));
-               printf('<link rel="alternate" title="%s log RSS feed (no merges)" '.
-                      'href="%s" type="application/rss+xml" />'."\n",
-                      esc_param($project), href(action=>"rss",
-                                                extra_options=>"--no-merges"));
-               printf('<link rel="alternate" title="%s log Atom feed" '.
-                      'href="%s" type="application/atom+xml" />'."\n",
-                      esc_param($project), href(action=>"atom"));
-               printf('<link rel="alternate" title="%s log Atom feed (no merges)" '.
-                      'href="%s" type="application/atom+xml" />'."\n",
-                      esc_param($project), href(action=>"atom",
-                                                extra_options=>"--no-merges"));
+               my %href_params = get_feed_info();
+               if (!exists $href_params{'-title'}) {
+                       $href_params{'-title'} = 'log';
+               }
+
+               foreach my $format qw(RSS Atom) {
+                       my $type = lc($format);
+                       my %link_attr = (
+                               '-rel' => 'alternate',
+                               '-title' => "$project - $href_params{'-title'} - $format feed",
+                               '-type' => "application/$type+xml"
+                       );
+
+                       $href_params{'action'} = $type;
+                       $link_attr{'-href'} = href(%href_params);
+                       print "<link ".
+                             "rel=\"$link_attr{'-rel'}\" ".
+                             "title=\"$link_attr{'-title'}\" ".
+                             "href=\"$link_attr{'-href'}\" ".
+                             "type=\"$link_attr{'-type'}\" ".
+                             "/>\n";
+
+                       $href_params{'extra_options'} = '--no-merges';
+                       $link_attr{'-href'} = href(%href_params);
+                       $link_attr{'-title'} .= ' (no merges)';
+                       print "<link ".
+                             "rel=\"$link_attr{'-rel'}\" ".
+                             "title=\"$link_attr{'-title'}\" ".
+                             "href=\"$link_attr{'-href'}\" ".
+                             "type=\"$link_attr{'-type'}\" ".
+                             "/>\n";
+               }
+

        } else {
                printf('<link rel="alternate" title="%s projects list" '.
        } else {
                printf('<link rel="alternate" title="%s projects list" '.

-                      'href="%s" type="text/plain; charset=utf-8"/>'."\n",
+                      'href="%s" type="text/plain; charset=utf-8" />'."\n",

                       $site_name, href(project=>undef, action=>"project_index"));
                printf('<link rel="alternate" title="%s projects feeds" '.
                       $site_name, href(project=>undef, action=>"project_index"));
                printf('<link rel="alternate" title="%s projects feeds" '.

-                      'href="%s" type="text/x-opml"/>'."\n",
+                      'href="%s" type="text/x-opml" />'."\n",

                       $site_name, href(project=>undef, action=>"opml"));
        }
        if (defined $favicon) {
                       $site_name, href(project=>undef, action=>"opml"));
        }
        if (defined $favicon) {

-               print qq(<link rel="shortcut icon" href="$favicon" type="image/png"/>\n);
+               print qq(<link rel="shortcut icon" href="$favicon" type="image/png" />\n);

        }
 
        print "</head>\n" .
        }
 
        print "</head>\n" .


@@ -2561,7 +2634,7 @@ EOF
        print "</div>\n";
 
        my ($have_search) = gitweb_check_feature('search');
        print "</div>\n";
 
        my ($have_search) = gitweb_check_feature('search');

-       if ((defined $project) && ($have_search)) {
+       if (defined $project && $have_search) {

                if (!defined $searchtext) {
                        $searchtext = "";
                }
                if (!defined $searchtext) {
                        $searchtext = "";
                }


@@ -2576,17 +2649,14 @@ EOF
                my $action = $my_uri;
                my ($use_pathinfo) = gitweb_check_feature('pathinfo');
                if ($use_pathinfo) {
                my $action = $my_uri;
                my ($use_pathinfo) = gitweb_check_feature('pathinfo');
                if ($use_pathinfo) {

-                       $action .= "/$project";
-               } else {
-                       $cgi->param("p", $project);
+                       $action .= "/".esc_url($project);

                }
                }

-               $cgi->param("a", "search");
-               $cgi->param("h", $search_hash);

                print $cgi->startform(-method => "get", -action => $action) .
                      "<div class=\"search\">\n" .
                print $cgi->startform(-method => "get", -action => $action) .
                      "<div class=\"search\">\n" .

-                     (!$use_pathinfo && $cgi->hidden(-name => "p") . "\n") .
-                     $cgi->hidden(-name => "a") . "\n" .
-                     $cgi->hidden(-name => "h") . "\n" .
+                     (!$use_pathinfo &&
+                     $cgi->input({-name=>"p", -value=>$project, -type=>"hidden"}) . "\n") .
+                     $cgi->input({-name=>"a", -value=>"search", -type=>"hidden"}) . "\n" .
+                     $cgi->input({-name=>"h", -value=>$search_hash, -type=>"hidden"}) . "\n" .

                      $cgi->popup_menu(-name => 'st', -default => 'commit',
                                       -values => ['commit', 'grep', 'author', 'committer', 'pickaxe']) .
                      $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
                      $cgi->popup_menu(-name => 'st', -default => 'commit',
                                       -values => ['commit', 'grep', 'author', 'committer', 'pickaxe']) .
                      $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .


@@ -2602,23 +2672,35 @@ EOF
 }
 
 sub git_footer_html {
 }
 
 sub git_footer_html {

+       my $feed_class = 'rss_logo';
+

        print "<div class=\"page_footer\">\n";
        if (defined $project) {
                my $descr = git_get_project_description($project);
                if (defined $descr) {
                        print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
                }
        print "<div class=\"page_footer\">\n";
        if (defined $project) {
                my $descr = git_get_project_description($project);
                if (defined $descr) {
                        print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
                }

-               print $cgi->a({-href => href(action=>"rss"),
-                             -class => "rss_logo"}, "RSS") . " ";
-               print $cgi->a({-href => href(action=>"atom"),
-                             -class => "rss_logo"}, "Atom") . "\n";
+
+               my %href_params = get_feed_info();
+               if (!%href_params) {
+                       $feed_class .= ' generic';
+               }
+               $href_params{'-title'} ||= 'log';
+
+               foreach my $format qw(RSS Atom) {
+                       $href_params{'action'} = lc($format);
+                       print $cgi->a({-href => href(%href_params),
+                                     -title => "$href_params{'-title'} $format feed",
+                                     -class => $feed_class}, $format)."\n";
+               }
+

        } else {
                print $cgi->a({-href => href(project=>undef, action=>"opml"),
        } else {
                print $cgi->a({-href => href(project=>undef, action=>"opml"),

-                             -class => "rss_logo"}, "OPML") . " ";
+                             -class => $feed_class}, "OPML") . " ";

                print $cgi->a({-href => href(project=>undef, action=>"project_index"),
                print $cgi->a({-href => href(project=>undef, action=>"project_index"),

-                             -class => "rss_logo"}, "TXT") . "\n";
+                             -class => $feed_class}, "TXT") . "\n";

        }
        }

-       print "</div>\n" ;
+       print "</div>\n"; # class="page_footer"

 
        if (-f $site_footer) {
                open (my $fd, $site_footer);
 
        if (-f $site_footer) {
                open (my $fd, $site_footer);


@@ -2682,7 +2764,7 @@ sub git_print_page_nav {
 }
 
 sub format_paging_nav {
 }
 
 sub format_paging_nav {

-       my ($action, $hash, $head, $page, $nrevs) = @_;
+       my ($action, $hash, $head, $page, $has_next_link) = @_;

        my $paging_nav;
 
 
        my $paging_nav;
 
 


@@ -2700,7 +2782,7 @@ sub format_paging_nav {
                $paging_nav .= " &sdot; prev";
        }
 
                $paging_nav .= " &sdot; prev";
        }
 

-       if ($nrevs >= (100 * ($page+1)-1)) {
+       if ($has_next_link) {

                $paging_nav .= " &sdot; " .
                        $cgi->a({-href => href(-replay=>1, page=>$page+1),
                                 -accesskey => "n", -title => "Alt-n"}, "next");
                $paging_nav .= " &sdot; " .
                        $cgi->a({-href => href(-replay=>1, page=>$page+1),
                                 -accesskey => "n", -title => "Alt-n"}, "next");


@@ -4303,6 +4385,7 @@ sub git_heads {
 }
 
 sub git_blob_plain {
 }
 
 sub git_blob_plain {

+       my $type = shift;

        my $expires;
 
        if (!defined $hash) {
        my $expires;
 
        if (!defined $hash) {


@@ -4318,13 +4401,13 @@ sub git_blob_plain {
                $expires = "+1d";
        }
 
                $expires = "+1d";
        }
 

-       my $type = shift;

        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash

-               or die_error(undef, "Couldn't cat $file_name, $hash");
+               or die_error(undef, "Open git-cat-file blob '$hash' failed");

 
 

-       $type ||= blob_mimetype($fd, $file_name);
+       # content-type (can include charset)
+       $type = blob_contenttype($fd, $file_name, $type);

 
 

-       # save as filename, even when no $file_name is given
+       # "save as" filename, even when no $file_name is given

        my $save_as = "$hash";
        if (defined $file_name) {
                $save_as = $file_name;
        my $save_as = "$hash";
        if (defined $file_name) {
                $save_as = $file_name;


@@ -4333,9 +4416,9 @@ sub git_blob_plain {
        }
 
        print $cgi->header(
        }
 
        print $cgi->header(

-               -type => "$type",
-               -expires=>$expires,
-               -content_disposition => 'inline; filename="' . "$save_as" . '"');
+               -type => $type,
+               -expires => $expires,
+               -content_disposition => 'inline; filename="' . $save_as . '"');

        undef $/;
        binmode STDOUT, ':raw';
        print <$fd>;
        undef $/;
        binmode STDOUT, ':raw';
        print <$fd>;


@@ -4591,7 +4674,7 @@ sub git_log {
 
        my @commitlist = parse_commits($hash, 101, (100 * $page));
 
 
        my @commitlist = parse_commits($hash, 101, (100 * $page));
 

-       my $paging_nav = format_paging_nav('log', $hash, $head, $page, (100 * ($page+1)));
+       my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#commitlist >= 100);

 
        git_header_html();
        git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
 
        git_header_html();
        git_print_page_nav('log','', $hash,undef,undef, $paging_nav);


@@ -5177,14 +5260,26 @@ sub git_history {
        my $refs = git_get_references();
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
 
        my $refs = git_get_references();
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
 

+       my @commitlist = parse_commits($hash_base, 101, (100 * $page),
+                                      $file_name, "--full-history");
+       if (!@commitlist) {
+               die_error('404 Not Found', "No such file or directory on given branch");
+       }
+

        if (!defined $hash && defined $file_name) {
        if (!defined $hash && defined $file_name) {

-               $hash = git_get_hash_by_path($hash_base, $file_name);
+               # some commits could have deleted file in question,
+               # and not have it in tree, but one of them has to have it
+               for (my $i = 0; $i <= @commitlist; $i++) {
+                       $hash = git_get_hash_by_path($commitlist[$i]{'id'}, $file_name);
+                       last if defined $hash;
+               }

        }
        if (defined $hash) {
                $ftype = git_get_type($hash);
        }
        }
        if (defined $hash) {
                $ftype = git_get_type($hash);
        }

-
-       my @commitlist = parse_commits($hash_base, 101, (100 * $page), $file_name, "--full-history");
+       if (!defined $ftype) {
+               die_error(undef, "Unknown type of object");
+       }

 
        my $paging_nav = '';
        if ($page > 0) {
 
        my $paging_nav = '';
        if ($page > 0) {


@@ -5499,7 +5594,7 @@ sub git_shortlog {
 
        my @commitlist = parse_commits($hash, 101, (100 * $page));
 
 
        my @commitlist = parse_commits($hash, 101, (100 * $page));
 

-       my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, (100 * ($page+1)));
+       my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, $#commitlist >= 100);

        my $next_link = '';
        if ($#commitlist >= 100) {
                $next_link =
        my $next_link = '';
        if ($#commitlist >= 100) {
                $next_link =