gitweb: Paginate commit/author/committer search output

[Gitweb] / gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl

index 211223b2439f06d3c5ebdc22ede8ebeeddf7543a7abef9995b3cddfe7510cfb9..784acc89f167366e51728af8861944973077a6d786ddf5d5cab5cea88e0e0181 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -39,7 +39,8 @@ our $home_link_str = "++GITWEB_HOME_LINK_STR++";
  
  # name of your site or organization to appear in page titles
  # replace this with something more descriptive for clearer bookmarks
  
  # name of your site or organization to appear in page titles
  # replace this with something more descriptive for clearer bookmarks
-our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";
+our $site_name = "++GITWEB_SITENAME++"
+                 || ($ENV{'SERVER_NAME'} || "Untitled") . " Git";
  
  # filename of html text to include at top of each page
  our $site_header = "++GITWEB_SITE_HEADER++";
  
  # filename of html text to include at top of each page
  our $site_header = "++GITWEB_SITE_HEADER++";
@@ -50,9 +51,8 @@ our $site_footer = "++GITWEB_SITE_FOOTER++";
  
  # URI of stylesheets
  our @stylesheets = ("++GITWEB_CSS++");
  
  # URI of stylesheets
  our @stylesheets = ("++GITWEB_CSS++");
-our $stylesheet;
-# default is not to define style sheet, but it can be overwritten later
-undef $stylesheet;
+# URI of a single stylesheet, which can be overridden in GITWEB_CONFIG.
+our $stylesheet = undef;
  
  # URI of GIT logo (72x27 size)
  our $logo = "++GITWEB_LOGO++";
  
  # URI of GIT logo (72x27 size)
  our $logo = "++GITWEB_LOGO++";
@@ -77,7 +77,7 @@ our $strict_export = "++GITWEB_STRICT_EXPORT++";
  
  # list of git base URLs used for URL to where fetch project from,
  # i.e. full URL is "$git_base_url/$project"
  
  # list of git base URLs used for URL to where fetch project from,
  # i.e. full URL is "$git_base_url/$project"
-our @git_base_url_list = ("++GITWEB_BASE_URL++");
+our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++");
  
  # default blob_plain mimetype and default charset for text/plain blob
  our $default_blob_plain_mimetype = 'text/plain';
  
  # default blob_plain mimetype and default charset for text/plain blob
  our $default_blob_plain_mimetype = 'text/plain';
@@ -121,7 +121,7 @@ our %feature = (
         # To disable system wide have in $GITWEB_CONFIG
         # $feature{'snapshot'}{'default'} = [undef];
         # To have project specific config enable override in $GITWEB_CONFIG
         # To disable system wide have in $GITWEB_CONFIG
         # $feature{'snapshot'}{'default'} = [undef];
         # To have project specific config enable override in $GITWEB_CONFIG
-       # $feature{'blame'}{'override'} = 1;
+       # $feature{'snapshot'}{'override'} = 1;
         # and in project config gitweb.snapshot = none|gzip|bzip2;
         'snapshot' => {
                 'sub' => \&feature_snapshot,
         # and in project config gitweb.snapshot = none|gzip|bzip2;
         'snapshot' => {
                 'sub' => \&feature_snapshot,
@@ -129,6 +129,12 @@ our %feature = (
                 #         => [content-encoding, suffix, program]
                 'default' => ['x-gzip', 'gz', 'gzip']},
  
                 #         => [content-encoding, suffix, program]
                 'default' => ['x-gzip', 'gz', 'gzip']},
  
+       # Enable text search, which will list the commits which match author,
+       # committer or commit text to a given string.  Enabled by default.
+       'search' => {
+               'override' => 0,
+               'default' => [1]},
+
         # Enable the pickaxe search, which will list the commits that modified
         # a given string in a file. This can be practical and quite faster
         # alternative to 'blame', but still potentially CPU-intensive.
         # Enable the pickaxe search, which will list the commits that modified
         # a given string in a file. This can be practical and quite faster
         # alternative to 'blame', but still potentially CPU-intensive.
@@ -161,6 +167,21 @@ our %feature = (
         'pathinfo' => {
                 'override' => 0,
                 'default' => [0]},
         'pathinfo' => {
                 'override' => 0,
                 'default' => [0]},
+
+       # Make gitweb consider projects in project root subdirectories
+       # to be forks of existing projects. Given project $projname.git,
+       # projects matching $projname/*.git will not be shown in the main
+       # projects list, instead a '+' mark will be added to $projname
+       # there and a 'forks' view will be enabled for the project, listing
+       # all the forks. This feature is supported only if project list
+       # is taken from a directory, not file.
+
+       # To enable system wide have in $GITWEB_CONFIG
+       # $feature{'forks'}{'default'} = [1];
+       # Project specific override is not supported.
+       'forks' => {
+               'override' => 0,
+               'default' => [0]},
  );
  
  sub gitweb_check_feature {
  );
  
  sub gitweb_check_feature {
@@ -337,6 +358,9 @@ if (defined $searchtext) {
         if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
                 die_error(undef, "Invalid search parameter");
         }
         if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
                 die_error(undef, "Invalid search parameter");
         }
+       if (length($searchtext) < 2) {
+               die_error(undef, "At least two characters are required for search parameter");
+       }
         $searchtext = quotemeta $searchtext;
  }
  
         $searchtext = quotemeta $searchtext;
  }
  
@@ -406,10 +430,12 @@ my %actions = (
         "commitdiff" => \&git_commitdiff,
         "commitdiff_plain" => \&git_commitdiff_plain,
         "commit" => \&git_commit,
         "commitdiff" => \&git_commitdiff,
         "commitdiff_plain" => \&git_commitdiff_plain,
         "commit" => \&git_commit,
+       "forks" => \&git_forks,
         "heads" => \&git_heads,
         "history" => \&git_history,
         "log" => \&git_log,
         "rss" => \&git_rss,
         "heads" => \&git_heads,
         "history" => \&git_history,
         "log" => \&git_log,
         "rss" => \&git_rss,
+       "atom" => \&git_atom,
         "search" => \&git_search,
         "search_help" => \&git_search_help,
         "shortlog" => \&git_shortlog,
         "search" => \&git_search,
         "search_help" => \&git_search_help,
         "shortlog" => \&git_shortlog,
@@ -418,6 +444,7 @@ my %actions = (
         "tags" => \&git_tags,
         "tree" => \&git_tree,
         "snapshot" => \&git_snapshot,
         "tags" => \&git_tags,
         "tree" => \&git_tree,
         "snapshot" => \&git_snapshot,
+       "object" => \&git_object,
         # those below don't need $project
         "opml" => \&git_opml,
         "project_list" => \&git_project_list,
         # those below don't need $project
         "opml" => \&git_opml,
         "project_list" => \&git_project_list,
@@ -444,7 +471,8 @@ exit;
  
  sub href(%) {
         my %params = @_;
  
  sub href(%) {
         my %params = @_;
-       my $href = $my_uri;
+       # default is to use -absolute url() i.e. $my_uri
+       my $href = $params{-full} ? $my_url : $my_uri;
  
         # XXX: Warning: If you touch this, check the search form for updating,
         # too.
  
         # XXX: Warning: If you touch this, check the search form for updating,
         # too.
@@ -555,21 +583,93 @@ sub esc_url {
  }
  
  # replace invalid utf8 character with SUBSTITUTION sequence
  }
  
  # replace invalid utf8 character with SUBSTITUTION sequence
-sub esc_html {
+sub esc_html ($;%) {
+       my $str = shift;
+       my %opts = @_;
+
+       $str = to_utf8($str);
+       $str = escapeHTML($str);
+       if ($opts{'-nbsp'}) {
+               $str =~ s/ /&nbsp;/g;
+       }
+       $str =~ s|([[:cntrl:]])|(($1 ne "\t") ? quot_cec($1) : $1)|eg;
+       return $str;
+}
+
+# quote control characters and escape filename to HTML
+sub esc_path {
         my $str = shift;
         my $str = shift;
+       my %opts = @_;
+
         $str = to_utf8($str);
         $str = escapeHTML($str);
         $str = to_utf8($str);
         $str = escapeHTML($str);
-       $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
-       $str =~ s/\033/^[/g; # "escape" ESCAPE (\e) character (e.g. commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1)
+       if ($opts{'-nbsp'}) {
+               $str =~ s/ /&nbsp;/g;
+       }
+       $str =~ s|([[:cntrl:]])|quot_cec($1)|eg;
         return $str;
  }
  
         return $str;
  }
  
+# Make control characters "printable", using character escape codes (CEC)
+sub quot_cec {
+       my $cntrl = shift;
+       my %es = ( # character escape codes, aka escape sequences
+                  "\t" => '\t',   # tab            (HT)
+                  "\n" => '\n',   # line feed      (LF)
+                  "\r" => '\r',   # carrige return (CR)
+                  "\f" => '\f',   # form feed      (FF)
+                  "\b" => '\b',   # backspace      (BS)
+                  "\a" => '\a',   # alarm (bell)   (BEL)
+                  "\e" => '\e',   # escape         (ESC)
+                  "\013" => '\v', # vertical tab   (VT)
+                  "\000" => '\0', # nul character  (NUL)
+                  );
+       my $chr = ( (exists $es{$cntrl})
+                   ? $es{$cntrl}
+                   : sprintf('\%03o', ord($cntrl)) );
+       return "<span class=\"cntrl\">$chr</span>";
+}
+
+# Alternatively use unicode control pictures codepoints,
+# Unicode "printable representation" (PR)
+sub quot_upr {
+       my $cntrl = shift;
+       my $chr = sprintf('&#%04d;', 0x2400+ord($cntrl));
+       return "<span class=\"cntrl\">$chr</span>";
+}
+
  # git may return quoted and escaped filenames
  sub unquote {
         my $str = shift;
  # git may return quoted and escaped filenames
  sub unquote {
         my $str = shift;
+
+       sub unq {
+               my $seq = shift;
+               my %es = ( # character escape codes, aka escape sequences
+                       't' => "\t",   # tab            (HT, TAB)
+                       'n' => "\n",   # newline        (NL)
+                       'r' => "\r",   # return         (CR)
+                       'f' => "\f",   # form feed      (FF)
+                       'b' => "\b",   # backspace      (BS)
+                       'a' => "\a",   # alarm (bell)   (BEL)
+                       'e' => "\e",   # escape         (ESC)
+                       'v' => "\013", # vertical tab   (VT)
+               );
+
+               if ($seq =~ m/^[0-7]{1,3}$/) {
+                       # octal char sequence
+                       return chr(oct($seq));
+               } elsif (exists $es{$seq}) {
+                       # C escape sequence, aka character escape code
+                       return $es{$seq}
+               }
+               # quoted ordinary character
+               return $seq;
+       }
+
         if ($str =~ m/^"(.*)"$/) {
         if ($str =~ m/^"(.*)"$/) {
+               # needs unquoting
                 $str = $1;
                 $str = $1;
-               $str =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
+               $str =~ s/\\([^0-7]|[0-7]{1,3})/unq($1)/eg;
         }
         return $str;
  }
         }
         return $str;
  }
@@ -703,24 +803,47 @@ sub file_type {
         }
  }
  
         }
  }
  
+# convert file mode in octal to file type description string
+sub file_type_long {
+       my $mode = shift;
+
+       if ($mode !~ m/^[0-7]+$/) {
+               return $mode;
+       } else {
+               $mode = oct $mode;
+       }
+
+       if (S_ISDIR($mode & S_IFMT)) {
+               return "directory";
+       } elsif (S_ISLNK($mode)) {
+               return "symlink";
+       } elsif (S_ISREG($mode)) {
+               if ($mode & S_IXUSR) {
+                       return "executable";
+               } else {
+                       return "file";
+               };
+       } else {
+               return "unknown";
+       }
+}
+
+
  ## ----------------------------------------------------------------------
  ## functions returning short HTML fragments, or transforming HTML fragments
  ## which don't beling to other sections
  
  ## ----------------------------------------------------------------------
  ## functions returning short HTML fragments, or transforming HTML fragments
  ## which don't beling to other sections
  
-# format line of commit message or tag comment
+# format line of commit message.
  sub format_log_line_html {
         my $line = shift;
  
  sub format_log_line_html {
         my $line = shift;
  
-       $line = esc_html($line);
-       $line =~ s/ /&nbsp;/g;
-       if ($line =~ m/([0-9a-fA-F]{40})/) {
+       $line = esc_html($line, -nbsp=>1);
+       if ($line =~ m/([0-9a-fA-F]{8,40})/) {
                 my $hash_text = $1;
                 my $hash_text = $1;
-               if (git_get_type($hash_text) eq "commit") {
-                       my $link =
-                               $cgi->a({-href => href(action=>"commit", hash=>$hash_text),
-                                       -class => "text"}, $hash_text);
-                       $line =~ s/$hash_text/$link/;
-               }
+               my $link =
+                       $cgi->a({-href => href(action=>"object", hash=>$hash_text),
+                               -class => "text"}, $hash_text);
+               $line =~ s/$hash_text/$link/;
         }
         return $line;
  }
         }
         return $line;
  }
@@ -742,7 +865,8 @@ sub format_ref_marker {
                                 $name = $ref;
                         }
  
                                 $name = $ref;
                         }
  
-                       $markers .= " <span class=\"$type\">" . esc_html($name) . "</span>";
+                       $markers .= " <span class=\"$type\" title=\"$ref\">" .
+                                   esc_html($name) . "</span>";
                 }
         }
  
                 }
         }
  
@@ -768,8 +892,10 @@ sub format_subject_html {
         }
  }
  
         }
  }
  
+# format patch (diff) line (rather not to be used for diff headers)
  sub format_diff_line {
         my $line = shift;
  sub format_diff_line {
         my $line = shift;
+       my ($from, $to) = @_;
         my $char = substr($line, 0, 1);
         my $diff_class = "";
  
         my $char = substr($line, 0, 1);
         my $diff_class = "";
  
@@ -785,7 +911,26 @@ sub format_diff_line {
                 $diff_class = " incomplete";
         }
         $line = untabify($line);
                 $diff_class = " incomplete";
         }
         $line = untabify($line);
-       return "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
+       if ($from && $to && $line =~ m/^\@{2} /) {
+               my ($from_text, $from_start, $from_lines, $to_text, $to_start, $to_lines, $section) =
+                       $line =~ m/^\@{2} (-(\d+)(?:,(\d+))?) (\+(\d+)(?:,(\d+))?) \@{2}(.*)$/;
+
+               $from_lines = 0 unless defined $from_lines;
+               $to_lines   = 0 unless defined $to_lines;
+
+               if ($from->{'href'}) {
+                       $from_text = $cgi->a({-href=>"$from->{'href'}#l$from_start",
+                                            -class=>"list"}, $from_text);
+               }
+               if ($to->{'href'}) {
+                       $to_text   = $cgi->a({-href=>"$to->{'href'}#l$to_start",
+                                            -class=>"list"}, $to_text);
+               }
+               $line = "<span class=\"chunk_info\">@@ $from_text $to_text @@</span>" .
+                       "<span class=\"section\">" . esc_html($section, -nbsp=>1) . "</span>";
+               return "<div class=\"diff$diff_class\">$line</div>\n";
+       }
+       return "<div class=\"diff$diff_class\">" . esc_html($line, -nbsp=>1) . "</div>\n";
  }
  
  ## ----------------------------------------------------------------------
  }
  
  ## ----------------------------------------------------------------------
@@ -861,7 +1006,7 @@ sub git_get_hash_by_path {
         close $fd or return undef;
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
         close $fd or return undef;
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
-       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
+       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t/;
         if (defined $type && $type ne $2) {
                 # type doesn't match
                 return undef;
         if (defined $type && $type ne $2) {
                 # type doesn't match
                 return undef;
@@ -893,13 +1038,21 @@ sub git_get_project_url_list {
  }
  
  sub git_get_projects_list {
  }
  
  sub git_get_projects_list {
+       my ($filter) = @_;
         my @list;
  
         my @list;
  
+       $filter ||= '';
+       $filter =~ s/\.git$//;
+
         if (-d $projects_list) {
                 # search in directory
         if (-d $projects_list) {
                 # search in directory
-               my $dir = $projects_list;
+               my $dir = $projects_list . ($filter ? "/$filter" : '');
+               # remove the trailing "/"
+               $dir =~ s!/+$!!;
                 my $pfxlen = length("$dir");
  
                 my $pfxlen = length("$dir");
  
+               my ($check_forks) = gitweb_check_feature('forks');
+
                 File::Find::find({
                         follow_fast => 1, # follow symbolic links
                         dangling_symlinks => 0, # ignore dangling symlinks, silently
                 File::Find::find({
                         follow_fast => 1, # follow symbolic links
                         dangling_symlinks => 0, # ignore dangling symlinks, silently
@@ -911,8 +1064,10 @@ sub git_get_projects_list {
  
                                 my $subdir = substr($File::Find::name, $pfxlen + 1);
                                 # we check related file in $projectroot
  
                                 my $subdir = substr($File::Find::name, $pfxlen + 1);
                                 # we check related file in $projectroot
-                               if (check_export_ok("$projectroot/$subdir")) {
-                                       push @list, { path => $subdir };
+                               if ($check_forks and $subdir =~ m#/.#) {
+                                       $File::Find::prune = 1;
+                               } elsif (check_export_ok("$projectroot/$filter/$subdir")) {
+                                       push @list, { path => ($filter ? "$filter/" : '') . $subdir };
                                         $File::Find::prune = 1;
                                 }
                         },
                                         $File::Find::prune = 1;
                                 }
                         },
@@ -932,6 +1087,17 @@ sub git_get_projects_list {
                         if (!defined $path) {
                                 next;
                         }
                         if (!defined $path) {
                                 next;
                         }
+                       if ($filter ne '') {
+                               # looking for forks;
+                               my $pfx = substr($path, 0, length($filter));
+                               if ($pfx ne $filter) {
+                                       next;
+                               }
+                               my $sfx = substr($path, length($filter));
+                               if ($sfx !~ /^\/.*\.git$/) {
+                                       next;
+                               }
+                       }
                         if (check_export_ok("$projectroot/$path")) {
                                 my $pr = {
                                         path => $path,
                         if (check_export_ok("$projectroot/$path")) {
                                 my $pr = {
                                         path => $path,
@@ -977,17 +1143,37 @@ sub git_get_project_owner {
         return $owner;
  }
  
         return $owner;
  }
  
+sub git_get_last_activity {
+       my ($path) = @_;
+       my $fd;
+
+       $git_dir = "$projectroot/$path";
+       open($fd, "-|", git_cmd(), 'for-each-ref',
+            '--format=%(committer)',
+            '--sort=-committerdate',
+            '--count=1',
+            'refs/heads') or return;
+       my $most_recent = <$fd>;
+       close $fd or return;
+       if ($most_recent =~ / (\d+) [-+][01]\d\d\d$/) {
+               my $timestamp = $1;
+               my $age = time - $timestamp;
+               return ($age, age_string($age));
+       }
+}
+
  sub git_get_references {
         my $type = shift || "";
         my %refs;
  sub git_get_references {
         my $type = shift || "";
         my %refs;
-       # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c      refs/tags/v2.6.11
-       # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
-       open my $fd, "-|", $GIT, "peek-remote", "$projectroot/$project/"
+       # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
+       # c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
+       open my $fd, "-|", git_cmd(), "show-ref", "--dereference",
+               ($type ? ("--", "refs/$type") : ()) # use -- <pattern> if $type
                 or return;
  
         while (my $line = <$fd>) {
                 chomp $line;
                 or return;
  
         while (my $line = <$fd>) {
                 chomp $line;
-               if ($line =~ m/^([0-9a-fA-F]{40})\trefs\/($type\/?[^\^]+)/) {
+               if ($line =~ m!^([0-9a-fA-F]{40})\srefs/($type/?[^^]+)!) {
                         if (defined $refs{$1}) {
                                 push @{$refs{$1}}, $2;
                         } else {
                         if (defined $refs{$1}) {
                                 push @{$refs{$1}}, $2;
                         } else {
@@ -1031,10 +1217,12 @@ sub parse_date {
         $date{'mday'} = $mday;
         $date{'day'} = $days[$wday];
         $date{'month'} = $months[$mon];
         $date{'mday'} = $mday;
         $date{'day'} = $days[$wday];
         $date{'month'} = $months[$mon];
-       $date{'rfc2822'} = sprintf "%s, %d %s %4d %02d:%02d:%02d +0000",
-                          $days[$wday], $mday, $months[$mon], 1900+$year, $hour ,$min, $sec;
+       $date{'rfc2822'}   = sprintf "%s, %d %s %4d %02d:%02d:%02d +0000",
+                            $days[$wday], $mday, $months[$mon], 1900+$year, $hour ,$min, $sec;
         $date{'mday-time'} = sprintf "%d %s %02d:%02d",
                              $mday, $months[$mon], $hour ,$min;
         $date{'mday-time'} = sprintf "%d %s %02d:%02d",
                              $mday, $months[$mon], $hour ,$min;
+       $date{'iso-8601'}  = sprintf "%04d-%02d-%02dT%02d:%02d:%02dZ",
+                            1900+$year, $mon, $mday, $hour ,$min, $sec;
  
         $tz =~ m/^([+\-][0-9][0-9])([0-9][0-9])$/;
         my $local = $epoch + ((int $1 + ($2/60)) * 3600);
  
         $tz =~ m/^([+\-][0-9][0-9])([0-9][0-9])$/;
         my $local = $epoch + ((int $1 + ($2/60)) * 3600);
@@ -1042,9 +1230,9 @@ sub parse_date {
         $date{'hour_local'} = $hour;
         $date{'minute_local'} = $min;
         $date{'tz_local'} = $tz;
         $date{'hour_local'} = $hour;
         $date{'minute_local'} = $min;
         $date{'tz_local'} = $tz;
-       $date{'iso-tz'} = sprintf ("%04d-%02d-%02d %02d:%02d:%02d %s",
-                                  1900+$year, $mon+1, $mday,
-                                  $hour, $min, $sec, $tz);
+       $date{'iso-tz'} = sprintf("%04d-%02d-%02d %02d:%02d:%02d %s",
+                                 1900+$year, $mon+1, $mday,
+                                 $hour, $min, $sec, $tz);
         return %date;
  }
  
         return %date;
  }
  
@@ -1083,24 +1271,6 @@ sub parse_tag {
         return %tag
  }
  
         return %tag
  }
  
-sub git_get_last_activity {
-       my ($path) = @_;
-       my $fd;
-
-       $git_dir = "$projectroot/$path";
-       open($fd, "-|", git_cmd(), 'for-each-ref',
-            '--format=%(refname) %(committer)',
-            '--sort=-committerdate',
-            'refs/heads') or return;
-       my $most_recent = <$fd>;
-       close $fd or return;
-       if ($most_recent =~ / (\d+) [-+][01]\d\d\d$/) {
-               my $timestamp = $1;
-               my $age = time - $timestamp;
-               return ($age, age_string($age));
-       }
-}
-
  sub parse_commit {
         my $commit_id = shift;
         my $commit_text = shift;
  sub parse_commit {
         my $commit_id = shift;
         my $commit_text = shift;
@@ -1112,7 +1282,9 @@ sub parse_commit {
                 @commit_lines = @$commit_text;
         } else {
                 local $/ = "\0";
                 @commit_lines = @$commit_text;
         } else {
                 local $/ = "\0";
-               open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", "--max-count=1", $commit_id
+               open my $fd, "-|", git_cmd(), "rev-list",
+                       "--header", "--parents", "--max-count=1",
+                       $commit_id, "--"
                         or return;
                 @commit_lines = split '\n', <$fd>;
                 close $fd or return;
                         or return;
                 @commit_lines = split '\n', <$fd>;
                 close $fd or return;
@@ -1133,8 +1305,9 @@ sub parse_commit {
                         $co{'author'} = $1;
                         $co{'author_epoch'} = $2;
                         $co{'author_tz'} = $3;
                         $co{'author'} = $1;
                         $co{'author_epoch'} = $2;
                         $co{'author_tz'} = $3;
-                       if ($co{'author'} =~ m/^([^<]+) </) {
-                               $co{'author_name'} = $1;
+                       if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) {
+                               $co{'author_name'}  = $1;
+                               $co{'author_email'} = $2;
                         } else {
                                 $co{'author_name'} = $co{'author'};
                         }
                         } else {
                                 $co{'author_name'} = $co{'author'};
                         }
@@ -1143,7 +1316,12 @@ sub parse_commit {
                         $co{'committer_epoch'} = $2;
                         $co{'committer_tz'} = $3;
                         $co{'committer_name'} = $co{'committer'};
                         $co{'committer_epoch'} = $2;
                         $co{'committer_tz'} = $3;
                         $co{'committer_name'} = $co{'committer'};
-                       $co{'committer_name'} =~ s/ <.*//;
+                       if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) {
+                               $co{'committer_name'}  = $1;
+                               $co{'committer_email'} = $2;
+                       } else {
+                               $co{'committer_name'} = $co{'committer'};
+                       }
                 }
         }
         if (!defined $co{'tree'}) {
                 }
         }
         if (!defined $co{'tree'}) {
@@ -1276,7 +1454,7 @@ sub parse_ls_tree_line ($;%) {
         my %res;
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
         my %res;
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
-       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
+       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/s;
  
         $res{'mode'} = $1;
         $res{'type'} = $2;
  
         $res{'mode'} = $1;
         $res{'type'} = $2;
@@ -1293,47 +1471,88 @@ sub parse_ls_tree_line ($;%) {
  ## ......................................................................
  ## parse to array of hashes functions
  
  ## ......................................................................
  ## parse to array of hashes functions
  
-sub git_get_refs_list {
-       my $type = shift || "";
-       my %refs;
-       my @reflist;
+sub git_get_heads_list {
+       my $limit = shift;
+       my @headslist;
  
  
-       my @refs;
-       open my $fd, "-|", $GIT, "peek-remote", "$projectroot/$project/"
+       open my $fd, '-|', git_cmd(), 'for-each-ref',
+               ($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
+               '--format=%(objectname) %(refname) %(subject)%00%(committer)',
+               'refs/heads'
                 or return;
         while (my $line = <$fd>) {
                 or return;
         while (my $line = <$fd>) {
-               chomp $line;
-               if ($line =~ m/^([0-9a-fA-F]{40})\trefs\/($type\/?([^\^]+))(\^\{\})?$/) {
-                       if (defined $refs{$1}) {
-                               push @{$refs{$1}}, $2;
-                       } else {
-                               $refs{$1} = [ $2 ];
-                       }
+               my %ref_item;
  
  
-                       if (! $4) { # unpeeled, direct reference
-                               push @refs, { hash => $1, name => $3 }; # without type
-                       } elsif ($3 eq $refs[-1]{'name'}) {
-                               # most likely a tag is followed by its peeled
-                               # (deref) one, and when that happens we know the
-                               # previous one was of type 'tag'.
-                               $refs[-1]{'type'} = "tag";
-                       }
+               chomp $line;
+               my ($refinfo, $committerinfo) = split(/\0/, $line);
+               my ($hash, $name, $title) = split(' ', $refinfo, 3);
+               my ($committer, $epoch, $tz) =
+                       ($committerinfo =~ /^(.*) ([0-9]+) (.*)$/);
+               $name =~ s!^refs/heads/!!;
+
+               $ref_item{'name'}  = $name;
+               $ref_item{'id'}    = $hash;
+               $ref_item{'title'} = $title || '(no commit message)';
+               $ref_item{'epoch'} = $epoch;
+               if ($epoch) {
+                       $ref_item{'age'} = age_string(time - $ref_item{'epoch'});
+               } else {
+                       $ref_item{'age'} = "unknown";
                 }
                 }
+
+               push @headslist, \%ref_item;
         }
         close $fd;
  
         }
         close $fd;
  
-       foreach my $ref (@refs) {
-               my $ref_file = $ref->{'name'};
-               my $ref_id   = $ref->{'hash'};
+       return wantarray ? @headslist : \@headslist;
+}
+
+sub git_get_tags_list {
+       my $limit = shift;
+       my @tagslist;
+
+       open my $fd, '-|', git_cmd(), 'for-each-ref',
+               ($limit ? '--count='.($limit+1) : ()), '--sort=-creatordate',
+               '--format=%(objectname) %(objecttype) %(refname) '.
+               '%(*objectname) %(*objecttype) %(subject)%00%(creator)',
+               'refs/tags'
+               or return;
+       while (my $line = <$fd>) {
+               my %ref_item;
+
+               chomp $line;
+               my ($refinfo, $creatorinfo) = split(/\0/, $line);
+               my ($id, $type, $name, $refid, $reftype, $title) = split(' ', $refinfo, 6);
+               my ($creator, $epoch, $tz) =
+                       ($creatorinfo =~ /^(.*) ([0-9]+) (.*)$/);
+               $name =~ s!^refs/tags/!!;
+
+               $ref_item{'type'} = $type;
+               $ref_item{'id'} = $id;
+               $ref_item{'name'} = $name;
+               if ($type eq "tag") {
+                       $ref_item{'subject'} = $title;
+                       $ref_item{'reftype'} = $reftype;
+                       $ref_item{'refid'}   = $refid;
+               } else {
+                       $ref_item{'reftype'} = $type;
+                       $ref_item{'refid'}   = $id;
+               }
  
  
-               my $type = $ref->{'type'} || git_get_type($ref_id) || next;
-               my %ref_item = parse_ref($ref_file, $ref_id, $type);
+               if ($type eq "tag" || $type eq "commit") {
+                       $ref_item{'epoch'} = $epoch;
+                       if ($epoch) {
+                               $ref_item{'age'} = age_string(time - $ref_item{'epoch'});
+                       } else {
+                               $ref_item{'age'} = "unknown";
+                       }
+               }
  
  
-               push @reflist, \%ref_item;
+               push @tagslist, \%ref_item;
         }
         }
-       # sort refs by age
-       @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
-       return (\@reflist, \%refs);
+       close $fd;
+
+       return wantarray ? @tagslist : \@tagslist;
  }
  
  ## ----------------------------------------------------------------------
  }
  
  ## ----------------------------------------------------------------------
@@ -1430,13 +1649,13 @@ sub git_header_html {
         my $status = shift || "200 OK";
         my $expires = shift;
  
         my $status = shift || "200 OK";
         my $expires = shift;
  
-       my $title = "$site_name git";
+       my $title = "$site_name";
         if (defined $project) {
                 $title .= " - $project";
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
         if (defined $project) {
                 $title .= " - $project";
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
-                               $title .= " - " . esc_html($file_name);
+                               $title .= " - " . esc_path($file_name);
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
@@ -1480,14 +1699,17 @@ EOF
                 }
         }
         if (defined $project) {
                 }
         }
         if (defined $project) {
-               printf('<link rel="alternate" title="%s log" '.
-                      'href="%s" type="application/rss+xml"/>'."\n",
+               printf('<link rel="alternate" title="%s log RSS feed" '.
+                      'href="%s" type="application/rss+xml" />'."\n",
                        esc_param($project), href(action=>"rss"));
                        esc_param($project), href(action=>"rss"));
+               printf('<link rel="alternate" title="%s log Atom feed" '.
+                      'href="%s" type="application/atom+xml" />'."\n",
+                      esc_param($project), href(action=>"atom"));
         } else {
                 printf('<link rel="alternate" title="%s projects list" '.
                        'href="%s" type="text/plain; charset=utf-8"/>'."\n",
                        $site_name, href(project=>undef, action=>"project_index"));
         } else {
                 printf('<link rel="alternate" title="%s projects list" '.
                        'href="%s" type="text/plain; charset=utf-8"/>'."\n",
                        $site_name, href(project=>undef, action=>"project_index"));
-               printf('<link rel="alternate" title="%s projects logs" '.
+               printf('<link rel="alternate" title="%s projects feeds" '.
                        'href="%s" type="text/x-opml"/>'."\n",
                        $site_name, href(project=>undef, action=>"opml"));
         }
                        'href="%s" type="text/x-opml"/>'."\n",
                        $site_name, href(project=>undef, action=>"opml"));
         }
@@ -1515,6 +1737,9 @@ EOF
                         print " / $action";
                 }
                 print "\n";
                         print " / $action";
                 }
                 print "\n";
+       }
+       my ($have_search) = gitweb_check_feature('search');
+       if ((defined $project) && ($have_search)) {
                 if (!defined $searchtext) {
                         $searchtext = "";
                 }
                 if (!defined $searchtext) {
                         $searchtext = "";
                 }
@@ -1553,7 +1778,9 @@ sub git_footer_html {
                         print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
                 }
                 print $cgi->a({-href => href(action=>"rss"),
                         print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
                 }
                 print $cgi->a({-href => href(action=>"rss"),
-                             -class => "rss_logo"}, "RSS") . "\n";
+                             -class => "rss_logo"}, "RSS") . " ";
+               print $cgi->a({-href => href(action=>"atom"),
+                             -class => "rss_logo"}, "Atom") . "\n";
         } else {
                 print $cgi->a({-href => href(project=>undef, action=>"opml"),
                               -class => "rss_logo"}, "OPML") . " ";
         } else {
                 print $cgi->a({-href => href(project=>undef, action=>"opml"),
                               -class => "rss_logo"}, "OPML") . " ";
@@ -1707,20 +1934,20 @@ sub git_print_page_path {
                         $fullname .= ($fullname ? '/' : '') . $dir;
                         print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                      hash_base=>$hb),
                         $fullname .= ($fullname ? '/' : '') . $dir;
                         print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                      hash_base=>$hb),
-                                     -title => $fullname}, esc_html($dir));
+                                     -title => esc_html($fullname)}, esc_path($dir));
                         print " / ";
                 }
                 if (defined $type && $type eq 'blob') {
                         print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                      hash_base=>$hb),
                         print " / ";
                 }
                 if (defined $type && $type eq 'blob') {
                         print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                      hash_base=>$hb),
-                                     -title => $name}, esc_html($basename));
+                                     -title => esc_html($name)}, esc_path($basename));
                 } elsif (defined $type && $type eq 'tree') {
                         print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                      hash_base=>$hb),
                 } elsif (defined $type && $type eq 'tree') {
                         print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                      hash_base=>$hb),
-                                     -title => $name}, esc_html($basename));
+                                     -title => esc_html($name)}, esc_path($basename));
                         print " / ";
                 } else {
                         print " / ";
                 } else {
-                       print esc_html($basename);
+                       print esc_path($basename);
                 }
         }
         print "<br/></div>\n";
                 }
         }
         print "<br/></div>\n";
@@ -1776,13 +2003,65 @@ sub git_print_log ($;%) {
         }
  }
  
         }
  }
  
-sub git_print_simplified_log {
-       my $log = shift;
-       my $remove_title = shift;
+# return link target (what link points to)
+sub git_get_link_target {
+       my $hash = shift;
+       my $link_target;
+
+       # read link
+       open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+               or return;
+       {
+               local $/;
+               $link_target = <$fd>;
+       }
+       close $fd
+               or return;
+
+       return $link_target;
+}
+
+# given link target, and the directory (basedir) the link is in,
+# return target of link relative to top directory (top tree);
+# return undef if it is not possible (including absolute links).
+sub normalize_link_target {
+       my ($link_target, $basedir, $hash_base) = @_;
+
+       # we can normalize symlink target only if $hash_base is provided
+       return unless $hash_base;
+
+       # absolute symlinks (beginning with '/') cannot be normalized
+       return if (substr($link_target, 0, 1) eq '/');
+
+       # normalize link target to path from top (root) tree (dir)
+       my $path;
+       if ($basedir) {
+               $path = $basedir . '/' . $link_target;
+       } else {
+               # we are in top (root) tree (dir)
+               $path = $link_target;
+       }
+
+       # remove //, /./, and /../
+       my @path_parts;
+       foreach my $part (split('/', $path)) {
+               # discard '.' and ''
+               next if (!$part || $part eq '.');
+               # handle '..'
+               if ($part eq '..') {
+                       if (@path_parts) {
+                               pop @path_parts;
+                       } else {
+                               # link leads outside repository (outside top dir)
+                               return;
+                       }
+               } else {
+                       push @path_parts, $part;
+               }
+       }
+       $path = join('/', @path_parts);
  
  
-       git_print_log($log,
-               -final_empty_line=> 1,
-               -remove_title => $remove_title);
+       return $path;
  }
  
  # print tree entry (row of git_tree), but without encompassing <tr> element
  }
  
  # print tree entry (row of git_tree), but without encompassing <tr> element
@@ -1790,7 +2069,7 @@ sub git_print_tree_entry {
         my ($t, $basedir, $hash_base, $have_blame) = @_;
  
         my %base_key = ();
         my ($t, $basedir, $hash_base, $have_blame) = @_;
  
         my %base_key = ();
-       $base_key{hash_base} = $hash_base if defined $hash_base;
+       $base_key{'hash_base'} = $hash_base if defined $hash_base;
  
         # The format of a table row is: mode list link.  Where mode is
         # the mode of the entry, list is the name of the entry, an href,
  
         # The format of a table row is: mode list link.  Where mode is
         # the mode of the entry, list is the name of the entry, an href,
@@ -1801,16 +2080,31 @@ sub git_print_tree_entry {
                 print "<td class=\"list\">" .
                         $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
                                                file_name=>"$basedir$t->{'name'}", %base_key),
                 print "<td class=\"list\">" .
                         $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
                                                file_name=>"$basedir$t->{'name'}", %base_key),
-                               -class => "list"}, esc_html($t->{'name'})) . "</td>\n";
+                               -class => "list"}, esc_path($t->{'name'}));
+               if (S_ISLNK(oct $t->{'mode'})) {
+                       my $link_target = git_get_link_target($t->{'hash'});
+                       if ($link_target) {
+                               my $norm_target = normalize_link_target($link_target, $basedir, $hash_base);
+                               if (defined $norm_target) {
+                                       print " -> " .
+                                             $cgi->a({-href => href(action=>"object", hash_base=>$hash_base,
+                                                                    file_name=>$norm_target),
+                                                      -title => $norm_target}, esc_path($link_target));
+                               } else {
+                                       print " -> " . esc_path($link_target);
+                               }
+                       }
+               }
+               print "</td>\n";
                 print "<td class=\"link\">";
                 print $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
                 print "<td class=\"link\">";
                 print $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
-                                            file_name=>"$basedir$t->{'name'}", %base_key)},
-                             "blob");
+                                            file_name=>"$basedir$t->{'name'}", %base_key)},
+                             "blob");
                 if ($have_blame) {
                         print " | " .
                               $cgi->a({-href => href(action=>"blame", hash=>$t->{'hash'},
                 if ($have_blame) {
                         print " | " .
                               $cgi->a({-href => href(action=>"blame", hash=>$t->{'hash'},
-                                                          file_name=>"$basedir$t->{'name'}", %base_key)},
-                                           "blame");
+                                                    file_name=>"$basedir$t->{'name'}", %base_key)},
+                                     "blame");
                 }
                 if (defined $hash_base) {
                         print " | " .
                 }
                 if (defined $hash_base) {
                         print " | " .
@@ -1828,12 +2122,12 @@ sub git_print_tree_entry {
                 print "<td class=\"list\">";
                 print $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
                                              file_name=>"$basedir$t->{'name'}", %base_key)},
                 print "<td class=\"list\">";
                 print $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
                                              file_name=>"$basedir$t->{'name'}", %base_key)},
-                             esc_html($t->{'name'}));
+                             esc_path($t->{'name'}));
                 print "</td>\n";
                 print "<td class=\"link\">";
                 print $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
                 print "</td>\n";
                 print "<td class=\"link\">";
                 print $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
-                                            file_name=>"$basedir$t->{'name'}", %base_key)},
-                             "tree");
+                                            file_name=>"$basedir$t->{'name'}", %base_key)},
+                             "tree");
                 if (defined $hash_base) {
                         print " | " .
                               $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
                 if (defined $hash_base) {
                         print " | " .
                               $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
@@ -1849,7 +2143,7 @@ sub git_print_tree_entry {
  
  sub git_difftree_body {
         my ($difftree, $hash, $parent) = @_;
  
  sub git_difftree_body {
         my ($difftree, $hash, $parent) = @_;
-
+       my ($have_blame) = gitweb_check_feature('blame');
         print "<div class=\"list_head\">\n";
         if ($#{$difftree} > 10) {
                 print(($#{$difftree} + 1) . " files changed:\n");
         print "<div class=\"list_head\">\n";
         if ($#{$difftree} > 10) {
                 print(($#{$difftree} + 1) . " files changed:\n");
@@ -1893,7 +2187,7 @@ sub git_difftree_body {
                         print "<td>";
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
                         print "<td>";
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
-                                     -class => "list"}, esc_html($diff{'file'}));
+                                     -class => "list"}, esc_path($diff{'file'}));
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
@@ -1901,7 +2195,11 @@ sub git_difftree_body {
                                 # link to patch
                                 $patchno++;
                                 print $cgi->a({-href => "#patch$patchno"}, "patch");
                                 # link to patch
                                 $patchno++;
                                 print $cgi->a({-href => "#patch$patchno"}, "patch");
+                               print " | ";
                         }
                         }
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff{'file'})},
+                                     "blob") . " | ";
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
@@ -1909,7 +2207,7 @@ sub git_difftree_body {
                         print "<td>";
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                      hash_base=>$parent, file_name=>$diff{'file'}),
                         print "<td>";
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                      hash_base=>$parent, file_name=>$diff{'file'}),
-                                      -class => "list"}, esc_html($diff{'file'}));
+                                      -class => "list"}, esc_path($diff{'file'}));
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
@@ -1921,10 +2219,12 @@ sub git_difftree_body {
                         }
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                      hash_base=>$parent, file_name=>$diff{'file'})},
                         }
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                      hash_base=>$parent, file_name=>$diff{'file'})},
-                                     "blob") . " | ";
-                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
-                                                    file_name=>$diff{'file'})},
-                                     "blame") . " | ";
+                                     "blob") . " | ";
+                       if ($have_blame) {
+                               print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
+                                                            file_name=>$diff{'file'})},
+                                             "blame") . " | ";
+                       }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
                                                      file_name=>$diff{'file'})},
                                       "history");
                         print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
                                                      file_name=>$diff{'file'})},
                                       "history");
@@ -1949,30 +2249,32 @@ sub git_difftree_body {
                         print "<td>";
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
                         print "<td>";
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
-                                     -class => "list"}, esc_html($diff{'file'}));
+                                     -class => "list"}, esc_path($diff{'file'}));
                         print "</td>\n";
                         print "<td>$mode_chnge</td>\n";
                         print "<td class=\"link\">";
                         print "</td>\n";
                         print "<td>$mode_chnge</td>\n";
                         print "<td class=\"link\">";
