v241

diff --git a/gitweb.cgi b/gitweb.cgi
index 378fe2ea88a7ad977e030224da0f5024b1fe0a8f..47c458d88524e817d9d80cb601448c0c353d312b 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -15,14 +15,14 @@ use CGI::Carp qw(fatalsToBrowser);
 use Fcntl ':mode';
 
 my $cgi = new CGI;
-my $version =          "239";
+my $version =          "241";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link = "";
 
 # absolute fs-path which will be prepended to the project path
-my $projectroot =      "/pub/scm";
-$projectroot = "/home/kay/public_html/pub/scm";
+#my $projectroot =     "/pub/scm";
+my $projectroot = "/home/kay/public_html/pub/scm";
 
 # location of the git-core binaries
 my $gitbin =           "/usr/bin";
@@ -488,7 +488,7 @@ sub git_read_commit {
        $co{'comment'} = \@commit_lines;
        foreach my $title (@commit_lines) {
                if ($title ne "") {
-                       $co{'title'} = chop_str($title, 80);
+                       $co{'title'} = chop_str($title, 80, 5);
                        # remove leading stuff of merges to make the interesting part visible
                        if (length($title) > 50) {
                                $title =~ s/^Automatic //;
@@ -506,7 +506,7 @@ sub git_read_commit {
                                        $title =~ s/\/pub\/scm//;
                                }
                        }
-                       $co{'title_short'} = chop_str($title, 50);
+                       $co{'title_short'} = chop_str($title, 50, 5);
                        last;
                }
        }
@@ -621,12 +621,15 @@ sub chop_str {
        my $len = shift;
        my $add_len = shift || 10;
 
-       $str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,$add_len})/;
-       my $chopped = $1;
-       if ($chopped ne $str) {
-               $chopped .= " ...";
+       # 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
+       $str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,$add_len})(.*)/;
+       my $body = $1;
+       my $tail = $2;
+       if (length($tail) > 4) {
+               $tail = " ...";
        }
-       return $chopped;
+       return "$body$tail";
 }
 
 sub file_type {
@@ -977,9 +980,14 @@ sub git_summary {
                if ($i-- > 0) {
                        print "<td><i>$co{'age_string'}</i></td>\n" .
                              "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
-                             "<td>" .
-                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"},
-                             "<b>" . escapeHTML($co{'title_short'}) . "</b>") .
+                             "<td>";
+                       if (length($co{'title_short'}) < length($co{'title'})) {
+                               print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list", -title => "$co{'title'}"},
+                                     "<b>" . escapeHTML($co{'title_short'}) . "</b>");
+                       } else {
+                               print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"},
+                                     "<b>" . escapeHTML($co{'title'}) . "</b>");
+                       }
                              "</td>\n" .
                              "<td class=\"link\">" .
                              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
@@ -1424,7 +1432,9 @@ sub git_rss {
                      "<title>" .
                      sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . escapeHTML($co{'title'}) .
                      "</title>\n" .
+                     "<author>" . escapeHTML($co{'author'}) . "</author>\n" .
                      "<pubDate>$cd{'rfc2822'}</pubDate>\n" .
+                     "<guid isPermaLink=\"true\">" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "</guid>\n" .
                      "<link>" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "</link>\n" .
                      "<description>" . escapeHTML($co{'title'}) . "</description>\n" .
                      "<content:encoded>" .
@@ -2134,7 +2144,7 @@ sub git_search {
                                        next;
                                }
                                push @files, \%set;
-                       } elsif ($line =~ m/^([0-9a-fA-F]{40}) /){
+                       } elsif ($line =~ m/^([0-9a-fA-F]{40})$/){
                                if (%co) {
                                        if ($alternate) {
                                                print "<tr class=\"dark\">\n";
@@ -2227,8 +2237,15 @@ sub git_shortlog {
                $alternate ^= 1;
                print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                      "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
-                     "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "<b>" .
-                     escapeHTML($co{'title_short'}) . "</b>") . "</td>\n" .
+                     "<td>";
+               if (length($co{'title_short'}) < length($co{'title'})) {
+                       print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list", -title => "$co{'title'}"},
+                             "<b>" . escapeHTML($co{'title_short'}) . "</b>");
+               } else {
+                       print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"},
+                             "<b>" . escapeHTML($co{'title_short'}) . "</b>");
+               }
+               print "</td>\n" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .