gitweb: Convert project name to UTF-8

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

index 39678ecf82b6129644719980e8d3321c59211f2569c6bf84bdbf10150acdff41..e473e8ec81d9a80787aef86c31f957eb8a4832546081759a8eb78c7bc332f162 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -18,6 +18,10 @@ use File::Find qw();
  use File::Basename qw(basename);
  binmode STDOUT, ':utf8';
  
  use File::Basename qw(basename);
  binmode STDOUT, ':utf8';
  
+BEGIN {
+       CGI->compile() if $ENV{MOD_PERL};
+}
+
  our $cgi = new CGI;
  our $version = "++GIT_VERSION++";
  our $my_url = $cgi->url();
  our $cgi = new CGI;
  our $version = "++GIT_VERSION++";
  our $my_url = $cgi->url();
@@ -39,22 +43,45 @@ 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++";
  # html text to include at home page
  our $home_text = "++GITWEB_HOMETEXT++";
  # html text to include at home page
  our $home_text = "++GITWEB_HOMETEXT++";
+# filename of html text to include at bottom of each page
+our $site_footer = "++GITWEB_SITE_FOOTER++";
  
  
-# URI of default stylesheet
-our $stylesheet = "++GITWEB_CSS++";
-# URI of GIT logo
+# URI of stylesheets
+our @stylesheets = ("++GITWEB_CSS++");
+# 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++";
  our $logo = "++GITWEB_LOGO++";
+# URI of GIT favicon, assumed to be image/png type
+our $favicon = "++GITWEB_FAVICON++";
+
+# URI and label (title) of GIT logo link
+#our $logo_url = "http://www.kernel.org/pub/software/scm/git/docs/";
+#our $logo_label = "git documentation";
+our $logo_url = "http://git.or.cz/";
+our $logo_label = "git homepage";
  
  # source of projects list
  our $projects_list = "++GITWEB_LIST++";
  
  
  # source of projects list
  our $projects_list = "++GITWEB_LIST++";
  
+# show repository only if this file exists
+# (only effective if this variable evaluates to true)
+our $export_ok = "++GITWEB_EXPORT_OK++";
+
+# only allow viewing of repositories also shown on the overview page
+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';
@@ -78,35 +105,104 @@ our %feature = (
         #
         # use gitweb_check_feature(<feature>) to check if <feature> is enabled
  
         #
         # use gitweb_check_feature(<feature>) to check if <feature> is enabled
  
+       # Enable the 'blame' blob view, showing the last commit that modified
+       # each line in the file. This can be very CPU-intensive.
+
+       # To enable system wide have in $GITWEB_CONFIG
+       # $feature{'blame'}{'default'} = [1];
+       # To have project specific config enable override in $GITWEB_CONFIG
+       # $feature{'blame'}{'override'} = 1;
+       # and in project config gitweb.blame = 0|1;
         'blame' => {
                 'sub' => \&feature_blame,
                 'override' => 0,
                 'default' => [0]},
  
         'blame' => {
                 'sub' => \&feature_blame,
                 'override' => 0,
                 'default' => [0]},
  
+       # Enable the 'snapshot' link, providing a compressed tarball of any
+       # tree. This can potentially generate high traffic if you have large
+       # project.
+
+       # To disable system wide have in $GITWEB_CONFIG
+       # $feature{'snapshot'}{'default'} = [undef];
+       # To have project specific config enable override in $GITWEB_CONFIG
+       # $feature{'snapshot'}{'override'} = 1;
+       # and in project config gitweb.snapshot = none|gzip|bzip2;
         'snapshot' => {
                 'sub' => \&feature_snapshot,
                 'override' => 0,
                 #         => [content-encoding, suffix, program]
                 'default' => ['x-gzip', 'gz', 'gzip']},
         'snapshot' => {
                 'sub' => \&feature_snapshot,
                 'override' => 0,
                 #         => [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.
+
+       # To enable system wide have in $GITWEB_CONFIG
+       # $feature{'pickaxe'}{'default'} = [1];
+       # To have project specific config enable override in $GITWEB_CONFIG
+       # $feature{'pickaxe'}{'override'} = 1;
+       # and in project config gitweb.pickaxe = 0|1;
+       'pickaxe' => {
+               'sub' => \&feature_pickaxe,
+               'override' => 0,
+               'default' => [1]},
+
+       # Make gitweb use an alternative format of the URLs which can be
+       # more readable and natural-looking: project name is embedded
+       # directly in the path and the query string contains other
+       # auxiliary information. All gitweb installations recognize
+       # URL in either format; this configures in which formats gitweb
+       # generates links.
+
+       # To enable system wide have in $GITWEB_CONFIG
+       # $feature{'pathinfo'}{'default'} = [1];
+       # Project specific override is not supported.
+
+       # Note that you will need to change the default location of CSS,
+       # favicon, logo and possibly other files to an absolute URL. Also,
+       # if gitweb.cgi serves as your indexfile, you will need to force
+       # $my_uri to contain the script name in your $GITWEB_CONFIG.
+       '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 {
         my ($name) = @_;
  );
  
  sub gitweb_check_feature {
         my ($name) = @_;
-       return undef unless exists $feature{$name};
+       return unless exists $feature{$name};
         my ($sub, $override, @defaults) = (
                 $feature{$name}{'sub'},
                 $feature{$name}{'override'},
                 @{$feature{$name}{'default'}});
         if (!$override) { return @defaults; }
         my ($sub, $override, @defaults) = (
                 $feature{$name}{'sub'},
                 $feature{$name}{'override'},
                 @{$feature{$name}{'default'}});
         if (!$override) { return @defaults; }
+       if (!defined $sub) {
+               warn "feature $name is not overrideable";
+               return @defaults;
+       }
         return $sub->(@defaults);
  }
  
         return $sub->(@defaults);
  }
  
-# To enable system wide have in $GITWEB_CONFIG
-# $feature{'blame'}{'default'} = [1];
-# To have project specific config enable override in $GITWEB_CONFIG
-# $feature{'blame'}{'override'} = 1;
-# and in project config gitweb.blame = 0|1;
-
  sub feature_blame {
         my ($val) = git_get_project_config('blame', '--bool');
  
  sub feature_blame {
         my ($val) = git_get_project_config('blame', '--bool');
  
@@ -119,12 +215,6 @@ sub feature_blame {
         return $_[0];
  }
  
         return $_[0];
  }
  
-# 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;
-# and in project config  gitweb.snapshot = none|gzip|bzip2
-
  sub feature_snapshot {
         my ($ctype, $suffix, $command) = @_;
  
  sub feature_snapshot {
         my ($ctype, $suffix, $command) = @_;
  
@@ -141,6 +231,41 @@ sub feature_snapshot {
         return ($ctype, $suffix, $command);
  }
  
         return ($ctype, $suffix, $command);
  }
  
+sub gitweb_have_snapshot {
+       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
+       my $have_snapshot = (defined $ctype && defined $suffix);
+
+       return $have_snapshot;
+}
+
+sub feature_pickaxe {
+       my ($val) = git_get_project_config('pickaxe', '--bool');
+
+       if ($val eq 'true') {
+               return (1);
+       } elsif ($val eq 'false') {
+               return (0);
+       }
+
+       return ($_[0]);
+}
+
+# checking HEAD file with -e is fragile if the repository was
+# initialized long time ago (i.e. symlink HEAD) and was pack-ref'ed
+# and then pruned.
+sub check_head_link {
+       my ($dir) = @_;
+       my $headfile = "$dir/HEAD";
+       return ((-e $headfile) ||
+               (-l $headfile && readlink($headfile) =~ /^refs\/heads\//));
+}
+
+sub check_export_ok {
+       my ($dir) = @_;
+       return (check_head_link($dir) &&
+               (!$export_ok || -e "$dir/$export_ok"));
+}
+
  # rename detection options for git-diff and git-diff-tree
  # - default is '-M', with the cost proportional to
  #   (number of removed files) * (number of new files).
  # rename detection options for git-diff and git-diff-tree
  # - default is '-M', with the cost proportional to
  #   (number of removed files) * (number of new files).
@@ -152,14 +277,11 @@ sub feature_snapshot {
  our @diff_opts = ('-M'); # taken from git_commit
  
  our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
  our @diff_opts = ('-M'); # taken from git_commit
  
  our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
-require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
+do $GITWEB_CONFIG if -e $GITWEB_CONFIG;
  
  # version of the core git binary
  our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
  
  
  # version of the core git binary
  our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
  
-# path to the current git repository
-our $git_dir;
-
  $projects_list ||= $projectroot;
  
  # ======================================================================
  $projects_list ||= $projectroot;
  
  # ======================================================================
@@ -171,70 +293,66 @@ if (defined $action) {
         }
  }
  
         }
  }
  
-our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
-if (defined $project) {
-       $project =~ s|^/||;
-       $project =~ s|/$||;
-       $project = undef unless $project;
-}
+# parameters which are pathnames
+our $project = $cgi->param('p');
  if (defined $project) {
  if (defined $project) {
-       if (!validate_input($project)) {
-               die_error(undef, "Invalid project parameter");
-       }
-       if (!(-d "$projectroot/$project")) {
-               die_error(undef, "No such directory");
-       }
-       if (!(-e "$projectroot/$project/HEAD")) {
+       if (!validate_pathname($project) ||
+           !(-d "$projectroot/$project") ||
+           !check_head_link("$projectroot/$project") ||
+           ($export_ok && !(-e "$projectroot/$project/$export_ok")) ||
+           ($strict_export && !project_in_list($project))) {
+               undef $project;
                 die_error(undef, "No such project");
         }
                 die_error(undef, "No such project");
         }
-       $git_dir = "$projectroot/$project";
  }
  
  our $file_name = $cgi->param('f');
  if (defined $file_name) {
  }
  
  our $file_name = $cgi->param('f');
  if (defined $file_name) {
-       if (!validate_input($file_name)) {
+       if (!validate_pathname($file_name)) {
                 die_error(undef, "Invalid file parameter");
         }
  }
  
  our $file_parent = $cgi->param('fp');
  if (defined $file_parent) {
                 die_error(undef, "Invalid file parameter");
         }
  }
  
  our $file_parent = $cgi->param('fp');
  if (defined $file_parent) {
-       if (!validate_input($file_parent)) {
+       if (!validate_pathname($file_parent)) {
                 die_error(undef, "Invalid file parent parameter");
         }
  }
  
                 die_error(undef, "Invalid file parent parameter");
         }
  }
  
+# parameters which are refnames
  our $hash = $cgi->param('h');
  if (defined $hash) {
  our $hash = $cgi->param('h');
  if (defined $hash) {
-       if (!validate_input($hash)) {
+       if (!validate_refname($hash)) {
                 die_error(undef, "Invalid hash parameter");
         }
  }
  
  our $hash_parent = $cgi->param('hp');
  if (defined $hash_parent) {
                 die_error(undef, "Invalid hash parameter");
         }
  }
  
  our $hash_parent = $cgi->param('hp');
  if (defined $hash_parent) {
-       if (!validate_input($hash_parent)) {
+       if (!validate_refname($hash_parent)) {
                 die_error(undef, "Invalid hash parent parameter");
         }
  }
  
  our $hash_base = $cgi->param('hb');
  if (defined $hash_base) {
                 die_error(undef, "Invalid hash parent parameter");
         }
  }
  
  our $hash_base = $cgi->param('hb');
  if (defined $hash_base) {
-       if (!validate_input($hash_base)) {
+       if (!validate_refname($hash_base)) {
                 die_error(undef, "Invalid hash base parameter");
         }
  }
  
  our $hash_parent_base = $cgi->param('hpb');
  if (defined $hash_parent_base) {
                 die_error(undef, "Invalid hash base parameter");
         }
  }
  
  our $hash_parent_base = $cgi->param('hpb');
  if (defined $hash_parent_base) {
-       if (!validate_input($hash_parent_base)) {
+       if (!validate_refname($hash_parent_base)) {
                 die_error(undef, "Invalid hash parent base parameter");
         }
  }
  
                 die_error(undef, "Invalid hash parent base parameter");
         }
  }
  
+# other parameters
  our $page = $cgi->param('pg');
  if (defined $page) {
  our $page = $cgi->param('pg');
  if (defined $page) {
-       if ($page =~ m/[^0-9]$/) {
+       if ($page =~ m/[^0-9]/) {
                 die_error(undef, "Invalid page parameter");
         }
  }
                 die_error(undef, "Invalid page parameter");
         }
  }
@@ -244,9 +362,68 @@ 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;
  }
  
+our $searchtype = $cgi->param('st');
+if (defined $searchtype) {
+       if ($searchtype =~ m/[^a-z]/) {
+               die_error(undef, "Invalid searchtype parameter");
+       }
+}
+
+# now read PATH_INFO and use it as alternative to parameters
+sub evaluate_path_info {
+       return if defined $project;
+       my $path_info = $ENV{"PATH_INFO"};
+       return if !$path_info;
+       $path_info =~ s,^/+,,;
+       return if !$path_info;
+       # find which part of PATH_INFO is project
+       $project = $path_info;
+       $project =~ s,/+$,,;
+       while ($project && !check_head_link("$projectroot/$project")) {
+               $project =~ s,/*[^/]*$,,;
+       }
+       # validate project
+       $project = validate_pathname($project);
+       if (!$project ||
+           ($export_ok && !-e "$projectroot/$project/$export_ok") ||
+           ($strict_export && !project_in_list($project))) {
+               undef $project;
+               return;
+       }
+       # do not change any parameters if an action is given using the query string
+       return if $action;
+       $path_info =~ s,^$project/*,,;
+       my ($refname, $pathname) = split(/:/, $path_info, 2);
+       if (defined $pathname) {
+               # we got "project.git/branch:filename" or "project.git/branch:dir/"
+               # we could use git_get_type(branch:pathname), but it needs $git_dir
+               $pathname =~ s,^/+,,;
+               if (!$pathname || substr($pathname, -1) eq "/") {
+                       $action  ||= "tree";
+                       $pathname =~ s,/$,,;
+               } else {
+                       $action  ||= "blob_plain";
+               }
+               $hash_base ||= validate_refname($refname);
+               $file_name ||= validate_pathname($pathname);
+       } elsif (defined $refname) {
+               # we got "project.git/branch"
+               $action ||= "shortlog";
+               $hash   ||= validate_refname($refname);
+       }
+}
+evaluate_path_info();
+
+# path to the current git repository
+our $git_dir;
+$git_dir = "$projectroot/$project" if $project;
+
  # dispatch
  my %actions = (
         "blame" => \&git_blame2,
  # dispatch
  my %actions = (
         "blame" => \&git_blame2,
@@ -257,20 +434,25 @@ 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" => \&git_search,
+       "search_help" => \&git_search_help,
         "shortlog" => \&git_shortlog,
         "summary" => \&git_summary,
         "tag" => \&git_tag,
         "tags" => \&git_tags,
         "tree" => \&git_tree,
         "snapshot" => \&git_snapshot,
         "shortlog" => \&git_shortlog,
         "summary" => \&git_summary,
         "tag" => \&git_tag,
         "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,
+       "project_index" => \&git_project_index,
  );
  
  if (defined $project) {
  );
  
  if (defined $project) {
@@ -281,6 +463,10 @@ if (defined $project) {
  if (!defined($actions{$action})) {
         die_error(undef, "Unknown action");
  }
  if (!defined($actions{$action})) {
         die_error(undef, "Unknown action");
  }
+if ($action !~ m/^(opml|project_list|project_index)$/ &&
+    !$project) {
+       die_error(undef, "Project needed");
+}
  $actions{$action}->();
  exit;
  
  $actions{$action}->();
  exit;
  
@@ -289,6 +475,11 @@ exit;
  
  sub href(%) {
         my %params = @_;
  
  sub href(%) {
         my %params = @_;
+       # 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.
  
         my @mapping = (
                 project => "p",
  
         my @mapping = (
                 project => "p",
@@ -300,12 +491,27 @@ sub href(%) {
                 hash_base => "hb",
                 hash_parent_base => "hpb",
                 page => "pg",
                 hash_base => "hb",
                 hash_parent_base => "hpb",
                 page => "pg",
+               order => "o",
                 searchtext => "s",
                 searchtext => "s",
+               searchtype => "st",
         );
         my %mapping = @mapping;
  
         );
         my %mapping = @mapping;
  
-       $params{"project"} ||= $project;
+       $params{'project'} = $project unless exists $params{'project'};
+
+       my ($use_pathinfo) = gitweb_check_feature('pathinfo');
+       if ($use_pathinfo) {
+               # use PATH_INFO for project name
+               $href .= "/$params{'project'}" if defined $params{'project'};
+               delete $params{'project'};
  
  
+               # Summary just uses the project path URL
+               if (defined $params{'action'} && $params{'action'} eq 'summary') {
+                       delete $params{'action'};
+               }
+       }
+
+       # now encode the parameters explicitly
         my @result = ();
         for (my $i = 0; $i < @mapping; $i += 2) {
                 my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
         my @result = ();
         for (my $i = 0; $i < @mapping; $i += 2) {
                 my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
@@ -313,31 +519,66 @@ sub href(%) {
                         push @result, $symbol . "=" . esc_param($params{$name});
                 }
         }
                         push @result, $symbol . "=" . esc_param($params{$name});
                 }
         }
-       return "$my_uri?" . join(';', @result);
+       $href .= "?" . join(';', @result) if scalar @result;
+
+       return $href;
  }
  
  
  ## ======================================================================
  ## validation, quoting/unquoting and escaping
  
  }
  
  
  ## ======================================================================
  ## validation, quoting/unquoting and escaping
  
-sub validate_input {
-       my $input = shift;
+sub validate_pathname {
+       my $input = shift || return undef;
  
  
-       if ($input =~ m/^[0-9a-fA-F]{40}$/) {
-               return $input;
+       # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+       # at the beginning, at the end, and between slashes.
+       # also this catches doubled slashes
+       if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
+               return undef;
         }
         }
-       if ($input =~ m/(^|\/)(|\.|\.\.)($|\/)/) {
+       # no null characters
+       if ($input =~ m!\0!) {
                 return undef;
         }
                 return undef;
         }
-       if ($input =~ m/[^a-zA-Z0-9_\x80-\xff\ \t\.\/\-\+\#\~\%]/) {
+       return $input;
+}
+
+sub validate_refname {
+       my $input = shift || return undef;
+
+       # textual hashes are O.K.
+       if ($input =~ m/^[0-9a-fA-F]{40}$/) {
+               return $input;
+       }
+       # it must be correct pathname
+       $input = validate_pathname($input)
+               or return undef;
+       # restrictions on ref name according to git-check-ref-format
+       if ($input =~ m!(/\.|\.\.|[\000-\040\177 ~^:?*\[]|/$)!) {
                 return undef;
         }
         return $input;
  }
  
                 return undef;
         }
         return $input;
  }
  
+# very thin wrapper for decode("utf8", $str, Encode::FB_DEFAULT);
+sub to_utf8 {
+       my $str = shift;
+       return decode("utf8", $str, Encode::FB_DEFAULT);
+}
+
  # quote unsafe chars, but keep the slash, even when it's not
  # correct, but quoted slashes look too horrible in bookmarks
  sub esc_param {
  # quote unsafe chars, but keep the slash, even when it's not
  # correct, but quoted slashes look too horrible in bookmarks
  sub esc_param {
+       my $str = shift;
+       $str =~ s/([^A-Za-z0-9\-_.~()\/:@])/sprintf("%%%02X", ord($1))/eg;
+       $str =~ s/\+/%2B/g;
+       $str =~ s/ /\+/g;
+       return $str;
+}
+
+# quote unsafe chars in whole URL, so some charactrs cannot be quoted
+sub esc_url {
         my $str = shift;
         $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
         $str =~ s/\+/%2B/g;
         my $str = shift;
         $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
         $str =~ s/\+/%2B/g;
@@ -346,20 +587,93 @@ sub esc_param {
  }
  
  # 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;
-       $str = decode("utf8", $str, Encode::FB_DEFAULT);
+       my %opts = @_;
+
+       $str = to_utf8($str);
         $str = escapeHTML($str);
         $str = escapeHTML($str);
-       $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
+       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;
  }
@@ -378,6 +692,12 @@ sub untabify {
         return $line;
  }
  
         return $line;
  }
  
+sub project_in_list {
+       my $project = shift;
+       my @list = git_get_projects_list();
+       return @list && scalar(grep { $_->{'path'} eq $project } @list);
+}
+
  ## ----------------------------------------------------------------------
  ## HTML aware string manipulation
  
  ## ----------------------------------------------------------------------
  ## HTML aware string manipulation
  
@@ -487,24 +807,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
  ## ----------------------------------------------------------------------
  ## functions returning short HTML fragments, or transforming HTML fragments
-## which don't beling to other sections
+## which don't belong 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;
  }
@@ -526,7 +869,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>";
                 }
         }
  
                 }
         }
  
@@ -544,7 +888,7 @@ sub format_subject_html {
  
         if (length($short) < length($long)) {
                 return $cgi->a({-href => $href, -class => "list subject",
  
         if (length($short) < length($long)) {
                 return $cgi->a({-href => $href, -class => "list subject",
-                               -title => $long},
+                               -title => to_utf8($long)},
                        esc_html($short) . $extra);
         } else {
                 return $cgi->a({-href => $href, -class => "list subject"},
                        esc_html($short) . $extra);
         } else {
                 return $cgi->a({-href => $href, -class => "list subject"},
@@ -552,8 +896,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 = "";
  
@@ -569,7 +915,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";
  }
  
  ## ----------------------------------------------------------------------
  }
  
  ## ----------------------------------------------------------------------
@@ -622,7 +987,7 @@ sub git_get_project_config {
         $key =~ s/^gitweb\.//;
         return if ($key =~ m/\W/);
  
         $key =~ s/^gitweb\.//;
         return if ($key =~ m/\W/);
  
-       my @x = (git_cmd(), 'repo-config');
+       my @x = (git_cmd(), 'config');
         if (defined $type) { push @x, $type; }
         push @x, "--get";
         push @x, "gitweb.$key";
         if (defined $type) { push @x, $type; }
         push @x, "--get";
         push @x, "gitweb.$key";
@@ -635,8 +1000,9 @@ sub git_get_project_config {
  sub git_get_hash_by_path {
         my $base = shift;
         my $path = shift || return undef;
  sub git_get_hash_by_path {
         my $base = shift;
         my $path = shift || return undef;
+       my $type = shift;
  
  
-       my $tree = $base;
+       $path =~ s,/+$,,;
  
         open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path
                 or die_error(undef, "Open git-ls-tree failed");
  
         open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path
                 or die_error(undef, "Open git-ls-tree failed");
@@ -644,26 +1010,17 @@ 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;
+       }
         return $3;
  }
  
  ## ......................................................................
  ## git utility functions, directly accessing git repository
  
         return $3;
  }
  
  ## ......................................................................
  ## git utility functions, directly accessing git repository
  
-# assumes that PATH is not symref
-sub git_get_hash_by_ref {
-       my $path = shift;
-
-       open my $fd, "$projectroot/$path" or return undef;
-       my $head = <$fd>;
-       close $fd;
-       chomp $head;
-       if ($head =~ m/^[0-9a-fA-F]{40}$/) {
-               return $head;
-       }
-}
-
  sub git_get_project_description {
         my $path = shift;
  
  sub git_get_project_description {
         my $path = shift;
  
@@ -677,7 +1034,7 @@ sub git_get_project_description {
  sub git_get_project_url_list {
         my $path = shift;
  
  sub git_get_project_url_list {
         my $path = shift;
  
-       open my $fd, "$projectroot/$path/cloneurl" or return undef;
+       open my $fd, "$projectroot/$path/cloneurl" or return;
         my @git_project_url_list = map { chomp; $_ } <$fd>;
         close $fd;
  
         my @git_project_url_list = map { chomp; $_ } <$fd>;
         close $fd;
  
@@ -685,27 +1042,47 @@ 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;
-               opendir my ($dh), $dir or return undef;
-               while (my $dir = readdir($dh)) {
-                       if (-e "$projectroot/$dir/HEAD") {
-                               my $pr = {
-                                       path => $dir,
-                               };
-                               push @list, $pr
-                       }
-               }
-               closedir($dh);
+               my $dir = $projects_list . ($filter ? "/$filter" : '');
+               # remove the trailing "/"
+               $dir =~ s!/+$!!;
+               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
+                       wanted => sub {
+                               # skip project-list toplevel, if we get it.
+                               return if (m!^[/.]$!);
+                               # only directories can be git repositories
+                               return unless (-d $_);
+
+                               my $subdir = substr($File::Find::name, $pfxlen + 1);
+                               # we check related file in $projectroot
+                               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;
+                               }
+                       },
+               }, "$dir");
+
         } elsif (-f $projects_list) {
                 # read from file(url-encoded):
                 # 'git%2Fgit.git Linus+Torvalds'
                 # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
                 # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
         } elsif (-f $projects_list) {
                 # read from file(url-encoded):
                 # 'git%2Fgit.git Linus+Torvalds'
                 # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
                 # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
-               open my ($fd), $projects_list or return undef;
+               open my ($fd), $projects_list or return;
                 while (my $line = <$fd>) {
                         chomp $line;
                         my ($path, $owner) = split ' ', $line;
                 while (my $line = <$fd>) {
                         chomp $line;
                         my ($path, $owner) = split ' ', $line;
@@ -714,10 +1091,21 @@ sub git_get_projects_list {
                         if (!defined $path) {
                                 next;
                         }
                         if (!defined $path) {
                                 next;
                         }
-                       if (-e "$projectroot/$path/HEAD") {
+                       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,
                                 my $pr = {
                                         path => $path,
-                                       owner => decode("utf8", $owner, Encode::FB_DEFAULT),
+                                       owner => to_utf8($owner),
                                 };
                                 push @list, $pr
                         }
                                 };
                                 push @list, $pr
                         }
@@ -746,7 +1134,7 @@ sub git_get_project_owner {
                         $pr = unescape($pr);
                         $ow = unescape($ow);
                         if ($pr eq $project) {
                         $pr = unescape($pr);
                         $ow = unescape($ow);
                         if ($pr eq $project) {
-                               $owner = decode("utf8", $ow, Encode::FB_DEFAULT);
+                               $owner = to_utf8($ow);
                                 last;
                         }
                 }
                                 last;
                         }
                 }
@@ -759,23 +1147,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;
-       my $fd;
-       # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c      refs/tags/v2.6.11
-       # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
-       if (-f "$projectroot/$project/info/refs") {
-               open $fd, "$projectroot/$project/info/refs"
-                       or return;
-       } else {
-               open $fd, "-|", git_cmd(), "ls-remote", "."
-                       or return;
-       }
+       # 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;
  
         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 {
@@ -819,10 +1221,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);
@@ -830,6 +1234,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);
         return %date;
  }
  
         return %date;
  }
  
@@ -868,41 +1275,31 @@ sub parse_tag {
         return %tag
  }
  
         return %tag
  }
  
-sub parse_commit {
-       my $commit_id = shift;
-       my $commit_text = shift;
-
-       my @commit_lines;
+sub parse_commit_text {
+       my ($commit_text, $withparents) = @_;
+       my @commit_lines = split '\n', $commit_text;
         my %co;
  
         my %co;
  
-       if (defined $commit_text) {
-               @commit_lines = @$commit_text;
-       } else {
-               $/ = "\0";
-               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;
-               $/ = "\n";
-               pop @commit_lines;
-       }
+       pop @commit_lines; # Remove '\0'
+
         my $header = shift @commit_lines;
         if (!($header =~ m/^[0-9a-fA-F]{40}/)) {
                 return;
         }
         ($co{'id'}, my @parents) = split ' ', $header;
         my $header = shift @commit_lines;
         if (!($header =~ m/^[0-9a-fA-F]{40}/)) {
                 return;
         }
         ($co{'id'}, my @parents) = split ' ', $header;
-       $co{'parents'} = \@parents;
-       $co{'parent'} = $parents[0];
         while (my $line = shift @commit_lines) {
                 last if $line eq "\n";
                 if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                         $co{'tree'} = $1;
         while (my $line = shift @commit_lines) {
                 last if $line eq "\n";
                 if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                         $co{'tree'} = $1;
+               } elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) {
+                       push @parents, $1;
                 } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
                         $co{'author'} = $1;
                         $co{'author_epoch'} = $2;
                         $co{'author_tz'} = $3;
                 } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
                         $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'};
                         }
@@ -911,12 +1308,19 @@ 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'}) {
                 return;
         };
                 }
         }
         if (!defined $co{'tree'}) {
                 return;
         };
+       $co{'parents'} = \@parents;
+       $co{'parent'} = $parents[0];
  
         foreach my $title (@commit_lines) {
                 $title =~ s/^    //;
  
         foreach my $title (@commit_lines) {
                 $title =~ s/^    //;
@@ -943,6 +1347,9 @@ sub parse_commit {
                         last;
                 }
         }
                         last;
                 }
         }
+       if ($co{'title'} eq "") {
+               $co{'title'} = $co{'title_short'} = '(no commit message)';
+       }
         # remove added spaces
         foreach my $line (@commit_lines) {
                 $line =~ s/^    //;
         # remove added spaces
         foreach my $line (@commit_lines) {
                 $line =~ s/^    //;
@@ -963,6 +1370,52 @@ sub parse_commit {
         return %co;
  }
  
         return %co;
  }
  
+sub parse_commit {
+       my ($commit_id) = @_;
+       my %co;
+
+       local $/ = "\0";
+
+       open my $fd, "-|", git_cmd(), "rev-list",
+               "--parents",
+               "--header",
+               "--max-count=1",
+               $commit_id,
+               "--",
+               or die_error(undef, "Open git-rev-list failed");
+       %co = parse_commit_text(<$fd>, 1);
+       close $fd;
+
+       return %co;
+}
+
+sub parse_commits {
+       my ($commit_id, $maxcount, $skip, $arg, $filename) = @_;
+       my @cos;
+
+       $maxcount ||= 1;
+       $skip ||= 0;
+
+       local $/ = "\0";
+
+       open my $fd, "-|", git_cmd(), "rev-list",
+               "--header",
+               ($arg ? ($arg) : ()),
+               ("--max-count=" . $maxcount),
+               ("--skip=" . $skip),
+               $commit_id,
+               "--",
+               ($filename ? ($filename) : ())
+               or die_error(undef, "Open git-rev-list failed");
+       while (my $line = <$fd>) {
+               my %co = parse_commit_text($line);
+               push @cos, \%co;
+       }
+       close $fd;
+
+       return wantarray ? @cos : \@cos;
+}
+
  # parse ref from ref_file, given by ref_id, with given type
  sub parse_ref {
         my $ref_file = shift;
  # parse ref from ref_file, given by ref_id, with given type
  sub parse_ref {
         my $ref_file = shift;
@@ -1027,9 +1480,30 @@ sub parse_difftree_raw_line {
                 }
         }
         # 'c512b523472485aef4fff9e57b229d9d243c967f'
                 }
         }
         # 'c512b523472485aef4fff9e57b229d9d243c967f'
-       #elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
-       #       $res{'commit'} = $1;
-       #}
+       elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
+               $res{'commit'} = $1;
+       }
+
+       return wantarray ? %res : \%res;
+}
+
+# parse line of git-ls-tree output
+sub parse_ls_tree_line ($;%) {
+       my $line = shift;
+       my %opts = @_;
+       my %res;
+
+       #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
+       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/s;
+
+       $res{'mode'} = $1;
+       $res{'type'} = $2;
+       $res{'hash'} = $3;
+       if ($opts{'-z'}) {
+               $res{'name'} = $4;
+       } else {
+               $res{'name'} = unquote($4);
+       }
  
         return wantarray ? %res : \%res;
  }
  
         return wantarray ? %res : \%res;
  }
@@ -1037,29 +1511,88 @@ sub parse_difftree_raw_line {
  ## ......................................................................
  ## parse to array of hashes functions
  
  ## ......................................................................
  ## parse to array of hashes functions
  
-sub git_get_refs_list {
-       my $ref_dir = shift;
-       my @reflist;
+sub git_get_heads_list {
+       my $limit = shift;
+       my @headslist;
+
+       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>) {
+               my %ref_item;
+
+               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;
+
+       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;
  
  
-       my @refs;
-       my $pfxlen = length("$projectroot/$project/$ref_dir");
-       File::Find::find(sub {
-               return if (/^\./);
-               if (-f $_) {
-                       push @refs, substr($File::Find::name, $pfxlen + 1);
+               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;
                 }
                 }
-       }, "$projectroot/$project/$ref_dir");
  
  
-       foreach my $ref_file (@refs) {
-               my $ref_id = git_get_hash_by_ref("$project/$ref_dir/$ref_file");
-               my $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;
+       close $fd;
+
+       return wantarray ? @tagslist : \@tagslist;
  }
  
  ## ----------------------------------------------------------------------
  }
  
  ## ----------------------------------------------------------------------
@@ -1075,7 +1608,7 @@ sub get_file_owner {
         }
         my $owner = $gcos;
         $owner =~ s/[,;].*$//;
         }
         my $owner = $gcos;
         $owner =~ s/[,;].*$//;
-       return decode("utf8", $owner, Encode::FB_DEFAULT);
+       return to_utf8($owner);
  }
  
  ## ......................................................................
  }
  
  ## ......................................................................
@@ -1100,7 +1633,7 @@ sub mimetype_guess_file {
         }
         close(MIME);
  
         }
         close(MIME);
  
-       $filename =~ /\.(.*?)$/;
+       $filename =~ /\.([^.]*)$/;
         return $mimemap{$1};
  }
  
         return $mimemap{$1};
  }
  
@@ -1156,13 +1689,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) {
         if (defined $project) {
-               $title .= " - $project";
+               $title .= " - " . to_utf8($project);
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
-                               $title .= " - $file_name";
+                               $title .= " - " . esc_path($file_name);
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
@@ -1183,6 +1716,7 @@ sub git_header_html {
         }
         print $cgi->header(-type=>$content_type, -charset => 'utf-8',
                            -status=> $status, -expires => $expires);
         }
         print $cgi->header(-type=>$content_type, -charset => 'utf-8',
                            -status=> $status, -expires => $expires);
+       my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
         print <<EOF;
  <?xml version="1.0" encoding="utf-8"?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
         print <<EOF;
  <?xml version="1.0" encoding="utf-8"?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -1191,30 +1725,62 @@ sub git_header_html {
  <!-- git core binaries version $git_version -->
  <head>
  <meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
  <!-- git core binaries version $git_version -->
  <head>
  <meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
-<meta name="generator" content="gitweb/$version git/$git_version"/>
+<meta name="generator" content="gitweb/$version git/$git_version$mod_perl_version"/>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>
-<link rel="stylesheet" type="text/css" href="$stylesheet"/>
  EOF
  EOF
+# print out each stylesheet that exist
+       if (defined $stylesheet) {
+#provides backwards capability for those people who define style sheet in a config file
+               print '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'"/>'."\n";
+       } else {
+               foreach my $stylesheet (@stylesheets) {
+                       next unless $stylesheet;
+                       print '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'"/>'."\n";
+               }
+       }
         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"));
+               printf('<link rel="alternate" title="%s projects feeds" '.
+                      'href="%s" type="text/x-opml"/>'."\n",
+                      $site_name, href(project=>undef, action=>"opml"));
+       }
+       if (defined $favicon) {
+               print qq(<link rel="shortcut icon" href="$favicon" type="image/png"/>\n);
         }
  
         print "</head>\n" .
         }
  
         print "</head>\n" .
-             "<body>\n" .
-             "<div class=\"page_header\">\n" .
-             "<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
-             "<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
-             "</a>\n";
-       print $cgi->a({-href => esc_param($home_link)}, $home_link_str) . " / ";
+             "<body>\n";
+
+       if (-f $site_header) {
+               open (my $fd, $site_header);
+               print <$fd>;
+               close $fd;
+       }
+
+       print "<div class=\"page_header\">\n" .
+             $cgi->a({-href => esc_url($logo_url),
+                      -title => $logo_label},
+                     qq(<img src="$logo" width="72" height="27" alt="git" class="logo"/>));
+       print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
         if (defined $project) {
                 print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                 if (defined $action) {
                         print " / $action";
                 }
                 print "\n";
         if (defined $project) {
                 print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                 if (defined $action) {
                         print " / $action";
                 }
                 print "\n";
+       }
+       my ($have_search) = gitweb_check_feature('search');
+       if ((defined $project) && ($have_search)) {
                 if (!defined $searchtext) {
                         $searchtext = "";
                 }
                 if (!defined $searchtext) {
                         $searchtext = "";
                 }
@@ -1228,11 +1794,16 @@ EOF
                 }
                 $cgi->param("a", "search");
                 $cgi->param("h", $search_hash);
                 }
                 $cgi->param("a", "search");
                 $cgi->param("h", $search_hash);
+               $cgi->param("p", $project);
                 print $cgi->startform(-method => "get", -action => $my_uri) .
                       "<div class=\"search\">\n" .
                       $cgi->hidden(-name => "p") . "\n" .
                       $cgi->hidden(-name => "a") . "\n" .
                       $cgi->hidden(-name => "h") . "\n" .
                 print $cgi->startform(-method => "get", -action => $my_uri) .
                       "<div class=\"search\">\n" .
                       $cgi->hidden(-name => "p") . "\n" .
                       $cgi->hidden(-name => "a") . "\n" .
                       $cgi->hidden(-name => "h") . "\n" .
+                     $cgi->popup_menu(-name => 'st', -default => 'commit',
+                                      -values => ['commit', 'author', 'committer', 'pickaxe']) .
+                     $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
+                     " search:\n",
                       $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
                       "</div>" .
                       $cgi->end_form() . "\n";
                       $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
                       "</div>" .
                       $cgi->end_form() . "\n";
@@ -1247,12 +1818,25 @@ sub git_footer_html {
                 if (defined $descr) {
                         print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
                 }
                 if (defined $descr) {
                         print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
                 }
-               print $cgi->a({-href => href(action=>"rss"), -class => "rss_logo"}, "RSS") . "\n";
+               print $cgi->a({-href => href(action=>"rss"),
+                             -class => "rss_logo"}, "RSS") . " ";
+               print $cgi->a({-href => href(action=>"atom"),
+                             -class => "rss_logo"}, "Atom") . "\n";
         } else {
         } else {
-               print $cgi->a({-href => href(action=>"opml"), -class => "rss_logo"}, "OPML") . "\n";
+               print $cgi->a({-href => href(project=>undef, action=>"opml"),
+                             -class => "rss_logo"}, "OPML") . " ";
+               print $cgi->a({-href => href(project=>undef, action=>"project_index"),
+                             -class => "rss_logo"}, "TXT") . "\n";
+       }
+       print "</div>\n" ;
+
+       if (-f $site_footer) {
+               open (my $fd, $site_footer);
+               print <$fd>;
+               close $fd;
         }
         }
-       print "</div>\n" .
-             "</body>\n" .
+
+       print "</body>\n" .
               "</html>";
  }
  
               "</html>";
  }
  
@@ -1354,27 +1938,60 @@ sub git_print_header_div {
               "\n</div>\n";
  }
  
               "\n</div>\n";
  }
  
-sub git_print_page_path {
-       my $name = shift;
-       my $type = shift;
-       my $hb = shift;
+#sub git_print_authorship (\%) {
+sub git_print_authorship {
+       my $co = shift;
  
  
-       if (!defined $name) {
-               print "<div class=\"page_path\">/</div>\n";
-       } elsif (defined $type && $type eq 'blob') {
-               print "<div class=\"page_path\">";
-               if (defined $hb) {
-                       print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
-                                                    hash_base=>$hb)},
-                                     esc_html($name));
+       my %ad = parse_date($co->{'author_epoch'}, $co->{'author_tz'});
+       print "<div class=\"author_date\">" .
+             esc_html($co->{'author_name'}) .
+             " [$ad{'rfc2822'}";
+       if ($ad{'hour_local'} < 6) {
+               printf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
+                      $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+       } else {
+               printf(" (%02d:%02d %s)",
+                      $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+       }
+       print "]</div>\n";
+}
+
+sub git_print_page_path {
+       my $name = shift;
+       my $type = shift;
+       my $hb = shift;
+
+
+       print "<div class=\"page_path\">";
+       print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
+                     -title => 'tree root'}, to_utf8("[$project]");
+       print " / ";
+       if (defined $name) {
+               my @dirname = split '/', $name;
+               my $basename = pop @dirname;
+               my $fullname = '';
+
+               foreach my $dir (@dirname) {
+                       $fullname .= ($fullname ? '/' : '') . $dir;
+                       print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
+                                                    hash_base=>$hb),
+                                     -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),
+                                     -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),
+                                     -title => esc_html($name)}, esc_path($basename));
+                       print " / ";
                 } else {
                 } else {
-                       print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name)},
-                                     esc_html($name));
+                       print esc_path($basename);
                 }
                 }
-               print "<br/></div>\n";
-       } else {
-               print "<div class=\"page_path\">" . esc_html($name) . "<br/></div>\n";
         }
         }
+       print "<br/></div>\n";
  }
  
  # sub git_print_log (\@;%) {
  }
  
  # sub git_print_log (\@;%) {
@@ -1397,6 +2014,7 @@ sub git_print_log ($;%) {
         foreach my $line (@$log) {
                 if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
                         $signoff = 1;
         foreach my $line (@$log) {
                 if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
                         $signoff = 1;
+                       $empty = 0;
                         if (! $opts{'-remove_signoff'}) {
                                 print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
                                 next;
                         if (! $opts{'-remove_signoff'}) {
                                 print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
                                 next;
@@ -1426,13 +2044,139 @@ 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;
  
  
-       git_print_log($log,
-               -final_empty_line=> 1,
-               -remove_title => $remove_title);
+       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);
+
+       return $path;
+}
+
+# print tree entry (row of git_tree), but without encompassing <tr> element
+sub git_print_tree_entry {
+       my ($t, $basedir, $hash_base, $have_blame) = @_;
+
+       my %base_key = ();
+       $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,
+       # and link is the action links of the entry.
+
+       print "<td class=\"mode\">" . mode_str($t->{'mode'}) . "</td>\n";
+       if ($t->{'type'} eq "blob") {
+               print "<td class=\"list\">" .
+                       $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
+                                              file_name=>"$basedir$t->{'name'}", %base_key),
+                               -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'},
+                                            file_name=>"$basedir$t->{'name'}", %base_key)},
+                             "blob");
+               if ($have_blame) {
+                       print " | " .
+                             $cgi->a({-href => href(action=>"blame", hash=>$t->{'hash'},
+                                                    file_name=>"$basedir$t->{'name'}", %base_key)},
+                                     "blame");
+               }
+               if (defined $hash_base) {
+                       print " | " .
+                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                    hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
+                                     "history");
+               }
+               print " | " .
+                       $cgi->a({-href => href(action=>"blob_plain", hash_base=>$hash_base,
+                                              file_name=>"$basedir$t->{'name'}")},
+                               "raw");
+               print "</td>\n";
+
+       } elsif ($t->{'type'} eq "tree") {
+               print "<td class=\"list\">";
+               print $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
+                                            file_name=>"$basedir$t->{'name'}", %base_key)},
+                             esc_path($t->{'name'}));
+               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");
+               if (defined $hash_base) {
+                       print " | " .
+                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                    file_name=>"$basedir$t->{'name'}")},
+                                     "history");
+               }
+               print "</td>\n";
+       }
  }
  
  ## ......................................................................
  }
  
  ## ......................................................................
@@ -1440,7 +2184,7 @@ sub git_print_simplified_log {
  
  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");
@@ -1448,7 +2192,8 @@ sub git_difftree_body {
         print "</div>\n";
  
         print "<table class=\"diff_tree\">\n";
         print "</div>\n";
  
         print "<table class=\"diff_tree\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
+       my $patchno = 0;
         foreach my $line (@{$difftree}) {
                 my %diff = parse_difftree_raw_line($line);
  
         foreach my $line (@{$difftree}) {
                 my %diff = parse_difftree_raw_line($line);
  
@@ -1480,41 +2225,57 @@ sub git_difftree_body {
                         my $mode_chng = "<span class=\"file_status new\">[new $to_file_type";
                         $mode_chng   .= " with mode: $to_mode_str" if $to_mode_str;
                         $mode_chng   .= "]</span>";
                         my $mode_chng = "<span class=\"file_status new\">[new $to_file_type";
                         $mode_chng   .= " with mode: $to_mode_str" if $to_mode_str;
                         $mode_chng   .= "]</span>";
-                       print "<td>" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                       print "<td>";
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
-                                     -class => "list"}, esc_html($diff{'file'})) .
-                             "</td>\n" .
-                             "<td>$mode_chng</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                     -class => "list"}, esc_path($diff{'file'}));
+                       print "</td>\n";
+                       print "<td>$mode_chng</td>\n";
+                       print "<td class=\"link\">";
+                       if ($action eq 'commitdiff') {
+                               # 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'})},
                                                      hash_base=>$hash, file_name=>$diff{'file'})},
-                                     "blob") .
-                             "</td>\n";
+                                     "blob");
+                       print "</td>\n";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
                         my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
                         my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";
-                       print "<td>" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
+                       print "<td>";
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                      hash_base=>$parent, file_name=>$diff{'file'}),
                                                      hash_base=>$parent, file_name=>$diff{'file'}),
-                                      -class => "list"}, esc_html($diff{'file'})) .
-                             "</td>\n" .
-                             "<td>$mode_chng</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
+                                      -class => "list"}, esc_path($diff{'file'}));
+                       print "</td>\n";
+                       print "<td>$mode_chng</td>\n";
+                       print "<td class=\"link\">";
+                       if ($action eq 'commitdiff') {
+                               # link to patch
+                               $patchno++;
+                               print $cgi->a({-href => "#patch$patchno"}, "patch");
+                               print " | ";
+                       }
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                      hash_base=>$parent, file_name=>$diff{'file'})},
                                                      hash_base=>$parent, file_name=>$diff{'file'})},
-                                     "blob") .
-                             " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$parent,
+                                     "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'})},
                                                      file_name=>$diff{'file'})},
-                                     "history") .
-                             "</td>\n";
+                                     "history");
+                       print "</td>\n";
  
                 } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
                         my $mode_chnge = "";
                         if ($diff{'from_mode'} != $diff{'to_mode'}) {
                                 $mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
  
                 } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
                         my $mode_chnge = "";
                         if ($diff{'from_mode'} != $diff{'to_mode'}) {
                                 $mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
-                               if ($from_file_type != $to_file_type) {
+                               if ($from_file_type ne $to_file_type) {
                                         $mode_chnge .= " from $from_file_type to $to_file_type";
                                 }
                                 if (($from_mode_oct & 0777) != ($to_mode_oct & 0777)) {
                                         $mode_chnge .= " from $from_file_type to $to_file_type";
                                 }
                                 if (($from_mode_oct & 0777) != ($to_mode_oct & 0777)) {
@@ -1527,35 +2288,37 @@ sub git_difftree_body {
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
-                       if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff{'file'}),
+                                     -class => "list"}, esc_path($diff{'file'}));
+                       print "</td>\n";
+                       print "<td>$mode_chnge</td>\n";
+                       print "<td class=\"link\">";
+                       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,
                                 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'}),
-                                             -class => "list"}, esc_html($diff{'file'}));
-                       } else { # only mode changed
-                               print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                            hash_base=>$hash, file_name=>$diff{'file'}),
-                                             -class => "list"}, esc_html($diff{'file'}));
+                                                            file_name=>$diff{'file'})},
+                                             "diff") .
+                                     " | ";
                         }
                         }
-                       print "</td>\n" .
-                             "<td>$mode_chnge</td>\n" .
-                             "<td class=\"link\">" .
-                               $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                      hash_base=>$hash, file_name=>$diff{'file'})},
-                                       "blob");
-                       if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
-                               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'},
+                                                    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");
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "R" || $diff{'status'} eq "C") { # renamed or copied
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "R" || $diff{'status'} eq "C") { # renamed or copied
@@ -1569,24 +2332,38 @@ 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" .
                               " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
-                                                    hash=>$diff{'to_id'}, file_name=>$diff{'to_file'})},
-                                     "blob");
-                       if ($diff{'to_id'} ne $diff{'from_id'}) {
-                               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");
+                             "<td class=\"link\">";
+                       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{'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";
  
                 } # we should not encounter Unmerged (U) or Unknown (X) status
                         print "</td>\n";
  
                 } # we should not encounter Unmerged (U) or Unknown (X) status
@@ -1599,144 +2376,338 @@ 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);
  
         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;
+               my ($from_id, $to_id);
+
+               # 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/^--- |^diff /);
+
+                       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\">\n";
  
  
+                       push @diff_header, $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'});
+                       } else {
+                               delete $from{'href'};
                         }
                         }
-
-                       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'});
+                       } else {
+                               delete $to{'href'};
                         }
                         }
+                       # 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;
+               if (! $patch_line) {
+                       print "</div>\n"; # class="patch"
+                       last PATCH;
+               }
+               next PATCH if ($patch_line =~ m/^diff /);
+               #assert($patch_line =~ m/^---/) if DEBUG;
+               if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {
+                       $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>;
+               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 =~ m!^\+\+\+ "?b/!) {
+                       $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_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;
+       $to = $#projects if (!defined $to || $#projects < $to);
+
+       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 {
+                       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";
+               }
+               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
  sub git_shortlog_body {
         # uses global variable $project
-       my ($revlist, $from, $to, $refs, $extra) = @_;
+       my ($commitlist, $from, $to, $refs, $extra) = @_;
  
  
-       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
-       my $have_snapshot = (defined $ctype && defined $suffix);
+       my $have_snapshot = gitweb_have_snapshot();
  
         $from = 0 unless defined $from;
  
         $from = 0 unless defined $from;
-       $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
+       $to = $#{$commitlist} if (!defined $to || $#{$commitlist} < $to);
  
         print "<table class=\"shortlog\" cellspacing=\"0\">\n";
  
         print "<table class=\"shortlog\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
         for (my $i = $from; $i <= $to; $i++) {
-               my $commit = $revlist->[$i];
-               #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
+               my %co = %{$commitlist->[$i]};
+               my $commit = $co{'id'};
                 my $ref = 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 {
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
                 } else {
@@ -1752,9 +2723,10 @@ sub git_shortlog_body {
                 print "</td>\n" .
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
                 print "</td>\n" .
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree");
                 if ($have_snapshot) {
                 if ($have_snapshot) {
-                       print " | " .  $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
+                       print " | " . $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
                 }
                 print "</td>\n" .
                       "</tr>\n";
                 }
                 print "</td>\n" .
                       "</tr>\n";
@@ -1769,20 +2741,19 @@ sub git_shortlog_body {
  
  sub git_history_body {
         # Warning: assumes constant type (blob or tree) during history
  
  sub git_history_body {
         # Warning: assumes constant type (blob or tree) during history
-       my ($fd, $refs, $hash_base, $ftype, $extra) = @_;
+       my ($commitlist, $from, $to, $refs, $hash_base, $ftype, $extra) = @_;
  
  
-       print "<table class=\"history\" cellspacing=\"0\">\n";
-       my $alternate = 0;
-       while (my $line = <$fd>) {
-               if ($line !~ m/^([0-9a-fA-F]{40})/) {
-                       next;
-               }
+       $from = 0 unless defined $from;
+       $to = $#{$commitlist} unless (defined $to && $to <= $#{$commitlist});
  
  
-               my $commit = $1;
-               my %co = parse_commit($commit);
+       print "<table class=\"history\" cellspacing=\"0\">\n";
+       my $alternate = 1;
+       for (my $i = $from; $i <= $to; $i++) {
+               my %co = %{$commitlist->[$i]};
                 if (!%co) {
                         next;
                 }
                 if (!%co) {
                         next;
                 }
+               my $commit = $co{'id'};
  
                 my $ref = format_ref_marker($refs, $commit);
  
  
                 my $ref = format_ref_marker($refs, $commit);
  
@@ -1801,9 +2772,8 @@ sub git_history_body {
                                           href(action=>"commit", hash=>$commit), $ref);
                 print "</td>\n" .
                       "<td class=\"link\">" .
                                           href(action=>"commit", hash=>$commit), $ref);
                 print "</td>\n" .
                       "<td class=\"link\">" .
-                     $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
-                     $cgi->a({-href => href(action=>$ftype, hash_base=>$commit, file_name=>$file_name)}, $ftype);
+                     $cgi->a({-href => href(action=>$ftype, hash_base=>$commit, file_name=>$file_name)}, $ftype) . " | " .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");
  
                 if ($ftype eq 'blob') {
                         my $blob_current = git_get_hash_by_path($hash_base, $file_name);
  
                 if ($ftype eq 'blob') {
                         my $blob_current = git_get_hash_by_path($hash_base, $file_name);
@@ -1836,12 +2806,11 @@ sub git_tags_body {
         $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
  
         print "<table class=\"tags\" cellspacing=\"0\">\n";
         $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
  
         print "<table class=\"tags\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         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);
@@ -1852,8 +2821,12 @@ sub git_tags_body {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
-               print "<td><i>$tag{'age'}</i></td>\n" .
-                     "<td>" .
+               if (defined $tag{'age'}) {
+                       print "<td><i>$tag{'age'}</i></td>\n";
+               } else {
+                       print "<td></td>\n";
+               }
+               print "<td>" .
                       $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'}),
                                -class => "list name"}, esc_html($tag{'name'})) .
                       "</td>\n" .
                       $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'}),
                                -class => "list name"}, esc_html($tag{'name'})) .
                       "</td>\n" .
@@ -1874,7 +2847,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");
                 }
@@ -1891,30 +2864,31 @@ sub git_tags_body {
  
  sub git_heads_body {
         # uses global variable $project
  
  sub git_heads_body {
         # uses global variable $project
-       my ($taglist, $head, $from, $to, $extra) = @_;
+       my ($headlist, $head, $from, $to, $extra) = @_;
         $from = 0 unless defined $from;
         $from = 0 unless defined $from;
-       $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
+       $to = $#{$headlist} if (!defined $to || $#{$headlist} < $to);
  
         print "<table class=\"heads\" cellspacing=\"0\">\n";
  
         print "<table class=\"heads\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
         for (my $i = $from; $i <= $to; $i++) {
-               my $entry = $taglist->[$i];
-               my %tag = %$entry;
-               my $curr = $tag{'id'} eq $head;
+               my $entry = $headlist->[$i];
+               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=>"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>";
         }
@@ -1926,6 +2900,58 @@ sub git_heads_body {
         print "</table>\n";
  }
  
         print "</table>\n";
  }
  
+sub git_search_grep_body {
+       my ($commitlist, $from, $to, $extra) = @_;
+       $from = 0 unless defined $from;
+       $to = $#{$commitlist} if (!defined $to || $#{$commitlist} < $to);
+
+       print "<table class=\"grep\" cellspacing=\"0\">\n";
+       my $alternate = 1;
+       for (my $i = $from; $i <= $to; $i++) {
+               my %co = %{$commitlist->[$i]};
+               if (!%co) {
+                       next;
+               }
+               my $commit = $co{'id'};
+               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
@@ -1937,30 +2963,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 $head = git_get_head_hash($pr->{'path'});
-               if (!defined $head) {
-                       next;
-               }
-               $git_dir = "$projectroot/$pr->{'path'}";
-               my %co = parse_commit($head);
-               if (!%co) {
-                       next;
-               }
-               $pr->{'commit'} = \%co;
-               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) {
@@ -1970,81 +2975,72 @@ 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 => "$my_uri?" . esc_param("o=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 => "$my_uri?" . esc_param("o=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 => "$my_uri?" . esc_param("o=owner"),
-                              -class => "header"}, "Owner") .
-                     "</th>\n";
-       }
-       if ($order eq "age") {
-               @projects = sort {$a->{'commit'}{'age'} <=> $b->{'commit'}{'age'}} @projects;
-               print "<th>Last Change</th>\n";
-       } else {
-               print "<th>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("o=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 = 0;
+
+       my @list = git_get_projects_list($project);
+       if (!@list) {
+               die_error(undef, "No forks found");
+       }
+
+       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 {
+       my @projects = git_get_projects_list($project);
+
+       print $cgi->header(
+               -type => 'text/plain',
+               -charset => 'utf-8',
+               -content_disposition => 'inline; filename="index.aux"');
+
         foreach my $pr (@projects) {
         foreach my $pr (@projects) {
-               if ($alternate) {
-                       print "<tr class=\"dark\">\n";
-               } else {
-                       print "<tr class=\"light\">\n";
+               if (!exists $pr->{'owner'}) {
+                       $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}");
                 }
                 }
-               $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->{'commit'}{'age'}) . "\">" .
-                     $pr->{'commit'}{'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") .
-                     "</td>\n" .
-                     "</tr>\n";
+
+               my ($path, $owner) = ($pr->{'path'}, $pr->{'owner'});
+               # quote as in CGI::Util::encode, but keep the slash, and use '+' for ' '
+               $path  =~ s/([^a-zA-Z0-9_.\-\/ ])/sprintf("%%%02X", ord($1))/eg;
+               $owner =~ s/([^a-zA-Z0-9_.\-\/ ])/sprintf("%%%02X", ord($1))/eg;
+               $path  =~ s/ /\+/g;
+               $owner =~ s/ /\+/g;
+
+               print "$path $owner\n";
         }
         }
-       print "</table>\n";
-       git_footer_html();
  }
  
  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 $refs = git_get_references();
  
         my $owner = git_get_project_owner($project);
  
         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');
+
+       if ($check_forks) {
+               @forklist = git_get_projects_list($project);
+       }
+
         git_header_html();
         git_print_page_nav('summary','', $head);
  
         git_header_html();
         git_print_page_nav('summary','', $head);
  
@@ -2063,31 +3059,46 @@ sub git_summary {
                 print "<tr><td>$url_tag</td><td>$git_url</td></tr>\n";
                 $url_tag = "";
         }
                 print "<tr><td>$url_tag</td><td>$git_url</td></tr>\n";
                 $url_tag = "";
         }
-       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;
+               }
+       }
  
  
-       open my $fd, "-|", git_cmd(), "rev-list", "--max-count=17",
-               git_get_head_hash($project)
-               or die_error(undef, "Open git-rev-list failed");
-       my @revlist = map { chomp; $_ } <$fd>;
-       close $fd;
+       # we need to request one more than 16 (0..15) to check if
+       # those 16 are all
+       my @commitlist = parse_commits($head, 17);
         git_print_header_div('shortlog');
         git_print_header_div('shortlog');
-       git_shortlog_body(\@revlist, 0, 15, $refs,
+       git_shortlog_body(\@commitlist, 0, 15, $refs,
+                         $#commitlist <=  15 ? undef :
                           $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
                           $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
-       my $taglist = git_get_refs_list("refs/tags");
-       if (defined @$taglist) {
+       if (@taglist) {
                 git_print_header_div('tags');
                 git_print_header_div('tags');
-               git_tags_body($taglist, 0, 15,
+               git_tags_body(\@taglist, 0, 15,
+                             $#taglist <=  15 ? undef :
                               $cgi->a({-href => href(action=>"tags")}, "..."));
         }
  
                               $cgi->a({-href => href(action=>"tags")}, "..."));
         }
  
-       my $headlist = git_get_refs_list("refs/heads");
-       if (defined @$headlist) {
+       if (@headlist) {
                 git_print_header_div('heads');
                 git_print_header_div('heads');
-               git_heads_body($headlist, $head, 0, 15,
+               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();
  }
  
@@ -2118,7 +3129,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();
@@ -2128,7 +3140,8 @@ sub git_blame2 {
         my $fd;
         my $ftype;
  
         my $fd;
         my $ftype;
  
-       if (!gitweb_check_feature('blame')) {
+       my ($have_blame) = gitweb_check_feature('blame');
+       if (!$have_blame) {
                 die_error('403 Permission denied', "Permission denied");
         }
         die_error('404 Not Found', "File name not defined") if (!$file_name);
                 die_error('403 Permission denied', "Permission denied");
         }
         die_error('404 Not Found', "File name not defined") if (!$file_name);
@@ -2144,15 +3157,19 @@ sub git_blame2 {
         if ($ftype !~ "blob") {
                 die_error("400 Bad Request", "Object is not a blob");
         }
         if ($ftype !~ "blob") {
                 die_error("400 Bad Request", "Object is not a blob");
         }
-       open ($fd, "-|", git_cmd(), "blame", '-l', $file_name, $hash_base)
+       open ($fd, "-|", git_cmd(), "blame", '-p', '--',
+             $file_name, $hash_base)
                 or die_error(undef, "Open git-blame failed");
         git_header_html();
         my $formats_nav =
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
                 or die_error(undef, "Open git-blame failed");
         git_header_html();
         my $formats_nav =
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
+               $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
+                       "history") .
+               " | " .
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
-                       "head");
+                       "HEAD");
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, $ftype, $hash_base);
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, $ftype, $hash_base);
@@ -2165,25 +3182,58 @@ sub git_blame2 {
  <table class="blame">
  <tr><th>Commit</th><th>Line</th><th>Data</th></tr>
  HTML
  <table class="blame">
  <tr><th>Commit</th><th>Line</th><th>Data</th></tr>
  HTML
-       while (<$fd>) {
-               /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
-               my $full_rev = $1;
+       my %metainfo = ();
+       while (1) {
+               $_ = <$fd>;
+               last unless defined $_;
+               my ($full_rev, $orig_lineno, $lineno, $group_size) =
+                   /^([0-9a-f]{40}) (\d+) (\d+)(?: (\d+))?$/;
+               if (!exists $metainfo{$full_rev}) {
+                       $metainfo{$full_rev} = {};
+               }
+               my $meta = $metainfo{$full_rev};
+               while (<$fd>) {
+                       last if (s/^\t//);
+                       if (/^(\S+) (.*)$/) {
+                               $meta->{$1} = $2;
+                       }
+               }
+               my $data = $_;
+               chomp $data;
                 my $rev = substr($full_rev, 0, 8);
                 my $rev = substr($full_rev, 0, 8);
-               my $lineno = $2;
-               my $data = $3;
-
-               if (!defined $last_rev) {
-                       $last_rev = $full_rev;
-               } elsif ($last_rev ne $full_rev) {
-                       $last_rev = $full_rev;
+               my $author = $meta->{'author'};
+               my %date = parse_date($meta->{'author-time'},
+                                     $meta->{'author-tz'});
+               my $date = $date{'iso-tz'};
+               if ($group_size) {
                         $current_color = ++$current_color % $num_colors;
                 }
                 print "<tr class=\"$rev_color[$current_color]\">\n";
                         $current_color = ++$current_color % $num_colors;
                 }
                 print "<tr class=\"$rev_color[$current_color]\">\n";
-               print "<td class=\"sha1\">" .
-                       $cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
-                               esc_html($rev)) . "</td>\n";
-               print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
-                     esc_html($lineno) . "</a></td>\n";
+               if ($group_size) {
+                       print "<td class=\"sha1\"";
+                       print " title=\"". esc_html($author) . ", $date\"";
+                       print " rowspan=\"$group_size\"" if ($group_size > 1);
+                       print ">";
+                       print $cgi->a({-href => href(action=>"commit",
+                                                    hash=>$full_rev,
+                                                    file_name=>$file_name)},
+                                     esc_html($rev));
+                       print "</td>\n";
+               }
+               open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")
+                       or die_error("could not open git-rev-parse");
+               my $parent_commit = <$dd>;
+               close $dd;
+               chomp($parent_commit);
+               my $blamed = href(action => 'blame',
+                                 file_name => $meta->{'filename'},
+                                 hash_base => $parent_commit);
+               print "<td class=\"linenr\">";
+               print $cgi->a({ -href => "$blamed#l$orig_lineno",
+                               -id => "l$lineno",
+                               -class => "linenr" },
+                             esc_html($lineno));
+               print "</td>";
                 print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                 print "</tr>\n";
         }
                 print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                 print "</tr>\n";
         }
@@ -2197,7 +3247,8 @@ HTML
  sub git_blame {
         my $fd;
  
  sub git_blame {
         my $fd;
  
-       if (!gitweb_check_feature('blame')) {
+       my ($have_blame) = gitweb_check_feature('blame');
+       if (!$have_blame) {
                 die_error('403 Permission denied', "Permission denied");
         }
         die_error('404 Not Found', "File name not defined") if (!$file_name);
                 die_error('403 Permission denied', "Permission denied");
         }
         die_error('404 Not Found', "File name not defined") if (!$file_name);
@@ -2216,8 +3267,11 @@ sub git_blame {
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
+               $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
+                       "history") .
+               " | " .
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
-                       "head");
+                       "HEAD");
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, 'blob', $hash_base);
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, 'blob', $hash_base);
@@ -2293,9 +3347,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("refs/tags");
-       if (defined @$taglist) {
-               git_tags_body($taglist);
+       my @tagslist = git_get_tags_list();
+       if (@tagslist) {
+               git_tags_body(\@tagslist);
         }
         git_footer_html();
  }
         }
         git_footer_html();
  }
@@ -2306,19 +3360,15 @@ 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 $taglist = git_get_refs_list("refs/heads");
-       if (defined @$taglist) {
-               git_heads_body($taglist, $head);
+       my @headslist = git_get_heads_list();
+       if (@headslist) {
+               git_heads_body(\@headslist, $head);
         }
         git_footer_html();
  }
  
  sub git_blob_plain {
         }
         git_footer_html();
  }
  
  sub git_blob_plain {
-       # blobs defined by non-textual hash id's can be cached
         my $expires;
         my $expires;
-       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
-               $expires = "+1d";
-       }
  
         if (!defined $hash) {
                 if (defined $file_name) {
  
         if (!defined $hash) {
                 if (defined $file_name) {
@@ -2328,7 +3378,11 @@ sub git_blob_plain {
                 } else {
                         die_error(undef, "No file name defined");
                 }
                 } else {
                         die_error(undef, "No file name defined");
                 }
+       } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               # blobs defined by non-textual hash id's can be cached
+               $expires = "+1d";
         }
         }
+
         my $type = shift;
         open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                 or die_error(undef, "Couldn't cat $file_name, $hash");
         my $type = shift;
         open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                 or die_error(undef, "Couldn't cat $file_name, $hash");
@@ -2346,7 +3400,7 @@ sub git_blob_plain {
         print $cgi->header(
                 -type => "$type",
                 -expires=>$expires,
         print $cgi->header(
                 -type => "$type",
                 -expires=>$expires,
-               -content_disposition => "inline; filename=\"$save_as\"");
+               -content_disposition => 'inline; filename="' . "$save_as" . '"');
         undef $/;
         binmode STDOUT, ':raw';
         print <$fd>;
         undef $/;
         binmode STDOUT, ':raw';
         print <$fd>;
@@ -2356,11 +3410,7 @@ sub git_blob_plain {
  }
  
  sub git_blob {
  }
  
  sub git_blob {
-       # blobs defined by non-textual hash id's can be cached
         my $expires;
         my $expires;
-       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
-               $expires = "+1d";
-       }
  
         if (!defined $hash) {
                 if (defined $file_name) {
  
         if (!defined $hash) {
                 if (defined $file_name) {
@@ -2370,15 +3420,22 @@ sub git_blob {
                 } else {
                         die_error(undef, "No file name defined");
                 }
                 } else {
                         die_error(undef, "No file name defined");
                 }
+       } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               # blobs defined by non-textual hash id's can be cached
+               $expires = "+1d";
         }
         }
-       my $have_blame = gitweb_check_feature('blame');
+
+       my ($have_blame) = gitweb_check_feature('blame');
         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))) {
@@ -2391,16 +3448,20 @@ sub git_blob {
                                         " | ";
                         }
                         $formats_nav .=
                                         " | ";
                         }
                         $formats_nav .=
+                               $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                      hash=>$hash, file_name=>$file_name)},
+                                       "history") .
+                               " | " .
                                 $cgi->a({-href => href(action=>"blob_plain",
                                                        hash=>$hash, file_name=>$file_name)},
                                 $cgi->a({-href => href(action=>"blob_plain",
                                                        hash=>$hash, file_name=>$file_name)},
-                                       "plain") .
+                                       "raw") .
                                 " | " .
                                 $cgi->a({-href => href(action=>"blob",
                                                        hash_base=>"HEAD", file_name=>$file_name)},
                                 " | " .
                                 $cgi->a({-href => href(action=>"blob",
                                                        hash_base=>"HEAD", file_name=>$file_name)},
-                                       "head");
+                                       "HEAD");
                 } else {
                         $formats_nav .=
                 } else {
                         $formats_nav .=
-                               $cgi->a({-href => href(action=>"blob_plain", hash=>$hash)}, "plain");
+                               $cgi->a({-href => href(action=>"blob_plain", hash=>$hash)}, "raw");
                 }
                 git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                 git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
                 }
                 git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                 git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
@@ -2411,13 +3472,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";
@@ -2426,14 +3498,16 @@ sub git_blob {
  }
  
  sub git_tree {
  }
  
  sub git_tree {
+       my $have_snapshot = gitweb_have_snapshot();
+
+       if (!defined $hash_base) {
+               $hash_base = "HEAD";
+       }
         if (!defined $hash) {
         if (!defined $hash) {
-               $hash = git_get_head_hash($project);
                 if (defined $file_name) {
                 if (defined $file_name) {
-                       my $base = $hash_base || $hash;
-                       $hash = git_get_hash_by_path($base, $file_name, "tree");
-               }
-               if (!defined $hash_base) {
-                       $hash_base = $hash;
+                       $hash = git_get_hash_by_path($hash_base, $file_name, "tree");
+               } else {
+                       $hash = $hash_base;
                 }
         }
         $/ = "\0";
                 }
         }
         $/ = "\0";
@@ -2446,74 +3520,79 @@ sub git_tree {
         my $refs = git_get_references();
         my $ref = format_ref_marker($refs, $hash_base);
         git_header_html();
         my $refs = git_get_references();
         my $ref = format_ref_marker($refs, $hash_base);
         git_header_html();
-       my %base_key = ();
-       my $base = "";
-       my $have_blame = gitweb_check_feature('blame');
+       my $basedir = '';
+       my ($have_blame) = gitweb_check_feature('blame');
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
-               $base_key{hash_base} = $hash_base;
-               git_print_page_nav('tree','', $hash_base);
+               my @views_nav = ();
+               if (defined $file_name) {
+                       push @views_nav,
+                               $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                      hash=>$hash, file_name=>$file_name)},
+                                       "history"),
+                               $cgi->a({-href => href(action=>"tree",
+                                                      hash_base=>"HEAD", file_name=>$file_name)},
+                                       "HEAD"),
+               }
+               if ($have_snapshot) {
+                       # FIXME: Should be available when we have no hash base as well.
+                       push @views_nav,
+                               $cgi->a({-href => href(action=>"snapshot", hash=>$hash)},
+                                       "snapshot");
+               }
+               git_print_page_nav('tree','', $hash_base, undef, undef, join(' | ', @views_nav));
                 git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
         } else {
                 git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
         } else {
+               undef $hash_base;
                 print "<div class=\"page_nav\">\n";
                 print "<br/><br/></div>\n";
                 print "<div class=\"title\">$hash</div>\n";
         }
         if (defined $file_name) {
                 print "<div class=\"page_nav\">\n";
                 print "<br/><br/></div>\n";
                 print "<div class=\"title\">$hash</div>\n";
         }
         if (defined $file_name) {
-               $base = esc_html("$file_name/");
+               $basedir = $file_name;
+               if ($basedir ne '' && substr($basedir, -1) ne '/') {
+                       $basedir .= '/';
+               }
         }
         git_print_page_path($file_name, 'tree', $hash_base);
         print "<div class=\"page_body\">\n";
         print "<table cellspacing=\"0\">\n";
         }
         git_print_page_path($file_name, 'tree', $hash_base);
         print "<div class=\"page_body\">\n";
         print "<table cellspacing=\"0\">\n";
-       my $alternate = 0;
-       foreach my $line (@entries) {
-               #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'
-               $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
-               my $t_mode = $1;
-               my $t_type = $2;
-               my $t_hash = $3;
-               my $t_name = validate_input($4);
+       my $alternate = 1;
+       # '..' (top directory) link if possible
+       if (defined $hash_base &&
+           defined $file_name && $file_name =~ m![^/]+$!) {
                 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 class=\"mode\">" . mode_str($t_mode) . "</td>\n";
-               if ($t_type eq "blob") {
-                       print "<td class=\"list\">" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$t_hash, file_name=>"$base$t_name", %base_key),
-                                     -class => "list"}, esc_html($t_name)) .
-                             "</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
-                                     "blob");
-                       if ($have_blame) {
-                               print " | " .
-                                       $cgi->a({-href => href(action=>"blame", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
-                                               "blame");
-                       }
-                       print " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
-                                                    hash=>$t_hash, file_name=>"$base$t_name")},
-                                     "history") .
-                             " | " .
-                             $cgi->a({-href => href(action=>"blob_plain",
-                                                    hash=>$t_hash, file_name=>"$base$t_name")},
-                                     "raw") .
-                             "</td>\n";
-               } elsif ($t_type eq "tree") {
-                       print "<td class=\"list\">" .
-                             $cgi->a({-href => href(action=>"tree", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
-                                     esc_html($t_name)) .
-                             "</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"tree", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
-                                     "tree") .
-                             " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base, file_name=>"$base$t_name")},
-                                     "history") .
-                             "</td>\n";
+
+               my $up = $file_name;
+               $up =~ s!/?[^/]+$!!;
+               undef $up unless $up;
+               # based on git_print_tree_entry
+               print '<td class="mode">' . mode_str('040000') . "</td>\n";
+               print '<td class="list">';
+               print $cgi->a({-href => href(action=>"tree", hash_base=>$hash_base,
+                                            file_name=>$up)},
+                             "..");
+               print "</td>\n";
+               print "<td class=\"link\"></td>\n";
+
+               print "</tr>\n";
+       }
+       foreach my $line (@entries) {
+               my %t = parse_ls_tree_line($line, -z => 1);
+
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
                 }
                 }
+               $alternate ^= 1;
+
+               git_print_tree_entry(\%t, $basedir, $hash_base, $have_blame);
+
                 print "</tr>\n";
         }
         print "</table>\n" .
                 print "</tr>\n";
         }
         print "</table>\n" .
@@ -2522,7 +3601,6 @@ sub git_tree {
  }
  
  sub git_snapshot {
  }
  
  sub git_snapshot {
-
         my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
         my $have_snapshot = (defined $ctype && defined $suffix);
         if (!$have_snapshot) {
         my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
         my $have_snapshot = (defined $ctype && defined $suffix);
         if (!$have_snapshot) {
@@ -2533,16 +3611,19 @@ sub git_snapshot {
                 $hash = git_get_head_hash($project);
         }
  
                 $hash = git_get_head_hash($project);
         }
  
-       my $filename = basename($project) . "-$hash.tar.$suffix";
+       my $filename = to_utf8(basename($project)) . "-$hash.tar.$suffix";
  
  
-       print $cgi->header(-type => 'application/x-tar',
-                          -content_encoding => $ctype,
-                          -content_disposition => "inline; filename=\"$filename\"",
-                          -status => '200 OK');
+       print $cgi->header(
+               -type => "application/$ctype",
+               -content_disposition => 'inline; filename="' . "$filename" . '"',
+               -status => '200 OK');
  
  
-       my $git_command = git_cmd_str();
-       open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
-               die_error(undef, "Execute git-tar-tree failed.");
+       my $git = git_cmd_str();
+       my $name = $project;
+       $name =~ s/\047/\047\\\047\047/g;
+       open my $fd, "-|",
+       "$git archive --format=tar --prefix=\'$name\'/ $hash | $command"
+               or die_error(undef, "Execute git-tar-tree failed.");
         binmode STDOUT, ':raw';
         print <$fd>;
         binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
         binmode STDOUT, ':raw';
         print <$fd>;
         binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
@@ -2560,28 +3641,25 @@ sub git_log {
         }
         my $refs = git_get_references();
  
         }
         my $refs = git_get_references();
  
-       my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       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;
+       my @commitlist = parse_commits($hash, 101, (100 * $page));
  
  
-       my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#revlist);
+       my $paging_nav = format_paging_nav('log', $hash, $head, $page, (100 * ($page+1)));
  
         git_header_html();
         git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
  
  
         git_header_html();
         git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
  
-       if (!@revlist) {
+       if (!@commitlist) {
                 my %co = parse_commit($hash);
  
                 git_print_header_div('summary', $project);
                 print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
         }
                 my %co = parse_commit($hash);
  
                 git_print_header_div('summary', $project);
                 print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
         }
-       for (my $i = ($page * 100); $i <= $#revlist; $i++) {
-               my $commit = $revlist[$i];
-               my $ref = format_ref_marker($refs, $commit);
-               my %co = parse_commit($commit);
+       my $to = ($#commitlist >= 99) ? (99) : ($#commitlist);
+       for (my $i = 0; $i <= $to; $i++) {
+               my %co = %{$commitlist[$i]};
                 next if !%co;
                 next if !%co;
+               my $commit = $co{'id'};
+               my $ref = format_ref_marker($refs, $commit);
                 my %ad = parse_date($co{'author_epoch'});
                 git_print_header_div('commit',
                                "<span class=\"age\">$co{'age_string'}</span>" .
                 my %ad = parse_date($co{'author_epoch'});
                 git_print_header_div('commit',
                                "<span class=\"age\">$co{'age_string'}</span>" .
@@ -2592,19 +3670,28 @@ sub git_log {
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") .
                       " | " .
                       $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") .
                       $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") .
                       "<br/>\n" .
                       "</div>\n" .
                       "<i>" . esc_html($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\n" .
                       "</div>\n";
  
                 print "<div class=\"log_body\">\n";
                       "<br/>\n" .
                       "</div>\n" .
                       "<i>" . esc_html($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\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";
+       }
+       if ($#commitlist >= 100) {
+               print "<div class=\"page_nav\">\n";
+               print $cgi->a({-href => href(action=>"log", hash=>$hash, page=>$page+1),
+                              -accesskey => "n", -title => "Alt-n"}, "next");
                 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");
@@ -2612,14 +3699,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;
@@ -2629,18 +3748,10 @@ sub git_commit {
         my $refs = git_get_references();
         my $ref = format_ref_marker($refs, $co{'id'});
  
         my $refs = git_get_references();
         my $ref = format_ref_marker($refs, $co{'id'});
  
-       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
-       my $have_snapshot = (defined $ctype && defined $suffix);
+       my $have_snapshot = gitweb_have_snapshot();
  
  
-       my $formats_nav = '';
-       if (defined $file_name && defined $co{'parent'}) {
-               my $parent = $co{'parent'};
-               $formats_nav .=
-                       $cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
-                               "blame");
-       }
         git_header_html(undef, $expires);
         git_header_html(undef, $expires);
-       git_print_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
+       git_print_page_nav('commit', '',
                            $hash, $co{'tree'}, $hash,
                            $formats_nav);
  
                            $hash, $co{'tree'}, $hash,
                            $formats_nav);
  
@@ -2683,7 +3794,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>" .
@@ -2694,7 +3805,7 @@ sub git_commit {
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(action=>"commit", hash=>$par)}, "commit") .
                       " | " .
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(action=>"commit", hash=>$par)}, "commit") .
                       " | " .
-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "commitdiff") .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "diff") .
                       "</td>" .
                       "</tr>\n";
         }
                       "</td>" .
                       "</tr>\n";
         }
@@ -2705,11 +3816,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';
  
@@ -2723,7 +3884,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>;
@@ -2732,16 +3894,13 @@ sub git_blobdiff {
                         @difftree
                                 or die_error('404 Not Found', "Blob diff not found");
  
                         @difftree
                                 or die_error('404 Not Found', "Blob diff not found");
  
-               } elsif (defined $hash) { # try to find filename from $hash
-                       if ($hash !~ /[0-9a-fA-F]{40}/) {
-                               $hash = git_to_hash($hash);
-                       }
                 } elsif (defined $hash &&
                          $hash =~ /[0-9a-fA-F]{40}/) {
                         # try to find filename from $hash
  
                         # read filtered raw output
                 } elsif (defined $hash &&
                          $hash =~ /[0-9a-fA-F]{40}/) {
                         # 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'
@@ -2811,7 +3970,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")
@@ -2825,7 +3985,7 @@ sub git_blobdiff {
                                                hash=>$hash, hash_parent=>$hash_parent,
                                                hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
                                                file_name=>$file_name, file_parent=>$file_parent)},
                                                hash=>$hash, hash_parent=>$hash_parent,
                                                hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
                                                file_name=>$file_name, file_parent=>$file_parent)},
-                               "plain");
+                               "raw");
                 git_header_html(undef, $expires);
                 if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                 git_header_html(undef, $expires);
                 if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
@@ -2845,7 +4005,7 @@ sub git_blobdiff {
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
-                       -content_disposition => qq(inline; filename="${file_name}.patch"));
+                       -content_disposition => 'inline; filename="' . "$file_name" . '.patch"');
  
                 print "X-Git-Url: " . $cgi->self_url() . "\n\n";
  
  
                 print "X-Git-Url: " . $cgi->self_url() . "\n\n";
  
@@ -2865,8 +4025,8 @@ sub git_blobdiff {
  
         } else {
                 while (my $line = <$fd>) {
  
         } else {
                 while (my $line = <$fd>) {
-                       $line =~ s!a/($hash|$hash_parent)!a/$diffinfo{'from_file'}!g;
-                       $line =~ s!b/($hash|$hash_parent)!b/$diffinfo{'to_file'}!g;
+                       $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;
  
@@ -2884,10 +4044,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';
         }
@@ -2897,10 +4103,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;
@@ -2908,7 +4116,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 {
@@ -2925,18 +4133,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)},
-                               "plain");
  
                 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_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=\"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");
@@ -2947,7 +4154,7 @@ sub git_commitdiff {
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
-                       -content_disposition => qq(inline; filename="$filename"));
+                       -content_disposition => 'inline; filename="' . "$filename" . '"');
                 my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
                 print <<TEXT;
  From: $co{'author'}
                 my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
                 print <<TEXT;
  From: $co{'author'}
@@ -2965,8 +4172,8 @@ TEXT
  
         # write patch
         if ($format eq 'html') {
  
         # write patch
         if ($format eq 'html') {
-               #git_difftree_body(\@difftree, $hash, $hash_parent);
-               #print "<br/>\n";
+               git_difftree_body(\@difftree, $hash, $hash_parent);
+               print "<br/>\n";
  
                 git_patchset_body($fd, \@difftree, $hash, $hash_parent);
                 close $fd;
  
                 git_patchset_body($fd, \@difftree, $hash, $hash_parent);
                 close $fd;
@@ -2989,33 +4196,73 @@ sub git_history {
         if (!defined $hash_base) {
                 $hash_base = git_get_head_hash($project);
         }
         if (!defined $hash_base) {
                 $hash_base = git_get_head_hash($project);
         }
+       if (!defined $page) {
+               $page = 0;
+       }
         my $ftype;
         my %co = parse_commit($hash_base);
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
         my $ftype;
         my %co = parse_commit($hash_base);
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
+
         my $refs = git_get_references();
         my $refs = git_get_references();
-       git_header_html();
-       git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base);
-       git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
+       my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
+
         if (!defined $hash && defined $file_name) {
                 $hash = git_get_hash_by_path($hash_base, $file_name);
         }
         if (defined $hash) {
                 $ftype = git_get_type($hash);
         }
         if (!defined $hash && defined $file_name) {
                 $hash = git_get_hash_by_path($hash_base, $file_name);
         }
         if (defined $hash) {
                 $ftype = git_get_type($hash);
         }
-       git_print_page_path($file_name, $ftype, $hash_base);
  
  
-       open my $fd, "-|",
-               git_cmd(), "rev-list", "--full-history", $hash_base, "--", $file_name;
+       my @commitlist = parse_commits($hash_base, 101, (100 * $page), "--full-history", $file_name);
  
  
-       git_history_body($fd, $refs, $hash_base, $ftype);
+       my $paging_nav = '';
+       if ($page > 0) {
+               $paging_nav .=
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name)},
+                               "first");
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name, page=>$page-1),
+                                -accesskey => "p", -title => "Alt-p"}, "prev");
+       } else {
+               $paging_nav .= "first";
+               $paging_nav .= " &sdot; prev";
+       }
+       if ($#commitlist >= 100) {
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name, page=>$page+1),
+                                -accesskey => "n", -title => "Alt-n"}, "next");
+       } else {
+               $paging_nav .= " &sdot; next";
+       }
+       my $next_link = '';
+       if ($#commitlist >= 100) {
+               $next_link =
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name, page=>$page+1),
+                                -accesskey => "n", -title => "Alt-n"}, "next");
+       }
+
+       git_header_html();
+       git_print_page_nav('history','', $hash_base,$co{'tree'},$hash_base, $paging_nav);
+       git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
+       git_print_page_path($file_name, $ftype, $hash_base);
+
+       git_history_body(\@commitlist, 0, 99,
+                        $refs, $hash_base, $ftype, $next_link);
  
  
-       close $fd;
         git_footer_html();
  }
  
  sub git_search {
         git_footer_html();
  }
  
  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");
         }
@@ -3026,79 +4273,78 @@ sub git_search {
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
         if (!%co) {
                 die_error(undef, "Unknown commit object");
         }
-       # pickaxe may take all resources of your box and run for several minutes
-       # with every query - so decide by yourself how public you make this feature :)
-       my $commit_search = 1;
-       my $author_search = 0;
-       my $committer_search = 0;
-       my $pickaxe_search = 0;
-       if ($searchtext =~ s/^author\\://i) {
-               $author_search = 1;
-       } elsif ($searchtext =~ s/^committer\\://i) {
-               $committer_search = 1;
-       } elsif ($searchtext =~ s/^pickaxe\\://i) {
-               $commit_search = 0;
-               $pickaxe_search = 1;
+       if (!defined $page) {
+               $page = 0;
+       }
+
+       $searchtype ||= 'commit';
+       if ($searchtype eq 'pickaxe') {
+               # pickaxe may take all resources of your box and run for several minutes
+               # with every query - so decide by yourself how public you make this feature
+               my ($have_pickaxe) = gitweb_check_feature('pickaxe');
+               if (!$have_pickaxe) {
+                       die_error('403 Permission denied', "Permission denied");
+               }
         }
         }
+
         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 = 0;
-       if ($commit_search) {
-               $/ = "\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 ($author_search && !grep m/\nauthor .*$searchtext/i, $commit_text) {
-                               next;
-                       }
-                       if ($committer_search && !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";
+       if ($searchtype eq 'commit' or $searchtype eq 'author' or $searchtype eq 'committer') {
+               my $greptype;
+               if ($searchtype eq 'commit') {
+                       $greptype = "--grep=";
+               } elsif ($searchtype eq 'author') {
+                       $greptype = "--author=";
+               } elsif ($searchtype eq 'committer') {
+                       $greptype = "--committer=";
                 }
                 }
-               close $fd;
+               $greptype .= $searchtext;
+               my @commitlist = parse_commits($hash, 101, (100 * $page), $greptype);
+
+               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 ($#commitlist >= 100) {
+                       $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 ($#commitlist >= 100) {
+                       $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(\@commitlist, 0, 99, $next_link);
         }
  
         }
  
-       if ($pickaxe_search) {
+       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 | " .
@@ -3138,7 +4384,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" .
@@ -3153,8 +4399,34 @@ sub git_search {
                         }
                 }
                 close $fd;
                         }
                 }
                 close $fd;
+
+               print "</table>\n";
         }
         }
-       print "</table>\n";
+       git_footer_html();
+}
+
+sub git_search_help {
+       git_header_html();
+       git_print_page_nav('','', $hash,$hash,$hash);
+       print <<EOT;
+<dl>
+<dt><b>commit</b></dt>
+<dd>The commit messages and authorship information will be scanned for the given string.</dd>
+<dt><b>author</b></dt>
+<dd>Name and e-mail of the change author and date of birth of the patch will be scanned for the given string.</dd>
+<dt><b>committer</b></dt>
+<dd>Name and e-mail of the committer and date of commit will be scanned for the given string.</dd>
+EOT
+       my ($have_pickaxe) = gitweb_check_feature('pickaxe');
+       if ($have_pickaxe) {
+               print <<EOT;
+<dt><b>pickaxe</b></dt>
+<dd>All commits that caused the string to appear or disappear from any file (changes that
+added, removed or "modified" the string) will be listed. This search can take a while and
+takes a lot of strain on the server, so please use it wisely.</dd>
+EOT
+       }
+       print "</dl>\n";
         git_footer_html();
  }
  
         git_footer_html();
  }
  
@@ -3168,94 +4440,253 @@ sub git_shortlog {
         }
         my $refs = git_get_references();
  
         }
         my $refs = git_get_references();
  
-       my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       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;
+       my @commitlist = parse_commits($hash, 101, (100 * $page));
  
  
-       my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, $#revlist);
+       my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, (100 * ($page+1)));
         my $next_link = '';
         my $next_link = '';
-       if ($#revlist >= (100 * ($page+1)-1)) {
+       if ($#commitlist >= 100) {
                 $next_link =
                         $cgi->a({-href => href(action=>"shortlog", hash=>$hash, page=>$page+1),
                 $next_link =
                         $cgi->a({-href => href(action=>"shortlog", hash=>$hash, page=>$page+1),
-                                -title => "Alt-n"}, "next");
+                                -accesskey => "n", -title => "Alt-n"}, "next");
         }
  
         }
  
-
         git_header_html();
         git_print_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
         git_print_header_div('summary', $project);
  
         git_header_html();
         git_print_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
         git_print_header_div('summary', $project);
  
-       git_shortlog_body(\@revlist, ($page * 100), $#revlist, $refs, $next_link);
+       git_shortlog_body(\@commitlist, 0, 99, $refs, $next_link);
  
         git_footer_html();
  }
  
  ## ......................................................................
  
         git_footer_html();
  }
  
  ## ......................................................................
-## 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)
-               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"?>
+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';
+       my @commitlist = parse_commits($head, 150);
+
+       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($commitlist[0])) {
+               %latest_commit = %{$commitlist[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";
+               }
+       }
  
  
-       for (my $i = 0; $i <= $#revlist; $i++) {
-               my $commit = $revlist[$i];
-               my %co = parse_commit($commit);
+       # contents
+       for (my $i = 0; $i <= $#commitlist; $i++) {
+               my %co = %{$commitlist[$i]};
+               my $commit = $co{'id'};
                 # we read 150, we always show 30 and the ones more recent than 48 hours
                 # 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'});
-               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
-                       $co{'parent'}, $co{'id'}
+               my %cd = parse_date($co{'author_epoch'});
+
+               # get list of changed files
+               open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       $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 = decode("utf8", $line, Encode::FB_DEFAULT);
-                       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');
+                       }
+                       # 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');
                         }
                         }
-                       my $file = validate_input(unquote($7));
-                       $file = decode("utf8", $file, Encode::FB_DEFAULT);
-                       print "$file<br/>\n";
+                       $file = esc_path($file);
+                       print "] ".
+                             "$file</li>\n";
                 }
                 }
-               print "]]>\n" .
-                     "</content:encoded>\n" .
-                     "</item>\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";
+               }
+       }
+
+       # end of feed
+       if ($format eq 'rss') {
+               print "</channel>\n</rss>\n";
+       }       elsif ($format eq 'atom') {
+               print "</feed>\n";
         }
         }
-       print "</channel></rss>";
+}
+
+sub git_rss {
+       git_feed('rss');
+}
+
+sub git_atom {
+       git_feed('atom');
  }
  
  sub git_opml {
  }
  
  sub git_opml {
@@ -3266,7 +4697,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">