-                       if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
-                               if ($action eq 'commitdiff') {
-                                       # link to patch
-                                       $patchno++;
-                                       print $cgi->a({-href => "#patch$patchno"}, "patch");
-                               } else {
-                                       print $cgi->a({-href => href(action=>"blobdiff",
-                                                                    hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
-                                                                    hash_base=>$hash, hash_parent_base=>$parent,
-                                                                    file_name=>$diff{'file'})},
-                                                     "diff");
-                               }
-                               print " | ";
+                       if ($action eq 'commitdiff') {
+                               # link to patch
+                               $patchno++;
+                               print $cgi->a({-href => "#patch$patchno"}, "patch") .
+                                     " | ";
+                       } elsif ($diff{'to_id'} ne $diff{'from_id'}) {
+                               # "commit" view and modified file (not onlu mode changed)
+                               print $cgi->a({-href => href(action=>"blobdiff",
+                                                            hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                            hash_base=>$hash, hash_parent_base=>$parent,
+                                                            file_name=>$diff{'file'})},
+                                             "diff") .
+                                     " | ";
                         }
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                         }
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                    hash_base=>$hash, file_name=>$diff{'file'})},
-                                     "blob") . " | ";
-                       print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
-                                                    file_name=>$diff{'file'})},
-                                     "blame") . " | ";
+                                                    hash_base=>$hash, file_name=>$diff{'file'})},
+                                      "blob") . " | ";
+                       if ($have_blame) {
+                               print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
+                                                            file_name=>$diff{'file'})},
+                                             "blame") . " | ";
+                       }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
                                                      file_name=>$diff{'file'})},
                                       "history");
                         print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
                                                      file_name=>$diff{'file'})},
                                       "history");
@@ -1989,35 +2291,37 @@ sub git_difftree_body {
                         print "<td>" .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
                                                      hash=>$diff{'to_id'}, file_name=>$diff{'to_file'}),
                         print "<td>" .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
                                                      hash=>$diff{'to_id'}, file_name=>$diff{'to_file'}),
-                                     -class => "list"}, esc_html($diff{'to_file'})) . "</td>\n" .
+                                     -class => "list"}, esc_path($diff{'to_file'})) . "</td>\n" .
                               "<td><span class=\"file_status $nstatus\">[$nstatus from " .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$parent,
                                                      hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
                               "<td><span class=\"file_status $nstatus\">[$nstatus from " .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$parent,
                                                      hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
-                                     -class => "list"}, esc_html($diff{'from_file'})) .
+                                     -class => "list"}, esc_path($diff{'from_file'})) .
                               " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
                               "<td class=\"link\">";
                               " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
                               "<td class=\"link\">";
-                       if ($diff{'to_id'} ne $diff{'from_id'}) {
-                               if ($action eq 'commitdiff') {
-                                       # link to patch
-                                       $patchno++;
-                                       print $cgi->a({-href => "#patch$patchno"}, "patch");
-                               } else {
-                                       print $cgi->a({-href => href(action=>"blobdiff",
-                                                                    hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
-                                                                    hash_base=>$hash, hash_parent_base=>$parent,
-                                                                    file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
-                                                     "diff");
-                               }
-                               print " | ";
+                       if ($action eq 'commitdiff') {
+                               # link to patch
+                               $patchno++;
+                               print $cgi->a({-href => "#patch$patchno"}, "patch") .
+                                     " | ";
+                       } elsif ($diff{'to_id'} ne $diff{'from_id'}) {
+                               # "commit" view and modified file (not only pure rename or copy)
+                               print $cgi->a({-href => href(action=>"blobdiff",
+                                                            hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                            hash_base=>$hash, hash_parent_base=>$parent,
+                                                            file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
+                                             "diff") .
+                                     " | ";
                         }
                         }
-                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
-                                                    hash_base=>$parent, file_name=>$diff{'from_file'})},
-                                     "blob") . " | ";
-                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
-                                                    file_name=>$diff{'from_file'})},
-                                     "blame") . " | ";
-                       print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
-                                                   file_name=>$diff{'from_file'})},
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                                    hash_base=>$parent, file_name=>$diff{'to_file'})},
+                                     "blob") . " | ";
+                       if ($have_blame) {
+                               print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
+                                                            file_name=>$diff{'to_file'})},
+                                             "blame") . " | ";
+                       }
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
+                                                   file_name=>$diff{'to_file'})},
                                       "history");
                         print "</td>\n";
  
                                       "history");
                         print "</td>\n";
  
@@ -2031,148 +2335,339 @@ sub git_patchset_body {
         my ($fd, $difftree, $hash, $hash_parent) = @_;
  
         my $patch_idx = 0;
         my ($fd, $difftree, $hash, $hash_parent) = @_;
  
         my $patch_idx = 0;
-       my $in_header = 0;
-       my $patch_found = 0;
+       my $patch_line;
         my $diffinfo;
         my $diffinfo;
+       my (%from, %to);
+       my ($from_id, $to_id);
  
         print "<div class=\"patchset\">\n";
  
  
         print "<div class=\"patchset\">\n";
  
-       LINE:
-       while (my $patch_line = <$fd>) {
+       # skip to first patch
+       while ($patch_line = <$fd>) {
                 chomp $patch_line;
  
                 chomp $patch_line;
  
-               if ($patch_line =~ m/^diff /) { # "git diff" header
-                       # beginning of patch (in patchset)
-                       if ($patch_found) {
-                               # close previous patch
-                               print "</div>\n"; # class="patch"
-                       } else {
-                               # first patch in patchset
-                               $patch_found = 1;
+               last if ($patch_line =~ m/^diff /);
+       }
+
+ PATCH:
+       while ($patch_line) {
+               my @diff_header;
+
+               # git diff header
+               #assert($patch_line =~ m/^diff /) if DEBUG;
+               #assert($patch_line !~ m!$/$!) if DEBUG; # is chomp-ed
+               push @diff_header, $patch_line;
+
+               # extended diff header
+       EXTENDED_HEADER:
+               while ($patch_line = <$fd>) {
+                       chomp $patch_line;
+
+                       last EXTENDED_HEADER if ($patch_line =~ m/^--- /);
+
+                       if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
+                               $from_id = $1;
+                               $to_id   = $2;
                         }
                         }
-                       print "<div class=\"patch\" id=\"patch". ($patch_idx+1) ."\">\n";
  
  
+                       push @diff_header, $patch_line;
+               }
+               #last PATCH unless $patch_line;
+               my $last_patch_line = $patch_line;
+
+               # check if current patch belong to current raw line
+               # and parse raw git-diff line if needed
+               if (defined $diffinfo &&
+                   $diffinfo->{'from_id'} eq $from_id &&
+                   $diffinfo->{'to_id'}   eq $to_id) {
+                       # this is split patch
+                       print "<div class=\"patch cont\">\n";
+               } else {
+                       # advance raw git-diff output if needed
+                       $patch_idx++ if defined $diffinfo;
+
+                       # read and prepare patch information
                         if (ref($difftree->[$patch_idx]) eq "HASH") {
                         if (ref($difftree->[$patch_idx]) eq "HASH") {
+                               # pre-parsed (or generated by hand)
                                 $diffinfo = $difftree->[$patch_idx];
                         } else {
                                 $diffinfo = parse_difftree_raw_line($difftree->[$patch_idx]);
                         }
                                 $diffinfo = $difftree->[$patch_idx];
                         } else {
                                 $diffinfo = parse_difftree_raw_line($difftree->[$patch_idx]);
                         }
-                       $patch_idx++;
-
-                       # for now, no extended header, hence we skip empty patches
-                       # companion to  next LINE if $in_header;
-                       if ($diffinfo->{'from_id'} eq $diffinfo->{'to_id'}) { # no change
-                               $in_header = 1;
-                               next LINE;
+                       $from{'file'} = $diffinfo->{'from_file'} || $diffinfo->{'file'};
+                       $to{'file'}   = $diffinfo->{'to_file'}   || $diffinfo->{'file'};
+                       if ($diffinfo->{'status'} ne "A") { # not new (added) file
+                               $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
+                                                    hash=>$diffinfo->{'from_id'},
+                                                    file_name=>$from{'file'});
                         }
                         }
-
-                       if ($diffinfo->{'status'} eq "A") { # added
-                               print "<div class=\"diff_info\">" . file_type($diffinfo->{'to_mode'}) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
-                                                            hash=>$diffinfo->{'to_id'}, file_name=>$diffinfo->{'file'})},
-                                             $diffinfo->{'to_id'}) . " (new)" .
-                                     "</div>\n"; # class="diff_info"
-
-                       } elsif ($diffinfo->{'status'} eq "D") { # deleted
-                               print "<div class=\"diff_info\">" . file_type($diffinfo->{'from_mode'}) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash_base=>$hash_parent,
-                                                            hash=>$diffinfo->{'from_id'}, file_name=>$diffinfo->{'file'})},
-                                             $diffinfo->{'from_id'}) . " (deleted)" .
-                                     "</div>\n"; # class="diff_info"
-
-                       } elsif ($diffinfo->{'status'} eq "R" || # renamed
-                                $diffinfo->{'status'} eq "C" || # copied
-                                $diffinfo->{'status'} eq "2") { # with two filenames (from git_blobdiff)
-                               print "<div class=\"diff_info\">" .
-                                     file_type($diffinfo->{'from_mode'}) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash_base=>$hash_parent,
-                                                            hash=>$diffinfo->{'from_id'}, file_name=>$diffinfo->{'from_file'})},
-                                             $diffinfo->{'from_id'}) .
-                                     " -> " .
-                                     file_type($diffinfo->{'to_mode'}) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
-                                                            hash=>$diffinfo->{'to_id'}, file_name=>$diffinfo->{'to_file'})},
-                                             $diffinfo->{'to_id'});
-                               print "</div>\n"; # class="diff_info"
-
-                       } else { # modified, mode changed, ...
-                               print "<div class=\"diff_info\">" .
-                                     file_type($diffinfo->{'from_mode'}) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash_base=>$hash_parent,
-                                                            hash=>$diffinfo->{'from_id'}, file_name=>$diffinfo->{'file'})},
-                                             $diffinfo->{'from_id'}) .
-                                     " -> " .
-                                     file_type($diffinfo->{'to_mode'}) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
-                                                            hash=>$diffinfo->{'to_id'}, file_name=>$diffinfo->{'file'})},
-                                             $diffinfo->{'to_id'});
-                               print "</div>\n"; # class="diff_info"
+                       if ($diffinfo->{'status'} ne "D") { # not deleted file
+                               $to{'href'} = href(action=>"blob", hash_base=>$hash,
+                                                  hash=>$diffinfo->{'to_id'},
+                                                  file_name=>$to{'file'});
                         }
                         }
+                       # this is first patch for raw difftree line with $patch_idx index
+                       # we index @$difftree array from 0, but number patches from 1
+                       print "<div class=\"patch\" id=\"patch". ($patch_idx+1) ."\">\n";
+               }
  
  
-                       #print "<div class=\"diff extended_header\">\n";
-                       $in_header = 1;
-                       next LINE;
-               } # start of patch in patchset
-
+               # print "git diff" header
+               $patch_line = shift @diff_header;
+               $patch_line =~ s!^(diff (.*?) )"?a/.*$!$1!;
+               if ($from{'href'}) {
+                       $patch_line .= $cgi->a({-href => $from{'href'}, -class => "path"},
+                                              'a/' . esc_path($from{'file'}));
+               } else { # file was added
+                       $patch_line .= 'a/' . esc_path($from{'file'});
+               }
+               $patch_line .= ' ';
+               if ($to{'href'}) {
+                       $patch_line .= $cgi->a({-href => $to{'href'}, -class => "path"},
+                                              'b/' . esc_path($to{'file'}));
+               } else { # file was deleted
+                       $patch_line .= 'b/' . esc_path($to{'file'});
+               }
+               print "<div class=\"diff header\">$patch_line</div>\n";
+
+               # print extended diff header
+               print "<div class=\"diff extended_header\">\n" if (@diff_header > 0);
+       EXTENDED_HEADER:
+               foreach $patch_line (@diff_header) {
+                       # match <path>
+                       if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
+                               $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},
+                                                       esc_path($from{'file'}));
+                       }
+                       if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {
+                               $patch_line = $cgi->a({-href=>$to{'href'}, -class=>"path"},
+                                                     esc_path($to{'file'}));
+                       }
+                       # match <mode>
+                       if ($patch_line =~ m/\s(\d{6})$/) {
+                               $patch_line .= '<span class="info"> (' .
+                                              file_type_long($1) .
+                                              ')</span>';
+                       }
+                       # match <hash>
+                       if ($patch_line =~ m/^index/) {
+                               my ($from_link, $to_link);
+                               if ($from{'href'}) {
+                                       $from_link = $cgi->a({-href=>$from{'href'}, -class=>"hash"},
+                                                            substr($diffinfo->{'from_id'},0,7));
+                               } else {
+                                       $from_link = '0' x 7;
+                               }
+                               if ($to{'href'}) {
+                                       $to_link = $cgi->a({-href=>$to{'href'}, -class=>"hash"},
+                                                          substr($diffinfo->{'to_id'},0,7));
+                               } else {
+                                       $to_link = '0' x 7;
+                               }
+                               #affirm {
+                               #       my ($from_hash, $to_hash) =
+                               #               ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/);
+                               #       my ($from_id, $to_id) =
+                               #               ($diffinfo->{'from_id'}, $diffinfo->{'to_id'});
+                               #       ($from_hash eq $from_id) && ($to_hash eq $to_id);
+                               #} if DEBUG;
+                               my ($from_id, $to_id) = ($diffinfo->{'from_id'}, $diffinfo->{'to_id'});
+                               $patch_line =~ s!$from_id\.\.$to_id!$from_link..$to_link!;
+                       }
+                       print $patch_line . "<br/>\n";
+               }
+               print "</div>\n"  if (@diff_header > 0); # class="diff extended_header"
+
+               # from-file/to-file diff header
+               $patch_line = $last_patch_line;
+               #assert($patch_line =~ m/^---/) if DEBUG;
+               if ($from{'href'}) {
+                       $patch_line = '--- a/' .
+                                     $cgi->a({-href=>$from{'href'}, -class=>"path"},
+                                             esc_path($from{'file'}));
+               }
+               print "<div class=\"diff from_file\">$patch_line</div>\n";
  
  
-               if ($in_header && $patch_line =~ m/^---/) {
-                       #print "</div>\n"; # class="diff extended_header"
-                       $in_header = 0;
+               $patch_line = <$fd>;
+               #last PATCH unless $patch_line;
+               chomp $patch_line;
  
  
-                       my $file = $diffinfo->{'from_file'};
-                       $file  ||= $diffinfo->{'file'};
-                       $file = $cgi->a({-href => href(action=>"blob", hash_base=>$hash_parent,
-                                                      hash=>$diffinfo->{'from_id'}, file_name=>$file),
-                                       -class => "list"}, esc_html($file));
-                       $patch_line =~ s|a/.*$|a/$file|g;
-                       print "<div class=\"diff from_file\">$patch_line</div>\n";
+               #assert($patch_line =~ m/^+++/) if DEBUG;
+               if ($to{'href'}) {
+                       $patch_line = '+++ b/' .
+                                     $cgi->a({-href=>$to{'href'}, -class=>"path"},
+                                             esc_path($to{'file'}));
+               }
+               print "<div class=\"diff to_file\">$patch_line</div>\n";
  
  
-                       $patch_line = <$fd>;
+               # the patch itself
+       LINE:
+               while ($patch_line = <$fd>) {
                         chomp $patch_line;
  
                         chomp $patch_line;
  
-                       #$patch_line =~ m/^+++/;
-                       $file    = $diffinfo->{'to_file'};
-                       $file  ||= $diffinfo->{'file'};
-                       $file = $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
-                                                      hash=>$diffinfo->{'to_id'}, file_name=>$file),
-                                       -class => "list"}, esc_html($file));
-                       $patch_line =~ s|b/.*|b/$file|g;
-                       print "<div class=\"diff to_file\">$patch_line</div>\n";
+                       next PATCH if ($patch_line =~ m/^diff /);
  
  
-                       next LINE;
+                       print format_diff_line($patch_line, \%from, \%to);
                 }
                 }
-               next LINE if $in_header;
  
  
-               print format_diff_line($patch_line);
+       } continue {
+               print "</div>\n"; # class="patch"
         }
         }
-       print "</div>\n" if $patch_found; # class="patch"
  
         print "</div>\n"; # class="patchset"
  }
  
  # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
  
  
         print "</div>\n"; # class="patchset"
  }
  
  # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
  
-sub git_shortlog_body {
-       # uses global variable $project
-       my ($revlist, $from, $to, $refs, $extra) = @_;
+sub git_project_list_body {
+       my ($projlist, $order, $from, $to, $extra, $no_header) = @_;
+
+       my ($check_forks) = gitweb_check_feature('forks');
+
+       my @projects;
+       foreach my $pr (@$projlist) {
+               my (@aa) = git_get_last_activity($pr->{'path'});
+               unless (@aa) {
+                       next;
+               }
+               ($pr->{'age'}, $pr->{'age_string'}) = @aa;
+               if (!defined $pr->{'descr'}) {
+                       my $descr = git_get_project_description($pr->{'path'}) || "";
+                       $pr->{'descr_long'} = to_utf8($descr);
+                       $pr->{'descr'} = chop_str($descr, 25, 5);
+               }
+               if (!defined $pr->{'owner'}) {
+                       $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}") || "";
+               }
+               if ($check_forks) {
+                       my $pname = $pr->{'path'};
+                       if (($pname =~ s/\.git$//) &&
+                           ($pname !~ /\/$/) &&
+                           (-d "$projectroot/$pname")) {
+                               $pr->{'forks'} = "-d $projectroot/$pname";
+                       }
+                       else {
+                               $pr->{'forks'} = 0;
+                       }
+               }
+               push @projects, $pr;
+       }
  
  
+       $order ||= "project";
         $from = 0 unless defined $from;
         $from = 0 unless defined $from;
-       $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
+       $to = $#projects if (!defined $to || $#projects < $to);
  
  
-       print "<table class=\"shortlog\" cellspacing=\"0\">\n";
-       my $alternate = 1;
-       for (my $i = $from; $i <= $to; $i++) {
-               my $commit = $revlist->[$i];
-               #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
-               my $ref = format_ref_marker($refs, $commit);
-               my %co = parse_commit($commit);
-               if ($alternate) {
-                       print "<tr class=\"dark\">\n";
+       print "<table class=\"project_list\">\n";
+       unless ($no_header) {
+               print "<tr>\n";
+               if ($check_forks) {
+                       print "<th></th>\n";
+               }
+               if ($order eq "project") {
+                       @projects = sort {$a->{'path'} cmp $b->{'path'}} @projects;
+                       print "<th>Project</th>\n";
                 } else {
                 } else {
-                       print "<tr class=\"light\">\n";
+                       print "<th>" .
+                             $cgi->a({-href => href(project=>undef, order=>'project'),
+                                      -class => "header"}, "Project") .
+                             "</th>\n";
                 }
                 }
-               $alternate ^= 1;
-               # git_summary() used print "<td><i>$co{'age_string'}</i></td>\n" .
+               if ($order eq "descr") {
+                       @projects = sort {$a->{'descr'} cmp $b->{'descr'}} @projects;
+                       print "<th>Description</th>\n";
+               } else {
+                       print "<th>" .
+                             $cgi->a({-href => href(project=>undef, order=>'descr'),
+                                      -class => "header"}, "Description") .
+                             "</th>\n";
+               }
+               if ($order eq "owner") {
+                       @projects = sort {$a->{'owner'} cmp $b->{'owner'}} @projects;
+                       print "<th>Owner</th>\n";
+               } else {
+                       print "<th>" .
+                             $cgi->a({-href => href(project=>undef, order=>'owner'),
+                                      -class => "header"}, "Owner") .
+                             "</th>\n";
+               }
+               if ($order eq "age") {
+                       @projects = sort {$a->{'age'} <=> $b->{'age'}} @projects;
+                       print "<th>Last Change</th>\n";
+               } else {
+                       print "<th>" .
+                             $cgi->a({-href => href(project=>undef, order=>'age'),
+                                      -class => "header"}, "Last Change") .
+                             "</th>\n";
+               }
+               print "<th></th>\n" .
+                     "</tr>\n";
+       }
+       my $alternate = 1;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $pr = $projects[$i];
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               if ($check_forks) {
+                       print "<td>";
+                       if ($pr->{'forks'}) {
+                               print "<!-- $pr->{'forks'} -->\n";
+                               print $cgi->a({-href => href(project=>$pr->{'path'}, action=>"forks")}, "+");
+                       }
+                       print "</td>\n";
+               }
+               print "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
+                                       -class => "list"}, esc_html($pr->{'path'})) . "</td>\n" .
+                     "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
+                                       -class => "list", -title => $pr->{'descr_long'}},
+                                       esc_html($pr->{'descr'})) . "</td>\n" .
+                     "<td><i>" . chop_str($pr->{'owner'}, 15) . "</i></td>\n";
+               print "<td class=\"". age_class($pr->{'age'}) . "\">" .
+                     $pr->{'age_string'} . "</td>\n" .
+                     "<td class=\"link\">" .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary")}, "summary")   . " | " .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"shortlog")}, "shortlog") . " | " .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"log")}, "log") . " | " .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"tree")}, "tree") .
+                     ($pr->{'forks'} ? " | " . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"forks")}, "forks") : '') .
+                     "</td>\n" .
+                     "</tr>\n";
+       }
+       if (defined $extra) {
+               print "<tr>\n";
+               if ($check_forks) {
+                       print "<td></td>\n";
+               }
+               print "<td colspan=\"5\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
+sub git_shortlog_body {
+       # uses global variable $project
+       my ($revlist, $from, $to, $refs, $extra) = @_;
+
+       my $have_snapshot = gitweb_have_snapshot();
+
+       $from = 0 unless defined $from;
+       $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
+
+       print "<table class=\"shortlog\" cellspacing=\"0\">\n";
+       my $alternate = 1;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $commit = $revlist->[$i];
+               #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
+               my $ref = format_ref_marker($refs, $commit);
+               my %co = parse_commit($commit);
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               # git_summary() used print "<td><i>$co{'age_string'}</i></td>\n" .
                 print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                       "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
                       "<td>";
                 print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                       "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
                       "<td>";
@@ -2183,7 +2678,7 @@ sub git_shortlog_body {
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
                       $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
                       $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree");
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
                       $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
                       $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree");
-               if (gitweb_have_snapshot()) {
+               if ($have_snapshot) {
                         print " | " . $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
                 }
                 print "</td>\n" .
                         print " | " . $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
                 }
                 print "</td>\n" .
@@ -2272,8 +2767,7 @@ sub git_tags_body {
         for (my $i = $from; $i <= $to; $i++) {
                 my $entry = $taglist->[$i];
                 my %tag = %$entry;
         for (my $i = $from; $i <= $to; $i++) {
                 my $entry = $taglist->[$i];
                 my %tag = %$entry;
-               my $comment_lines = $tag{'comment'};
-               my $comment = shift @$comment_lines;
+               my $comment = $tag{'subject'};
                 my $comment_short;
                 if (defined $comment) {
                         $comment_short = chop_str($comment, 30, 5);
                 my $comment_short;
                 if (defined $comment) {
                         $comment_short = chop_str($comment, 30, 5);
@@ -2306,7 +2800,7 @@ sub git_tags_body {
                       $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'})}, $tag{'reftype'});
                 if ($tag{'reftype'} eq "commit") {
                         print " | " . $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") .
                       $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'})}, $tag{'reftype'});
                 if ($tag{'reftype'} eq "commit") {
                         print " | " . $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") .
-                             " | " . $cgi->a({-href => href(action=>"log", hash=>$tag{'refid'})}, "log");
+                             " | " . $cgi->a({-href => href(action=>"log", hash=>$tag{'name'})}, "log");
                 } elsif ($tag{'reftype'} eq "blob") {
                         print " | " . $cgi->a({-href => href(action=>"blob_plain", hash=>$tag{'refid'})}, "raw");
                 }
                 } elsif ($tag{'reftype'} eq "blob") {
                         print " | " . $cgi->a({-href => href(action=>"blob_plain", hash=>$tag{'refid'})}, "raw");
                 }
@@ -2331,23 +2825,23 @@ sub git_heads_body {
         my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
                 my $entry = $headlist->[$i];
         my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
                 my $entry = $headlist->[$i];
-               my %tag = %$entry;
-               my $curr = $tag{'id'} eq $head;
+               my %ref = %$entry;
+               my $curr = $ref{'id'} eq $head;
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
                 } else {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
                 } else {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
-               print "<td><i>$tag{'age'}</i></td>\n" .
-                     ($tag{'id'} eq $head ? "<td class=\"current_head\">" : "<td>") .
-                     $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'}),
-                              -class => "list name"},esc_html($tag{'name'})) .
+               print "<td><i>$ref{'age'}</i></td>\n" .
+                     ($curr ? "<td class=\"current_head\">" : "<td>") .
+                     $cgi->a({-href => href(action=>"shortlog", hash=>$ref{'name'}),
+                              -class => "list name"},esc_html($ref{'name'})) .
                       "</td>\n" .
                       "<td class=\"link\">" .
                       "</td>\n" .
                       "<td class=\"link\">" .
-                     $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") . " | " .
-                     $cgi->a({-href => href(action=>"log", hash=>$tag{'name'})}, "log") . " | " .
-                     $cgi->a({-href => href(action=>"tree", hash=>$tag{'name'}, hash_base=>$tag{'name'})}, "tree") .
+                     $cgi->a({-href => href(action=>"shortlog", hash=>$ref{'name'})}, "shortlog") . " | " .
+                     $cgi->a({-href => href(action=>"log", hash=>$ref{'name'})}, "log") . " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$ref{'name'}, hash_base=>$ref{'name'})}, "tree") .
                       "</td>\n" .
                       "</tr>";
         }
                       "</td>\n" .
                       "</tr>";
         }
@@ -2359,6 +2853,58 @@ sub git_heads_body {
         print "</table>\n";
  }
  
         print "</table>\n";
  }
  
+sub git_search_grep_body {
+       my ($greplist, $from, $to, $extra) = @_;
+       $from = 0 unless defined $from;
+       $to = $#{$greplist} if (!defined $to || $#{$greplist} < $to);
+
+       print "<table class=\"grep\" cellspacing=\"0\">\n";
+       my $alternate = 1;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $commit = $greplist->[$i];
+               my %co = parse_commit($commit);
+               if (!%co) {
+                       next;
+               }
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+                     "<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
+                     "<td>" .
+                     $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), -class => "list subject"},
+                              esc_html(chop_str($co{'title'}, 50)) . "<br/>");
+               my $comment = $co{'comment'};
+               foreach my $line (@$comment) {
+                       if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
+                               my $lead = esc_html($1) || "";
+                               $lead = chop_str($lead, 30, 10);
+                               my $match = esc_html($2) || "";
+                               my $trail = esc_html($3) || "";
+                               $trail = chop_str($trail, 30, 10);
+                               my $text = "$lead<span class=\"match\">$match</span>$trail";
+                               print chop_str($text, 80, 5) . "<br/>\n";
+                       }
+               }
+               print "</td>\n" .
+                     "<td class=\"link\">" .
+                     $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
+                     " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
+               print "</td>\n" .
+                     "</tr>\n";
+       }
+       if (defined $extra) {
+               print "<tr>\n" .
+                     "<td colspan=\"3\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
  ## ======================================================================
  ## ======================================================================
  ## actions
  ## ======================================================================
  ## ======================================================================
  ## actions
@@ -2370,25 +2916,9 @@ sub git_project_list {
         }
  
         my @list = git_get_projects_list();
         }
  
         my @list = git_get_projects_list();
-       my @projects;
         if (!@list) {
                 die_error(undef, "No projects found");
         }
         if (!@list) {
                 die_error(undef, "No projects found");
         }
-       foreach my $pr (@list) {
-               my (@aa) = git_get_last_activity($pr->{'path'});
-               unless (@aa) {
-                       next;
-               }
-               ($pr->{'age'}, $pr->{'age_string'}) = @aa;
-               if (!defined $pr->{'descr'}) {
-                       my $descr = git_get_project_description($pr->{'path'}) || "";
-                       $pr->{'descr'} = chop_str($descr, 25, 5);
-               }
-               if (!defined $pr->{'owner'}) {
-                       $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}") || "";
-               }
-               push @projects, $pr;
-       }
  
         git_header_html();
         if (-f $home_text) {
  
         git_header_html();
         if (-f $home_text) {
@@ -2398,75 +2928,30 @@ sub git_project_list {
                 close $fd;
                 print "</div>\n";
         }
                 close $fd;
                 print "</div>\n";
         }
-       print "<table class=\"project_list\">\n" .
-             "<tr>\n";
-       $order ||= "project";
-       if ($order eq "project") {
-               @projects = sort {$a->{'path'} cmp $b->{'path'}} @projects;
-               print "<th>Project</th>\n";
-       } else {
-               print "<th>" .
-                     $cgi->a({-href => href(project=>undef, order=>'project'),
-                              -class => "header"}, "Project") .
-                     "</th>\n";
-       }
-       if ($order eq "descr") {
-               @projects = sort {$a->{'descr'} cmp $b->{'descr'}} @projects;
-               print "<th>Description</th>\n";
-       } else {
-               print "<th>" .
-                     $cgi->a({-href => href(project=>undef, order=>'descr'),
-                              -class => "header"}, "Description") .
-                     "</th>\n";
-       }
-       if ($order eq "owner") {
-               @projects = sort {$a->{'owner'} cmp $b->{'owner'}} @projects;
-               print "<th>Owner</th>\n";
-       } else {
-               print "<th>" .
-                     $cgi->a({-href => href(project=>undef, order=>'owner'),
-                              -class => "header"}, "Owner") .
-                     "</th>\n";
-       }
-       if ($order eq "age") {
-               @projects = sort {$a->{'age'} <=> $b->{'age'}} @projects;
-               print "<th>Last Change</th>\n";
-       } else {
-               print "<th>" .
-                     $cgi->a({-href => href(project=>undef, order=>'age'),
-                              -class => "header"}, "Last Change") .
-                     "</th>\n";
+       git_project_list_body(\@list, $order);
+       git_footer_html();
+}
+
+sub git_forks {
+       my $order = $cgi->param('o');
+       if (defined $order && $order !~ m/project|descr|owner|age/) {
+               die_error(undef, "Unknown order parameter");
         }
         }
-       print "<th></th>\n" .
-             "</tr>\n";
-       my $alternate = 1;
-       foreach my $pr (@projects) {
-               if ($alternate) {
-                       print "<tr class=\"dark\">\n";
-               } else {
-                       print "<tr class=\"light\">\n";
-               }
-               $alternate ^= 1;
-               print "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
-                                       -class => "list"}, esc_html($pr->{'path'})) . "</td>\n" .
-                     "<td>" . esc_html($pr->{'descr'}) . "</td>\n" .
-                     "<td><i>" . chop_str($pr->{'owner'}, 15) . "</i></td>\n";
-               print "<td class=\"". age_class($pr->{'age'}) . "\">" .
-                     $pr->{'age_string'} . "</td>\n" .
-                     "<td class=\"link\">" .
-                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary")}, "summary")   . " | " .
-                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"shortlog")}, "shortlog") . " | " .
-                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"log")}, "log") . " | " .
-                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"tree")}, "tree") .
-                     "</td>\n" .
-                     "</tr>\n";
+
+       my @list = git_get_projects_list($project);
+       if (!@list) {
+               die_error(undef, "No forks found");
         }
         }
-       print "</table>\n";
+
+       git_header_html();
+       git_print_page_nav('','');
+       git_print_header_div('summary', "$project forks");
+       git_project_list_body(\@list, $order);
         git_footer_html();
  }
  
  sub git_project_index {
         git_footer_html();
  }
  
  sub git_project_index {
-       my @projects = git_get_projects_list();
+       my @projects = git_get_projects_list($project);
  
         print $cgi->header(
                 -type => 'text/plain',
  
         print $cgi->header(
                 -type => 'text/plain',
@@ -2491,23 +2976,22 @@ sub git_project_index {
  
  sub git_summary {
         my $descr = git_get_project_description($project) || "none";
  
  sub git_summary {
         my $descr = git_get_project_description($project) || "none";
-       my $head = git_get_head_hash($project);
-       my %co = parse_commit($head);
+       my %co = parse_commit("HEAD");
         my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
         my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
+       my $head = $co{'id'};
  
         my $owner = git_get_project_owner($project);
  
  
         my $owner = git_get_project_owner($project);
  
-       my ($reflist, $refs) = git_get_refs_list();
+       my $refs = git_get_references();
+       # These get_*_list functions return one more to allow us to see if
+       # there are more ...
+       my @taglist  = git_get_tags_list(16);
+       my @headlist = git_get_heads_list(16);
+       my @forklist;
+       my ($check_forks) = gitweb_check_feature('forks');
  
  
-       my @taglist;
-       my @headlist;
-       foreach my $ref (@$reflist) {
-               if ($ref->{'name'} =~ s!^heads/!!) {
-                       push @headlist, $ref;
-               } else {
-                       $ref->{'name'} =~ s!^tags/!!;
-                       push @taglist, $ref;
-               }
+       if ($check_forks) {
+               @forklist = git_get_projects_list($project);
         }
  
         git_header_html();
         }
  
         git_header_html();
@@ -2530,27 +3014,48 @@ sub git_summary {
         }
         print "</table>\n";
  
         }
         print "</table>\n";
  
+       if (-s "$projectroot/$project/README.html") {
+               if (open my $fd, "$projectroot/$project/README.html") {
+                       print "<div class=\"title\">readme</div>\n";
+                       print $_ while (<$fd>);
+                       close $fd;
+               }
+       }
+
+       # we need to request one more than 16 (0..15) to check if
+       # those 16 are all
         open my $fd, "-|", git_cmd(), "rev-list", "--max-count=17",
         open my $fd, "-|", git_cmd(), "rev-list", "--max-count=17",
-               git_get_head_hash($project)
+               $head, "--"
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
         git_print_header_div('shortlog');
         git_shortlog_body(\@revlist, 0, 15, $refs,
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
         git_print_header_div('shortlog');
         git_shortlog_body(\@revlist, 0, 15, $refs,
+                         $#revlist <=  15 ? undef :
                           $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
         if (@taglist) {
                 git_print_header_div('tags');
                 git_tags_body(\@taglist, 0, 15,
                           $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
         if (@taglist) {
                 git_print_header_div('tags');
                 git_tags_body(\@taglist, 0, 15,
+                             $#taglist <=  15 ? undef :
                               $cgi->a({-href => href(action=>"tags")}, "..."));
         }
  
         if (@headlist) {
                 git_print_header_div('heads');
                 git_heads_body(\@headlist, $head, 0, 15,
                               $cgi->a({-href => href(action=>"tags")}, "..."));
         }
  
         if (@headlist) {
                 git_print_header_div('heads');
                 git_heads_body(\@headlist, $head, 0, 15,
+                              $#headlist <= 15 ? undef :
                                $cgi->a({-href => href(action=>"heads")}, "..."));
         }
  
                                $cgi->a({-href => href(action=>"heads")}, "..."));
         }
  
+       if (@forklist) {
+               git_print_header_div('forks');
+               git_project_list_body(\@forklist, undef, 0, 15,
+                                     $#forklist <= 15 ? undef :
+                                     $cgi->a({-href => href(action=>"forks")}, "..."),
+                                     'noheader');
+       }
+
         git_footer_html();
  }
  
         git_footer_html();
  }
  
@@ -2581,7 +3086,8 @@ sub git_tag {
         print "<div class=\"page_body\">";
         my $comment = $tag{'comment'};
         foreach my $line (@$comment) {
         print "<div class=\"page_body\">";
         my $comment = $tag{'comment'};
         foreach my $line (@$comment) {
-               print esc_html($line) . "<br/>\n";
+               chomp $line;
+               print esc_html($line, -nbsp=>1) . "<br/>\n";
         }
         print "</div>\n";
         git_footer_html();
         }
         print "</div>\n";
         git_footer_html();
@@ -2650,6 +3156,7 @@ HTML
                         }
                 }
                 my $data = $_;
                         }
                 }
                 my $data = $_;
+               chomp $data;
                 my $rev = substr($full_rev, 0, 8);
                 my $author = $meta->{'author'};
                 my %date = parse_date($meta->{'author-time'},
                 my $rev = substr($full_rev, 0, 8);
                 my $author = $meta->{'author'};
                 my %date = parse_date($meta->{'author-time'},
@@ -2661,7 +3168,7 @@ HTML
                 print "<tr class=\"$rev_color[$current_color]\">\n";
                 if ($group_size) {
                         print "<td class=\"sha1\"";
                 print "<tr class=\"$rev_color[$current_color]\">\n";
                 if ($group_size) {
                         print "<td class=\"sha1\"";
-                       print " title=\"$author, $date\"";
+                       print " title=\"". esc_html($author) . ", $date\"";
                         print " rowspan=\"$group_size\"" if ($group_size > 1);
                         print ">";
                         print $cgi->a({-href => href(action=>"commit",
                         print " rowspan=\"$group_size\"" if ($group_size > 1);
                         print ">";
                         print $cgi->a({-href => href(action=>"commit",
@@ -2792,9 +3299,9 @@ sub git_tags {
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
-       my ($taglist) = git_get_refs_list("tags");
-       if (@$taglist) {
-               git_tags_body($taglist);
+       my @tagslist = git_get_tags_list();
+       if (@tagslist) {
+               git_tags_body(\@tagslist);
         }
         git_footer_html();
  }
         }
         git_footer_html();
  }
@@ -2805,9 +3312,9 @@ sub git_heads {
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
-       my ($headlist) = git_get_refs_list("heads");
-       if (@$headlist) {
-               git_heads_body($headlist, $head);
+       my @headslist = git_get_heads_list();
+       if (@headslist) {
+               git_heads_body(\@headslist, $head);
         }
         git_footer_html();
  }
         }
         git_footer_html();
  }
@@ -2874,10 +3381,13 @@ sub git_blob {
         open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                 or die_error(undef, "Couldn't cat $file_name, $hash");
         my $mimetype = blob_mimetype($fd, $file_name);
         open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                 or die_error(undef, "Couldn't cat $file_name, $hash");
         my $mimetype = blob_mimetype($fd, $file_name);
-       if ($mimetype !~ m/^text\//) {
+       if ($mimetype !~ m!^(?:text/|image/(?:gif|png|jpeg)$)!) {
                 close $fd;
                 return git_blob_plain($mimetype);
         }
                 close $fd;
                 return git_blob_plain($mimetype);
         }
+       # we can have blame only for text/* mimetype
+       $have_blame &&= ($mimetype =~ m!^text/!);
+
         git_header_html(undef, $expires);
         my $formats_nav = '';
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
         git_header_html(undef, $expires);
         my $formats_nav = '';
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
@@ -2914,13 +3424,24 @@ sub git_blob {
         }
         git_print_page_path($file_name, "blob", $hash_base);
         print "<div class=\"page_body\">\n";
         }
         git_print_page_path($file_name, "blob", $hash_base);
         print "<div class=\"page_body\">\n";
-       my $nr;
-       while (my $line = <$fd>) {
-               chomp $line;
-               $nr++;
-               $line = untabify($line);
-               printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
-                      $nr, $nr, $nr, esc_html($line);
+       if ($mimetype =~ m!^text/!) {
+               my $nr;
+               while (my $line = <$fd>) {
+                       chomp $line;
+                       $nr++;
+                       $line = untabify($line);
+                       printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
+                              $nr, $nr, $nr, esc_html($line, -nbsp=>1);
+               }
+       } elsif ($mimetype =~ m!^image/!) {
+               print qq!<img type="$mimetype"!;
+               if ($file_name) {
+                       print qq! alt="$file_name" title="$file_name"!;
+               }
+               print qq! src="! .
+                     href(action=>"blob_plain", hash=>$hash,
+                          hash_base=>$hash_base, file_name=>$file_name) .
+                     qq!" />\n!;
         }
         close $fd
                 or print "Reading blob failed.\n";
         }
         close $fd
                 or print "Reading blob failed.\n";
@@ -3045,8 +3566,7 @@ sub git_snapshot {
         my $filename = basename($project) . "-$hash.tar.$suffix";
  
         print $cgi->header(
         my $filename = basename($project) . "-$hash.tar.$suffix";
  
         print $cgi->header(
-               -type => 'application/x-tar',
-               -content_encoding => $ctype,
+               -type => "application/$ctype",
                 -content_disposition => 'inline; filename="' . "$filename" . '"',
                 -status => '200 OK');
  
                 -content_disposition => 'inline; filename="' . "$filename" . '"',
                 -status => '200 OK');
  
@@ -3074,7 +3594,7 @@ sub git_log {
         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)));
-       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash, "--"
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
@@ -3113,13 +3633,14 @@ sub git_log {
                       "</div>\n";
  
                 print "<div class=\"log_body\">\n";
                       "</div>\n";
  
                 print "<div class=\"log_body\">\n";
-               git_print_simplified_log($co{'comment'});
+               git_print_log($co{'comment'}, -final_empty_line=> 1);
                 print "</div>\n";
         }
         git_footer_html();
  }
  
  sub git_commit {
                 print "</div>\n";
         }
         git_footer_html();
  }
  
  sub git_commit {
+       $hash ||= $hash_base || "HEAD";
         my %co = parse_commit($hash);
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         my %co = parse_commit($hash);
         if (!%co) {
                 die_error(undef, "Unknown commit object");
@@ -3127,14 +3648,46 @@ sub git_commit {
         my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
         my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
  
         my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
         my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
  
-       my $parent = $co{'parent'};
+       my $parent  = $co{'parent'};
+       my $parents = $co{'parents'}; # listref
+
+       # we need to prepare $formats_nav before any parameter munging
+       my $formats_nav;
+       if (!defined $parent) {
+               # --root commitdiff
+               $formats_nav .= '(initial)';
+       } elsif (@$parents == 1) {
+               # single parent commit
+               $formats_nav .=
+                       '(parent: ' .
+                       $cgi->a({-href => href(action=>"commit",
+                                              hash=>$parent)},
+                               esc_html(substr($parent, 0, 7))) .
+                       ')';
+       } else {
+               # merge commit
+               $formats_nav .=
+                       '(merge: ' .
+                       join(' ', map {
+                               $cgi->a({-href => href(action=>"commitdiff",
+                                                      hash=>$_)},
+                                       esc_html(substr($_, 0, 7)));
+                       } @$parents ) .
+                       ')';
+       }
+
         if (!defined $parent) {
                 $parent = "--root";
         }
         if (!defined $parent) {
                 $parent = "--root";
         }
-       open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $parent, $hash
-               or die_error(undef, "Open git-diff-tree failed");
-       my @difftree = map { chomp; $_ } <$fd>;
-       close $fd or die_error(undef, "Reading git-diff-tree failed");
+       my @difftree;
+       if (@$parents <= 1) {
+               # difftree output is not printed for merges
+               open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id",
+                       @diff_opts, $parent, $hash, "--"
+                               or die_error(undef, "Open git-diff-tree failed");
+               @difftree = map { chomp; $_ } <$fd>;
+               close $fd or die_error(undef, "Reading git-diff-tree failed");
+       }
  
         # non-textual hash id's can be cached
         my $expires;
  
         # non-textual hash id's can be cached
         my $expires;
@@ -3146,16 +3699,10 @@ sub git_commit {
  
         my $have_snapshot = gitweb_have_snapshot();
  
  
         my $have_snapshot = gitweb_have_snapshot();
  
-       my @views_nav = ();
-       if (defined $file_name && defined $co{'parent'}) {
-               push @views_nav,
-                       $cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
-                               "blame");
-       }
         git_header_html(undef, $expires);
         git_print_page_nav('commit', '',
                            $hash, $co{'tree'}, $hash,
         git_header_html(undef, $expires);
         git_print_page_nav('commit', '',
                            $hash, $co{'tree'}, $hash,
-                          join (' | ', @views_nav));
+                          $formats_nav);
  
         if (defined $co{'parent'}) {
                 git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
  
         if (defined $co{'parent'}) {
                 git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
@@ -3196,7 +3743,7 @@ sub git_commit {
         }
         print "</td>" .
               "</tr>\n";
         }
         print "</td>" .
               "</tr>\n";
-       my $parents = $co{'parents'};
+
         foreach my $par (@$parents) {
                 print "<tr>" .
                       "<td>parent</td>" .
         foreach my $par (@$parents) {
                 print "<tr>" .
                       "<td>parent</td>" .
@@ -3218,11 +3765,61 @@ sub git_commit {
         git_print_log($co{'comment'});
         print "</div>\n";
  
         git_print_log($co{'comment'});
         print "</div>\n";
  
-       git_difftree_body(\@difftree, $hash, $parent);
+       if (@$parents <= 1) {
+               # do not output difftree/whatchanged for merges
+               git_difftree_body(\@difftree, $hash, $parent);
+       }
  
         git_footer_html();
  }
  
  
         git_footer_html();
  }
  
+sub git_object {
+       # object is defined by:
+       # - hash or hash_base alone
+       # - hash_base and file_name
+       my $type;
+
+       # - hash or hash_base alone
+       if ($hash || ($hash_base && !defined $file_name)) {
+               my $object_id = $hash || $hash_base;
+
+               my $git_command = git_cmd_str();
+               open my $fd, "-|", "$git_command cat-file -t $object_id 2>/dev/null"
+                       or die_error('404 Not Found', "Object does not exist");
+               $type = <$fd>;
+               chomp $type;
+               close $fd
+                       or die_error('404 Not Found', "Object does not exist");
+
+       # - hash_base and file_name
+       } elsif ($hash_base && defined $file_name) {
+               $file_name =~ s,/+$,,;
+
+               system(git_cmd(), "cat-file", '-e', $hash_base) == 0
+                       or die_error('404 Not Found', "Base object does not exist");
+
+               # here errors should not hapen
+               open my $fd, "-|", git_cmd(), "ls-tree", $hash_base, "--", $file_name
+                       or die_error(undef, "Open git-ls-tree failed");
+               my $line = <$fd>;
+               close $fd;
+
+               #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
+               unless ($line && $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t/) {
+                       die_error('404 Not Found', "File or directory for given base does not exist");
+               }
+               $type = $2;
+               $hash = $3;
+       } else {
+               die_error('404 Not Found', "Not enough information to find object");
+       }
+
+       print $cgi->redirect(-uri => href(action=>$type, -full=>1,
+                                         hash=>$hash, hash_base=>$hash_base,
+                                         file_name=>$file_name),
+                            -status => '302 Found');
+}
+
  sub git_blobdiff {
         my $format = shift || 'html';
  
  sub git_blobdiff {
         my $format = shift || 'html';
  
@@ -3236,7 +3833,8 @@ sub git_blobdiff {
         if (defined $hash_base && defined $hash_parent_base) {
                 if (defined $file_name) {
                         # read raw output
         if (defined $hash_base && defined $hash_parent_base) {
                 if (defined $file_name) {
                         # read raw output
-                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base,
+                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                               $hash_parent_base, $hash_base,
                                 "--", $file_name
                                 or die_error(undef, "Open git-diff-tree failed");
                         @difftree = map { chomp; $_ } <$fd>;
                                 "--", $file_name
                                 or die_error(undef, "Open git-diff-tree failed");
                         @difftree = map { chomp; $_ } <$fd>;
@@ -3250,7 +3848,8 @@ sub git_blobdiff {
                         # try to find filename from $hash
  
                         # read filtered raw output
                         # try to find filename from $hash
  
                         # read filtered raw output
-                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base
+                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                               $hash_parent_base, $hash_base, "--"
                                 or die_error(undef, "Open git-diff-tree failed");
                         @difftree =
                                 # ':100644 100644 03b21826... 3b93d5e7... M     ls-files.c'
                                 or die_error(undef, "Open git-diff-tree failed");
                         @difftree =
                                 # ':100644 100644 03b21826... 3b93d5e7... M     ls-files.c'
@@ -3320,7 +3919,8 @@ sub git_blobdiff {
                 }
  
                 # open patch output
                 }
  
                 # open patch output
-               open $fd, "-|", git_cmd(), "diff", '-p', @diff_opts, $hash_parent, $hash
+               open $fd, "-|", git_cmd(), "diff", '-p', @diff_opts,
+                       $hash_parent, $hash, "--"
                         or die_error(undef, "Open git-diff failed");
         } else  {
                 die_error('404 Not Found', "Missing one of the blob diff parameters")
                         or die_error(undef, "Open git-diff failed");
         } else  {
                 die_error('404 Not Found', "Missing one of the blob diff parameters")
@@ -3374,8 +3974,8 @@ sub git_blobdiff {
  
         } else {
                 while (my $line = <$fd>) {
  
         } else {
                 while (my $line = <$fd>) {
-                       $line =~ s!a/($hash|$hash_parent)!'a/'.esc_html($diffinfo{'from_file'})!eg;
-                       $line =~ s!b/($hash|$hash_parent)!'b/'.esc_html($diffinfo{'to_file'})!eg;
+                       $line =~ s!a/($hash|$hash_parent)!'a/'.esc_path($diffinfo{'from_file'})!eg;
+                       $line =~ s!b/($hash|$hash_parent)!'b/'.esc_path($diffinfo{'to_file'})!eg;
  
                         print $line;
  
  
                         print $line;
  
@@ -3393,10 +3993,56 @@ sub git_blobdiff_plain {
  
  sub git_commitdiff {
         my $format = shift || 'html';
  
  sub git_commitdiff {
         my $format = shift || 'html';
+       $hash ||= $hash_base || "HEAD";
         my %co = parse_commit($hash);
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
         my %co = parse_commit($hash);
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
+
+       # we need to prepare $formats_nav before any parameter munging
+       my $formats_nav;
+       if ($format eq 'html') {
+               $formats_nav =
+                       $cgi->a({-href => href(action=>"commitdiff_plain",
+                                              hash=>$hash, hash_parent=>$hash_parent)},
+                               "raw");
+
+               if (defined $hash_parent) {
+                       # commitdiff with two commits given
+                       my $hash_parent_short = $hash_parent;
+                       if ($hash_parent =~ m/^[0-9a-fA-F]{40}$/) {
+                               $hash_parent_short = substr($hash_parent, 0, 7);
+                       }
+                       $formats_nav .=
+                               ' (from: ' .
+                               $cgi->a({-href => href(action=>"commitdiff",
+                                                      hash=>$hash_parent)},
+                                       esc_html($hash_parent_short)) .
+                               ')';
+               } elsif (!$co{'parent'}) {
+                       # --root commitdiff
+                       $formats_nav .= ' (initial)';
+               } elsif (scalar @{$co{'parents'}} == 1) {
+                       # single parent commit
+                       $formats_nav .=
+                               ' (parent: ' .
+                               $cgi->a({-href => href(action=>"commitdiff",
+                                                      hash=>$co{'parent'})},
+                                       esc_html(substr($co{'parent'}, 0, 7))) .
+                               ')';
+               } else {
+                       # merge commit
+                       $formats_nav .=
+                               ' (merge: ' .
+                               join(' ', map {
+                                       $cgi->a({-href => href(action=>"commitdiff",
+                                                              hash=>$_)},
+                                               esc_html(substr($_, 0, 7)));
+                               } @{$co{'parents'}} ) .
+                               ')';
+               }
+       }
+
         if (!defined $hash_parent) {
                 $hash_parent = $co{'parent'} || '--root';
         }
         if (!defined $hash_parent) {
                 $hash_parent = $co{'parent'} || '--root';
         }
@@ -3406,10 +4052,12 @@ sub git_commitdiff {
         my @difftree;
         if ($format eq 'html') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
         my @difftree;
         if ($format eq 'html') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
-                       "--patch-with-raw", "--full-index", $hash_parent, $hash
+                       "--no-commit-id", "--patch-with-raw", "--full-index",
+                       $hash_parent, $hash, "--"
                         or die_error(undef, "Open git-diff-tree failed");
  
                         or die_error(undef, "Open git-diff-tree failed");
  
-               while (chomp(my $line = <$fd>)) {
+               while (my $line = <$fd>) {
+                       chomp $line;
                         # empty line ends raw part of diff-tree output
                         last unless $line;
                         push @difftree, $line;
                         # empty line ends raw part of diff-tree output
                         last unless $line;
                         push @difftree, $line;
@@ -3417,7 +4065,7 @@ sub git_commitdiff {
  
         } elsif ($format eq 'plain') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
  
         } elsif ($format eq 'plain') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
-                       '-p', $hash_parent, $hash
+                       '-p', $hash_parent, $hash, "--"
                         or die_error(undef, "Open git-diff-tree failed");
  
         } else {
                         or die_error(undef, "Open git-diff-tree failed");
  
         } else {
@@ -3434,19 +4082,17 @@ sub git_commitdiff {
         if ($format eq 'html') {
                 my $refs = git_get_references();
                 my $ref = format_ref_marker($refs, $co{'id'});
         if ($format eq 'html') {
                 my $refs = git_get_references();
                 my $ref = format_ref_marker($refs, $co{'id'});
-               my $formats_nav =
-                       $cgi->a({-href => href(action=>"commitdiff_plain",
-                                              hash=>$hash, hash_parent=>$hash_parent)},
-                               "raw");
  
                 git_header_html(undef, $expires);
                 git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
                 git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
                 git_print_authorship(\%co);
                 print "<div class=\"page_body\">\n";
  
                 git_header_html(undef, $expires);
                 git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
                 git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
                 git_print_authorship(\%co);
                 print "<div class=\"page_body\">\n";
-               print "<div class=\"log\">\n";
-               git_print_simplified_log($co{'comment'}, 1); # skip title
-               print "</div>\n"; # class="log"
+               if (@{$co{'comment'}} > 1) {
+                       print "<div class=\"log\">\n";
+                       git_print_log($co{'comment'}, -final_empty_line=> 1, -remove_title => 1);
+                       print "</div>\n"; # class="log"
+               }
  
         } elsif ($format eq 'plain') {
                 my $refs = git_get_references("tags");
  
         } elsif ($format eq 'plain') {
                 my $refs = git_get_references("tags");
@@ -3567,6 +4213,10 @@ sub git_history {
  }
  
  sub git_search {
  }
  
  sub git_search {
+       my ($have_search) = gitweb_check_feature('search');
+       if (!$have_search) {
+               die_error('403 Permission denied', "Permission denied");
+       }
         if (!defined $searchtext) {
                 die_error(undef, "Text field empty");
         }
         if (!defined $searchtext) {
                 die_error(undef, "Text field empty");
         }
@@ -3577,6 +4227,9 @@ sub git_search {
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
+       if (!defined $page) {
+               $page = 0;
+       }
  
         $searchtype ||= 'commit';
         if ($searchtype eq 'pickaxe') {
  
         $searchtype ||= 'commit';
         if ($searchtype eq 'pickaxe') {
@@ -3589,64 +4242,68 @@ sub git_search {
         }
  
         git_header_html();
         }
  
         git_header_html();
-       git_print_page_nav('','', $hash,$co{'tree'},$hash);
-       git_print_header_div('commit', esc_html($co{'title'}), $hash);
  
  
-       print "<table cellspacing=\"0\">\n";
-       my $alternate = 1;
         if ($searchtype eq 'commit' or $searchtype eq 'author' or $searchtype eq 'committer') {
         if ($searchtype eq 'commit' or $searchtype eq 'author' or $searchtype eq 'committer') {
-               $/ = "\0";
-               open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", $hash or next;
-               while (my $commit_text = <$fd>) {
-                       if (!grep m/$searchtext/i, $commit_text) {
-                               next;
-                       }
-                       if ($searchtype eq 'author' && !grep m/\nauthor .*$searchtext/i, $commit_text) {
-                               next;
-                       }
-                       if ($searchtype eq 'committer' && !grep m/\ncommitter .*$searchtext/i, $commit_text) {
-                               next;
-                       }
-                       my @commit_lines = split "\n", $commit_text;
-                       my %co = parse_commit(undef, \@commit_lines);
-                       if (!%co) {
-                               next;
-                       }
-                       if ($alternate) {
-                               print "<tr class=\"dark\">\n";
-                       } else {
-                               print "<tr class=\"light\">\n";
-                       }
-                       $alternate ^= 1;
-                       print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
-                             "<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
-                             "<td>" .
-                             $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), -class => "list subject"},
-                                      esc_html(chop_str($co{'title'}, 50)) . "<br/>");
-                       my $comment = $co{'comment'};
-                       foreach my $line (@$comment) {
-                               if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
-                                       my $lead = esc_html($1) || "";
-                                       $lead = chop_str($lead, 30, 10);
-                                       my $match = esc_html($2) || "";
-                                       my $trail = esc_html($3) || "";
-                                       $trail = chop_str($trail, 30, 10);
-                                       my $text = "$lead<span class=\"match\">$match</span>$trail";
-                                       print chop_str($text, 80, 5) . "<br/>\n";
-                               }
-                       }
-                       print "</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
-                             " | " .
-                             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
-                       print "</td>\n" .
-                             "</tr>\n";
+               my $greptype;
+               if ($searchtype eq 'commit') {
+                       $greptype = "--grep=";
+               } elsif ($searchtype eq 'author') {
+                       $greptype = "--author=";
+               } elsif ($searchtype eq 'committer') {
+                       $greptype = "--committer=";
                 }
                 }
+               open my $fd, "-|", git_cmd(), "rev-list",
+                       ("--max-count=" . (100 * ($page+1))),
+                       ($greptype . $searchtext),
+                       $hash, "--"
+                       or next;
+               my @revlist = map { chomp; $_ } <$fd>;
                 close $fd;
                 close $fd;
+
+               my $paging_nav = '';
+               if ($page > 0) {
+                       $paging_nav .=
+                               $cgi->a({-href => href(action=>"search", hash=>$hash,
+                                                      searchtext=>$searchtext, searchtype=>$searchtype)},
+                                       "first");
+                       $paging_nav .= " &sdot; " .
+                               $cgi->a({-href => href(action=>"search", hash=>$hash,
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page-1),
+                                        -accesskey => "p", -title => "Alt-p"}, "prev");
+               } else {
+                       $paging_nav .= "first";
+                       $paging_nav .= " &sdot; prev";
+               }
+               if ($#revlist >= (100 * ($page+1)-1)) {
+                       $paging_nav .= " &sdot; " .
+                               $cgi->a({-href => href(action=>"search", hash=>$hash,
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page+1),
+                                        -accesskey => "n", -title => "Alt-n"}, "next");
+               } else {
+                       $paging_nav .= " &sdot; next";
+               }
+               my $next_link = '';
+               if ($#revlist >= (100 * ($page+1)-1)) {
+                       $next_link =
+                               $cgi->a({-href => href(action=>"search", hash=>$hash,
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page+1),
+                                        -accesskey => "n", -title => "Alt-n"}, "next");
+               }
+
+               git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
+               git_print_header_div('commit', esc_html($co{'title'}), $hash);
+               git_search_grep_body(\@revlist, ($page * 100), $#revlist, $next_link);
         }
  
         if ($searchtype eq 'pickaxe') {
         }
  
         if ($searchtype eq 'pickaxe') {
+               git_print_page_nav('','', $hash,$co{'tree'},$hash);
+               git_print_header_div('commit', esc_html($co{'title'}), $hash);
+
+               print "<table cellspacing=\"0\">\n";
+               my $alternate = 1;
                 $/ = "\n";
                 my $git_command = git_cmd_str();
                 open my $fd, "-|", "$git_command rev-list $hash | " .
                 $/ = "\n";
                 my $git_command = git_cmd_str();
                 open my $fd, "-|", "$git_command rev-list $hash | " .
@@ -3686,7 +4343,7 @@ sub git_search {
                                                 print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
                                                                              hash=>$set{'id'}, file_name=>$set{'file'}),
                                                               -class => "list"},
                                                 print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
                                                                              hash=>$set{'id'}, file_name=>$set{'file'}),
                                                               -class => "list"},
-                                                             "<span class=\"match\">" . esc_html($set{'file'}) . "</span>") .
+                                                             "<span class=\"match\">" . esc_path($set{'file'}) . "</span>") .
                                                       "<br/>\n";
                                         }
                                         print "</td>\n" .
                                                       "<br/>\n";
                                         }
                                         print "</td>\n" .
@@ -3701,8 +4358,9 @@ sub git_search {
                         }
                 }
                 close $fd;
                         }
                 }
                 close $fd;
+
+               print "</table>\n";
         }
         }
-       print "</table>\n";
         git_footer_html();
  }
  
         git_footer_html();
  }
  
@@ -3742,7 +4400,7 @@ sub git_shortlog {
         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)));
-       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash, "--"
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
@@ -3766,69 +4424,237 @@ sub git_shortlog {
  }
  
  ## ......................................................................
  }
  
  ## ......................................................................
-## feeds (RSS, OPML)
+## feeds (RSS, Atom; OPML)
  
  
-sub git_rss {
-       # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
-       open my $fd, "-|", git_cmd(), "rev-list", "--max-count=150", git_get_head_hash($project)
+sub git_feed {
+       my $format = shift || 'atom';
+       my ($have_blame) = gitweb_check_feature('blame');
+
+       # Atom: http://www.atomenabled.org/developers/syndication/
+       # RSS:  http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
+       if ($format ne 'rss' && $format ne 'atom') {
+               die_error(undef, "Unknown web feed format");
+       }
+
+       # log/feed of current (HEAD) branch, log of given branch, history of file/directory
+       my $head = $hash || 'HEAD';
+       open my $fd, "-|", git_cmd(), "rev-list", "--max-count=150",
+               $head, "--", (defined $file_name ? $file_name : ())
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd or die_error(undef, "Reading git-rev-list failed");
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd or die_error(undef, "Reading git-rev-list failed");
-       print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
-       print <<XML;
-<?xml version="1.0" encoding="utf-8"?>
+
+       my %latest_commit;
+       my %latest_date;
+       my $content_type = "application/$format+xml";
+       if (defined $cgi->http('HTTP_ACCEPT') &&
+                $cgi->Accept('text/xml') > $cgi->Accept($content_type)) {
+               # browser (feed reader) prefers text/xml
+               $content_type = 'text/xml';
+       }
+       if (defined($revlist[0])) {
+               %latest_commit = parse_commit($revlist[0]);
+               %latest_date   = parse_date($latest_commit{'author_epoch'});
+               print $cgi->header(
+                       -type => $content_type,
+                       -charset => 'utf-8',
+                       -last_modified => $latest_date{'rfc2822'});
+       } else {
+               print $cgi->header(
+                       -type => $content_type,
+                       -charset => 'utf-8');
+       }
+
+       # Optimization: skip generating the body if client asks only
+       # for Last-Modified date.
+       return if ($cgi->request_method() eq 'HEAD');
+
+       # header variables
+       my $title = "$site_name - $project/$action";
+       my $feed_type = 'log';
+       if (defined $hash) {
+               $title .= " - '$hash'";
+               $feed_type = 'branch log';
+               if (defined $file_name) {
+                       $title .= " :: $file_name";
+                       $feed_type = 'history';
+               }
+       } elsif (defined $file_name) {
+               $title .= " - $file_name";
+               $feed_type = 'history';
+       }
+       $title .= " $feed_type";
+       my $descr = git_get_project_description($project);
+       if (defined $descr) {
+               $descr = esc_html($descr);
+       } else {
+               $descr = "$project " .
+                        ($format eq 'rss' ? 'RSS' : 'Atom') .
+                        " feed";
+       }
+       my $owner = git_get_project_owner($project);
+       $owner = esc_html($owner);
+
+       #header
+       my $alt_url;
+       if (defined $file_name) {
+               $alt_url = href(-full=>1, action=>"history", hash=>$hash, file_name=>$file_name);
+       } elsif (defined $hash) {
+               $alt_url = href(-full=>1, action=>"log", hash=>$hash);
+       } else {
+               $alt_url = href(-full=>1, action=>"summary");
+       }
+       print qq!<?xml version="1.0" encoding="utf-8"?>\n!;
+       if ($format eq 'rss') {
+               print <<XML;
  <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
  <channel>
  <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
  <channel>
-<title>$project $my_uri $my_url</title>
-<link>${\esc_html("$my_url?p=$project;a=summary")}</link>
-<description>$project log</description>
-<language>en</language>
  XML
  XML
+               print "<title>$title</title>\n" .
+                     "<link>$alt_url</link>\n" .
+                     "<description>$descr</description>\n" .
+                     "<language>en</language>\n";
+       } elsif ($format eq 'atom') {
+               print <<XML;
+<feed xmlns="http://www.w3.org/2005/Atom">
+XML
+               print "<title>$title</title>\n" .
+                     "<subtitle>$descr</subtitle>\n" .
+                     '<link rel="alternate" type="text/html" href="' .
+                     $alt_url . '" />' . "\n" .
+                     '<link rel="self" type="' . $content_type . '" href="' .
+                     $cgi->self_url() . '" />' . "\n" .
+                     "<id>" . href(-full=>1) . "</id>\n" .
+                     # use project owner for feed author
+                     "<author><name>$owner</name></author>\n";
+               if (defined $favicon) {
+                       print "<icon>" . esc_url($favicon) . "</icon>\n";
+               }
+               if (defined $logo_url) {
+                       # not twice as wide as tall: 72 x 27 pixels
+                       print "<logo>" . esc_url($logo) . "</logo>\n";
+               }
+               if (! %latest_date) {
+                       # dummy date to keep the feed valid until commits trickle in:
+                       print "<updated>1970-01-01T00:00:00Z</updated>\n";
+               } else {
+                       print "<updated>$latest_date{'iso-8601'}</updated>\n";
+               }
+       }
  
  
+       # contents
         for (my $i = 0; $i <= $#revlist; $i++) {
                 my $commit = $revlist[$i];
                 my %co = parse_commit($commit);
                 # we read 150, we always show 30 and the ones more recent than 48 hours
         for (my $i = 0; $i <= $#revlist; $i++) {
                 my $commit = $revlist[$i];
                 my %co = parse_commit($commit);
                 # we read 150, we always show 30 and the ones more recent than 48 hours
-               if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) {
+               if (($i >= 20) && ((time - $co{'author_epoch'}) > 48*60*60)) {
                         last;
                 }
                         last;
                 }
-               my %cd = parse_date($co{'committer_epoch'});
+               my %cd = parse_date($co{'author_epoch'});
+
+               # get list of changed files
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
-                       $co{'parent'}, $co{'id'}
+                       $co{'parent'}, $co{'id'}, "--", (defined $file_name ? $file_name : ())
                         or next;
                 my @difftree = map { chomp; $_ } <$fd>;
                 close $fd
                         or next;
                         or next;
                 my @difftree = map { chomp; $_ } <$fd>;
                 close $fd
                         or next;
-               print "<item>\n" .
-                     "<title>" .
-                     sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . esc_html($co{'title'}) .
-                     "</title>\n" .
-                     "<author>" . esc_html($co{'author'}) . "</author>\n" .
-                     "<pubDate>$cd{'rfc2822'}</pubDate>\n" .
-                     "<guid isPermaLink=\"true\">" . esc_html("$my_url?p=$project;a=commit;h=$commit") . "</guid>\n" .
-                     "<link>" . esc_html("$my_url?p=$project;a=commit;h=$commit") . "</link>\n" .
-                     "<description>" . esc_html($co{'title'}) . "</description>\n" .
-                     "<content:encoded>" .
-                     "<![CDATA[\n";
+
+               # print element (entry, item)
+               my $co_url = href(-full=>1, action=>"commit", hash=>$commit);
+               if ($format eq 'rss') {
+                       print "<item>\n" .
+                             "<title>" . esc_html($co{'title'}) . "</title>\n" .
+                             "<author>" . esc_html($co{'author'}) . "</author>\n" .
+                             "<pubDate>$cd{'rfc2822'}</pubDate>\n" .
+                             "<guid isPermaLink=\"true\">$co_url</guid>\n" .
+                             "<link>$co_url</link>\n" .
+                             "<description>" . esc_html($co{'title'}) . "</description>\n" .
+                             "<content:encoded>" .
+                             "<![CDATA[\n";
+               } elsif ($format eq 'atom') {
+                       print "<entry>\n" .
+                             "<title type=\"html\">" . esc_html($co{'title'}) . "</title>\n" .
+                             "<updated>$cd{'iso-8601'}</updated>\n" .
+                             "<author>\n" .
+                             "  <name>" . esc_html($co{'author_name'}) . "</name>\n";
+                       if ($co{'author_email'}) {
+                               print "  <email>" . esc_html($co{'author_email'}) . "</email>\n";
+                       }
+                       print "</author>\n" .
+                             # use committer for contributor
+                             "<contributor>\n" .
+                             "  <name>" . esc_html($co{'committer_name'}) . "</name>\n";
+                       if ($co{'committer_email'}) {
+                               print "  <email>" . esc_html($co{'committer_email'}) . "</email>\n";
+                       }
+                       print "</contributor>\n" .
+                             "<published>$cd{'iso-8601'}</published>\n" .
+                             "<link rel=\"alternate\" type=\"text/html\" href=\"$co_url\" />\n" .
+                             "<id>$co_url</id>\n" .
+                             "<content type=\"xhtml\" xml:base=\"" . esc_url($my_url) . "\">\n" .
+                             "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+               }
                 my $comment = $co{'comment'};
                 my $comment = $co{'comment'};
+               print "<pre>\n";
                 foreach my $line (@$comment) {
                 foreach my $line (@$comment) {
-                       $line = to_utf8($line);
-                       print "$line<br/>\n";
+                       $line = esc_html($line);
+                       print "$line\n";
                 }
                 }
-               print "<br/>\n";
-               foreach my $line (@difftree) {
-                       if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) {
-                               next;
+               print "</pre><ul>\n";
+               foreach my $difftree_line (@difftree) {
+                       my %difftree = parse_difftree_raw_line($difftree_line);
+                       next if !$difftree{'from_id'};
+
+                       my $file = $difftree{'file'} || $difftree{'to_file'};
+
+                       print "<li>" .
+                             "[" .
+                             $cgi->a({-href => href(-full=>1, action=>"blobdiff",
+                                                    hash=>$difftree{'to_id'}, hash_parent=>$difftree{'from_id'},
+                                                    hash_base=>$co{'id'}, hash_parent_base=>$co{'parent'},
+                                                    file_name=>$file, file_parent=>$difftree{'from_file'}),
+                                     -title => "diff"}, 'D');
+                       if ($have_blame) {
+                               print $cgi->a({-href => href(-full=>1, action=>"blame",
+                                                            file_name=>$file, hash_base=>$commit),
+                                             -title => "blame"}, 'B');
                         }
                         }
-                       my $file = esc_html(unquote($7));
-                       $file = to_utf8($file);
-                       print "$file<br/>\n";
+                       # if this is not a feed of a file history
+                       if (!defined $file_name || $file_name ne $file) {
+                               print $cgi->a({-href => href(-full=>1, action=>"history",
+                                                            file_name=>$file, hash=>$commit),
+                                             -title => "history"}, 'H');
+                       }
+                       $file = esc_path($file);
+                       print "] ".
+                             "$file</li>\n";
+               }
+               if ($format eq 'rss') {
+                       print "</ul>]]>\n" .
+                             "</content:encoded>\n" .
+                             "</item>\n";
+               } elsif ($format eq 'atom') {
+                       print "</ul>\n</div>\n" .
+                             "</content>\n" .
+                             "</entry>\n";
                 }
                 }
-               print "]]>\n" .
-                     "</content:encoded>\n" .
-                     "</item>\n";
         }
         }
-       print "</channel></rss>";
+
+       # end of feed
+       if ($format eq 'rss') {
+               print "</channel>\n</rss>\n";
+       }       elsif ($format eq 'atom') {
+               print "</feed>\n";
+       }
+}
+
+sub git_rss {
+       git_feed('rss');
+}
+
+sub git_atom {
+       git_feed('atom');
  }
  
  sub git_opml {
  }
  
  sub git_opml {
@@ -3839,7 +4665,7 @@ sub git_opml {
  <?xml version="1.0" encoding="utf-8"?>
  <opml version="1.0">
  <head>
  <?xml version="1.0" encoding="utf-8"?>
  <opml version="1.0">
  <head>
-  <title>$site_name Git OPML Export</title>
+  <title>$site_name OPML Export</title>
  </head>
  <body>
  <outline text="git RSS feeds">
  </head>
  <body>
  <outline text="git RSS feeds">