gitweb: Use --no-commit-id in git_commit and git_commitdiff

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

index abdbb49a55a899aa65caaa397c93e7304de73ff6bf582bff8db9c46d3da1480e..71068ddc3c43457c59d5e469dd6a43db7bd1f9729c1b0fdd301ce6a6d6df7b8f 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -31,9 +31,6 @@ our $GIT = "++GIT_BINDIR++/git";
  #our $projectroot = "/pub/scm";
  our $projectroot = "++GITWEB_PROJECTROOT++";
  
  #our $projectroot = "/pub/scm";
  our $projectroot = "++GITWEB_PROJECTROOT++";
  
-# location for temporary files needed for diffs
-our $git_temp = "/tmp/gitweb";
-
  # target of the home link on top of all pages
  our $home_link = $my_uri || "/";
  
  # target of the home link on top of all pages
  our $home_link = $my_uri || "/";
  
@@ -42,19 +39,43 @@ 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 stylesheets
+our @stylesheets = ("++GITWEB_CSS++");
+our $stylesheet;
+# default is not to define style sheet, but it can be overwritten later
+undef $stylesheet;
  
  
-# URI of default stylesheet
-our $stylesheet = "++GITWEB_CSS++";
-# URI of GIT logo
+# 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"
  our @git_base_url_list = ("++GITWEB_BASE_URL++");
  # 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++");
@@ -69,32 +90,110 @@ our $mimetypes_file = undef;
  
  # You define site-wide feature defaults here; override them with
  # $GITWEB_CONFIG as necessary.
  
  # You define site-wide feature defaults here; override them with
  # $GITWEB_CONFIG as necessary.
-our %feature =
-(
-
-# feature  => {'sub' => feature-sub, 'override' => allow-override, 'default' => [ default options...]
-
-'blame'         => {'sub' => \&feature_blame, 'override' => 0, 'default' => [0]},
-'snapshot'      => {'sub' => \&feature_snapshot, 'override' => 0, 'default' => ['x-gzip', 'gz', 'gzip']},
-
+our %feature = (
+       # feature => {
+       #       'sub' => feature-sub (subroutine),
+       #       'override' => allow-override (boolean),
+       #       'default' => [ default options...] (array reference)}
+       #
+       # if feature is overridable (it means that allow-override has true value,
+       # then feature-sub will be called with default options as parameters;
+       # return value of feature-sub indicates if to enable specified feature
+       #
+       # 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]},
+
+       # 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{'blame'}{'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']},
+
+       # 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};
-       my ($sub, $override, @defaults) = ($feature{$name}{'sub'},
-                                               $feature{$name}{'override'},
-                                               @{$feature{$name}{'default'}});
+       return unless exists $feature{$name};
+       my ($sub, $override, @defaults) = (
+               $feature{$name}{'sub'},
+               $feature{$name}{'override'},
+               @{$feature{$name}{'default'}});
         if (!$override) { return @defaults; }
         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');
  
@@ -107,12 +206,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) = @_;
  
@@ -129,16 +222,58 @@ 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).
+# - more costly is '-C' (or '-C', '-M'), with the cost proportional to
+#   (number of changed files + number of removed files) * (number of new files)
+# - even more costly is '-C', '--find-copies-harder' with cost
+#   (number of files in the original tree) * (number of new files)
+# - one might want to include '-B' option, e.g. '-B', '-M'
+our @diff_opts = ('-M'); # taken from git_commit
+
  our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
  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";
  
  $projects_list ||= $projectroot;
  
  # version of the core git binary
  our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
  
  $projects_list ||= $projectroot;
-if (! -d $git_temp) {
-       mkdir($git_temp, 0700) || die_error(undef, "Couldn't mkdir $git_temp");
-}
  
  # ======================================================================
  # input validation and dispatch
  
  # ======================================================================
  # input validation and dispatch
@@ -147,73 +282,68 @@ if (defined $action) {
         if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
                 die_error(undef, "Invalid action parameter");
         }
         if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
                 die_error(undef, "Invalid action parameter");
         }
-       # action which does not check rest of parameters
-       if ($action eq "opml") {
-               git_opml();
-               exit;
-       }
  }
  
  }
  
-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");
         }
-       $ENV{'GIT_DIR'} = "$projectroot/$project";
-} else {
-       git_project_list();
-       exit;
  }
  
  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");
         }
  }
  
                 die_error(undef, "Invalid hash base parameter");
         }
  }
  
+our $hash_parent_base = $cgi->param('hpb');
+if (defined $hash_parent_base) {
+       if (!validate_refname($hash_parent_base)) {
+               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");
         }
  }
@@ -226,6 +356,62 @@ if (defined $searchtext) {
         $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,
@@ -236,23 +422,37 @@ 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,
         "search" => \&git_search,
         "heads" => \&git_heads,
         "history" => \&git_history,
         "log" => \&git_log,
         "rss" => \&git_rss,
         "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,
+       # those below don't need $project
+       "opml" => \&git_opml,
+       "project_list" => \&git_project_list,
+       "project_index" => \&git_project_index,
  );
  
  );
  
-$action = 'summary' if (!defined($action));
+if (defined $project) {
+       $action ||= 'summary';
+} else {
+       $action ||= 'project_list';
+}
  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;
  
@@ -260,27 +460,51 @@ exit;
  ## action links
  
  sub href(%) {
  ## action links
  
  sub href(%) {
-       my %mapping = (
-               action => "a",
+       my %params = @_;
+       my $href = $my_uri;
+
+       # XXX: Warning: If you touch this, check the search form for updating,
+       # too.
+
+       my @mapping = (
                 project => "p",
                 project => "p",
+               action => "a",
                 file_name => "f",
                 file_parent => "fp",
                 hash => "h",
                 hash_parent => "hp",
                 hash_base => "hb",
                 file_name => "f",
                 file_parent => "fp",
                 hash => "h",
                 hash_parent => "hp",
                 hash_base => "hb",
+               hash_parent_base => "hpb",
                 page => "pg",
                 page => "pg",
+               order => "o",
                 searchtext => "s",
                 searchtext => "s",
+               searchtype => "st",
         );
         );
+       my %mapping = @mapping;
  
  
-       my %params = @_;
-       $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'};
+               }
+       }
  
  
-       my $href = "$my_uri?";
-       $href .= esc_param( join(";",
-               map {
-                       "$mapping{$_}=$params{$_}" if defined $params{$_}
-               } keys %params
-       ) );
+       # now encode the parameters explicitly
+       my @result = ();
+       for (my $i = 0; $i < @mapping; $i += 2) {
+               my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
+               if (defined $params{$name}) {
+                       push @result, $symbol . "=" . esc_param($params{$name});
+               }
+       }
+       $href .= "?" . join(';', @result) if scalar @result;
  
         return $href;
  }
  
         return $href;
  }
@@ -289,24 +513,57 @@ sub 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;
@@ -317,9 +574,10 @@ sub esc_param {
  # replace invalid utf8 character with SUBSTITUTION sequence
  sub esc_html {
         my $str = shift;
  # replace invalid utf8 character with SUBSTITUTION sequence
  sub esc_html {
         my $str = shift;
-       $str = decode("utf8", $str, Encode::FB_DEFAULT);
+       $str = to_utf8($str);
         $str = escapeHTML($str);
         $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
         $str = escapeHTML($str);
         $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
+       $str =~ s/\033/^[/g; # "escape" ESCAPE (\e) character (e.g. commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1)
         return $str;
  }
  
         return $str;
  }
  
@@ -347,6 +605,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
  
@@ -437,7 +701,13 @@ sub mode_str {
  
  # convert file mode in octal to file type string
  sub file_type {
  
  # convert file mode in octal to file type string
  sub file_type {
-       my $mode = oct shift;
+       my $mode = shift;
+
+       if ($mode !~ m/^[0-7]+$/) {
+               return $mode;
+       } else {
+               $mode = oct $mode;
+       }
  
         if (S_ISDIR($mode & S_IFMT)) {
                 return "directory";
  
         if (S_ISDIR($mode & S_IFMT)) {
                 return "directory";
@@ -463,7 +733,9 @@ sub format_log_line_html {
         if ($line =~ m/([0-9a-fA-F]{40})/) {
                 my $hash_text = $1;
                 if (git_get_type($hash_text) eq "commit") {
         if ($line =~ m/([0-9a-fA-F]{40})/) {
                 my $hash_text = $1;
                 if (git_get_type($hash_text) eq "commit") {
-                       my $link = $cgi->a({-class => "text", -href => href(action=>"commit", hash=>$hash_text)}, $hash_text);
+                       my $link =
+                               $cgi->a({-href => href(action=>"commit", hash=>$hash_text),
+                                       -class => "text"}, $hash_text);
                         $line =~ s/$hash_text/$link/;
                 }
         }
                         $line =~ s/$hash_text/$link/;
                 }
         }
@@ -505,7 +777,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"},
@@ -513,24 +785,54 @@ sub format_subject_html {
         }
  }
  
         }
  }
  
+sub format_diff_line {
+       my $line = shift;
+       my $char = substr($line, 0, 1);
+       my $diff_class = "";
+
+       chomp $line;
+
+       if ($char eq '+') {
+               $diff_class = " add";
+       } elsif ($char eq "-") {
+               $diff_class = " rem";
+       } elsif ($char eq "@") {
+               $diff_class = " chunk_header";
+       } elsif ($char eq "\\") {
+               $diff_class = " incomplete";
+       }
+       $line = untabify($line);
+       return "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
+}
+
  ## ----------------------------------------------------------------------
  ## git utility subroutines, invoking git commands
  
  ## ----------------------------------------------------------------------
  ## git utility subroutines, invoking git commands
  
+# returns path to the core git executable and the --git-dir parameter as list
+sub git_cmd {
+       return $GIT, '--git-dir='.$git_dir;
+}
+
+# returns path to the core git executable and the --git-dir parameter as string
+sub git_cmd_str {
+       return join(' ', git_cmd());
+}
+
  # get HEAD ref of given project as hash
  sub git_get_head_hash {
         my $project = shift;
  # get HEAD ref of given project as hash
  sub git_get_head_hash {
         my $project = shift;
-       my $oENV = $ENV{'GIT_DIR'};
+       my $o_git_dir = $git_dir;
         my $retval = undef;
         my $retval = undef;
-       $ENV{'GIT_DIR'} = "$projectroot/$project";
-       if (open my $fd, "-|", $GIT, "rev-parse", "--verify", "HEAD") {
+       $git_dir = "$projectroot/$project";
+       if (open my $fd, "-|", git_cmd(), "rev-parse", "--verify", "HEAD") {
                 my $head = <$fd>;
                 close $fd;
                 if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) {
                         $retval = $1;
                 }
         }
                 my $head = <$fd>;
                 close $fd;
                 if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) {
                         $retval = $1;
                 }
         }
-       if (defined $oENV) {
-               $ENV{'GIT_DIR'} = $oENV;
+       if (defined $o_git_dir) {
+               $git_dir = $o_git_dir;
         }
         return $retval;
  }
         }
         return $retval;
  }
@@ -539,7 +841,7 @@ sub git_get_head_hash {
  sub git_get_type {
         my $hash = shift;
  
  sub git_get_type {
         my $hash = shift;
  
-       open my $fd, "-|", $GIT, "cat-file", '-t', $hash or return;
+       open my $fd, "-|", git_cmd(), "cat-file", '-t', $hash or return;
         my $type = <$fd>;
         close $fd or return;
         chomp $type;
         my $type = <$fd>;
         close $fd or return;
         chomp $type;
@@ -553,7 +855,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, 'repo-config');
+       my @x = (git_cmd(), 'repo-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";
@@ -566,35 +868,27 @@ 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, "ls-tree", $base, "--", $path
+       open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path
                 or die_error(undef, "Open git-ls-tree failed");
         my $line = <$fd>;
         close $fd or return undef;
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
         $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
                 or die_error(undef, "Open git-ls-tree failed");
         my $line = <$fd>;
         close $fd or return undef;
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
         $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;
  
@@ -608,7 +902,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;
  
@@ -616,27 +910,45 @@ 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" : '');
+               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;
@@ -645,10 +957,10 @@ sub git_get_projects_list {
                         if (!defined $path) {
                                 next;
                         }
                         if (!defined $path) {
                                 next;
                         }
-                       if (-e "$projectroot/$path/HEAD") {
+                       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
                         }
@@ -677,7 +989,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;
                         }
                 }
@@ -693,16 +1005,10 @@ sub git_get_project_owner {
  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^{}
         # 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, "ls-remote", "."
-                       or return;
-       }
+       open my $fd, "-|", $GIT, "peek-remote", "$projectroot/$project/"
+               or return;
  
         while (my $line = <$fd>) {
                 chomp $line;
  
         while (my $line = <$fd>) {
                 chomp $line;
@@ -718,6 +1024,22 @@ sub git_get_references {
         return \%refs;
  }
  
         return \%refs;
  }
  
+sub git_get_rev_name_tags {
+       my $hash = shift || return undef;
+
+       open my $fd, "-|", git_cmd(), "name-rev", "--tags", $hash
+               or return;
+       my $name_rev = <$fd>;
+       close $fd;
+
+       if ($name_rev =~ m|^$hash tags/(.*)$|) {
+               return $1;
+       } else {
+               # catches also '$hash undefined' output
+               return undef;
+       }
+}
+
  ## ----------------------------------------------------------------------
  ## parse to hash functions
  
  ## ----------------------------------------------------------------------
  ## parse to hash functions
  
@@ -734,8 +1056,10 @@ 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{'mday-time'} = sprintf "%d %s %02d:%02d", $mday, $months[$mon], $hour ,$min;
+       $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;
  
         $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);
@@ -743,6 +1067,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;
  }
  
@@ -751,7 +1078,7 @@ sub parse_tag {
         my %tag;
         my @comment;
  
         my %tag;
         my @comment;
  
-       open my $fd, "-|", $GIT, "cat-file", "tag", $tag_id or return;
+       open my $fd, "-|", git_cmd(), "cat-file", "tag", $tag_id or return;
         $tag{'id'} = $tag_id;
         while (my $line = <$fd>) {
                 chomp $line;
         $tag{'id'} = $tag_id;
         while (my $line = <$fd>) {
                 chomp $line;
@@ -781,6 +1108,24 @@ sub parse_tag {
         return %tag
  }
  
         return %tag
  }
  
+sub git_get_last_activity {
+       my ($path) = @_;
+       my $fd;
+
+       $git_dir = "$projectroot/$path";
+       open($fd, "-|", git_cmd(), 'for-each-ref',
+            '--format=%(refname) %(committer)',
+            '--sort=-committerdate',
+            'refs/heads') or return;
+       my $most_recent = <$fd>;
+       close $fd or return;
+       if ($most_recent =~ / (\d+) [-+][01]\d\d\d$/) {
+               my $timestamp = $1;
+               my $age = time - $timestamp;
+               return ($age, age_string($age));
+       }
+}
+
  sub parse_commit {
         my $commit_id = shift;
         my $commit_text = shift;
  sub parse_commit {
         my $commit_id = shift;
         my $commit_text = shift;
@@ -791,11 +1136,11 @@ sub parse_commit {
         if (defined $commit_text) {
                 @commit_lines = @$commit_text;
         } else {
         if (defined $commit_text) {
                 @commit_lines = @$commit_text;
         } else {
-               $/ = "\0";
-               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", "--max-count=1", $commit_id or return;
+               local $/ = "\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;
                 @commit_lines = split '\n', <$fd>;
                 close $fd or return;
-               $/ = "\n";
                 pop @commit_lines;
         }
         my $header = shift @commit_lines;
                 pop @commit_lines;
         }
         my $header = shift @commit_lines;
@@ -855,6 +1200,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/^    //;
@@ -939,9 +1287,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(.+)$/;
+
+       $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;
  }
@@ -950,28 +1319,46 @@ sub parse_difftree_raw_line {
  ## parse to array of hashes functions
  
  sub git_get_refs_list {
  ## parse to array of hashes functions
  
  sub git_get_refs_list {
-       my $ref_dir = shift;
+       my $type = shift || "";
+       my %refs;
         my @reflist;
  
         my @refs;
         my @reflist;
  
         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);
+       open my $fd, "-|", $GIT, "peek-remote", "$projectroot/$project/"
+               or return;
+       while (my $line = <$fd>) {
+               chomp $line;
+               if ($line =~ m/^([0-9a-fA-F]{40})\trefs\/($type\/?([^\^]+))(\^\{\})?$/) {
+                       if (defined $refs{$1}) {
+                               push @{$refs{$1}}, $2;
+                       } else {
+                               $refs{$1} = [ $2 ];
+                       }
+
+                       if (! $4) { # unpeeled, direct reference
+                               push @refs, { hash => $1, name => $3 }; # without type
+                       } elsif ($3 eq $refs[-1]{'name'}) {
+                               # most likely a tag is followed by its peeled
+                               # (deref) one, and when that happens we know the
+                               # previous one was of type 'tag'.
+                               $refs[-1]{'type'} = "tag";
+                       }
                 }
                 }
-       }, "$projectroot/$project/$ref_dir");
+       }
+       close $fd;
  
  
-       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;
+       foreach my $ref (@refs) {
+               my $ref_file = $ref->{'name'};
+               my $ref_id   = $ref->{'hash'};
+
+               my $type = $ref->{'type'} || git_get_type($ref_id) || next;
                 my %ref_item = parse_ref($ref_file, $ref_id, $type);
  
                 push @reflist, \%ref_item;
         }
         # sort refs by age
         @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
                 my %ref_item = parse_ref($ref_file, $ref_id, $type);
  
                 push @reflist, \%ref_item;
         }
         # sort refs by age
         @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
-       return \@reflist;
+       return (\@reflist, \%refs);
  }
  
  ## ----------------------------------------------------------------------
  }
  
  ## ----------------------------------------------------------------------
@@ -987,7 +1374,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);
  }
  
  ## ......................................................................
  }
  
  ## ......................................................................
@@ -1012,7 +1399,7 @@ sub mimetype_guess_file {
         }
         close(MIME);
  
         }
         close(MIME);
  
-       $filename =~ /\.(.*?)$/;
+       $filename =~ /\.([^.]*)$/;
         return $mimemap{$1};
  }
  
         return $mimemap{$1};
  }
  
@@ -1068,13 +1455,13 @@ sub git_header_html {
         my $status = shift || "200 OK";
         my $expires = shift;
  
         my $status = shift || "200 OK";
         my $expires = shift;
  
-       my $title = "$site_name git";
+       my $title = "$site_name";
         if (defined $project) {
                 $title .= " - $project";
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
         if (defined $project) {
                 $title .= " - $project";
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
-                               $title .= " - $file_name";
+                               $title .= " - " . esc_html($file_name);
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
@@ -1086,12 +1473,15 @@ sub git_header_html {
         # 'application/xhtml+xml', otherwise send it as plain old 'text/html'.
         # we have to do this because MSIE sometimes globs '*/*', pretending to
         # support xhtml+xml but choking when it gets what it asked for.
         # 'application/xhtml+xml', otherwise send it as plain old 'text/html'.
         # we have to do this because MSIE sometimes globs '*/*', pretending to
         # support xhtml+xml but choking when it gets what it asked for.
-       if (defined $cgi->http('HTTP_ACCEPT') && $cgi->http('HTTP_ACCEPT') =~ m/(,|;|\s|^)application\/xhtml\+xml(,|;|\s|$)/ && $cgi->Accept('application/xhtml+xml') != 0) {
+       if (defined $cgi->http('HTTP_ACCEPT') &&
+           $cgi->http('HTTP_ACCEPT') =~ m/(,|;|\s|^)application\/xhtml\+xml(,|;|\s|$)/ &&
+           $cgi->Accept('application/xhtml+xml') != 0) {
                 $content_type = 'application/xhtml+xml';
         } else {
                 $content_type = 'text/html';
         }
                 $content_type = 'application/xhtml+xml';
         } else {
                 $content_type = 'text/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);
         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">
@@ -1103,21 +1493,47 @@ sub git_header_html {
  <meta name="generator" content="gitweb/$version git/$git_version"/>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>
  <meta name="generator" content="gitweb/$version git/$git_version"/>
  <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) {
                 printf('<link rel="alternate" title="%s log" '.
                        'href="%s" type="application/rss+xml"/>'."\n",
                        esc_param($project), href(action=>"rss"));
         if (defined $project) {
                 printf('<link rel="alternate" title="%s log" '.
                        'href="%s" type="application/rss+xml"/>'."\n",
                        esc_param($project), href(action=>"rss"));
+       } else {
+               printf('<link rel="alternate" title="%s projects list" '.
+                      'href="%s" type="text/plain; charset=utf-8"/>'."\n",
+                      $site_name, href(project=>undef, action=>"project_index"));
+               printf('<link rel="alternate" title="%s projects logs" '.
+                      '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) {
         if (defined $project) {
                 print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                 if (defined $action) {
@@ -1137,11 +1553,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";
@@ -1156,12 +1577,23 @@ 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") . "\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>";
  }
  
@@ -1170,11 +1602,13 @@ sub die_error {
         my $error = shift || "Malformed query, file missing or permission denied";
  
         git_header_html($status);
         my $error = shift || "Malformed query, file missing or permission denied";
  
         git_header_html($status);
-       print "<div class=\"page_body\">\n" .
-             "<br/><br/>\n" .
-             "$status - $error\n" .
-             "<br/>\n" .
-             "</div>\n";
+       print <<EOF;
+<div class="page_body">
+<br /><br />
+$status - $error
+<br />
+</div>
+EOF
         git_footer_html();
         exit;
  }
         git_footer_html();
         exit;
  }
@@ -1261,29 +1695,71 @@ sub git_print_header_div {
               "\n</div>\n";
  }
  
               "\n</div>\n";
  }
  
+#sub git_print_authorship (\%) {
+sub git_print_authorship {
+       my $co = shift;
+
+       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;
  
  sub git_print_page_path {
         my $name = shift;
         my $type = shift;
         my $hb = 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", hash_base=>$hb, file_name=>$file_name)}, esc_html($name));
+
+       print "<div class=\"page_path\">";
+       print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
+                     -title => 'tree root'}, "[$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 => $fullname}, esc_html($dir));
+                       print " / ";
+               }
+               if (defined $type && $type eq 'blob') {
+                       print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
+                                                    hash_base=>$hb),
+                                     -title => $name}, esc_html($basename));
+               } elsif (defined $type && $type eq 'tree') {
+                       print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
+                                                    hash_base=>$hb),
+                                     -title => $name}, esc_html($basename));
+                       print " / ";
                 } else {
                 } else {
-                       print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name)}, esc_html($name));
+                       print esc_html($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 (\@;%) {
+sub git_print_log ($;%) {
         my $log = shift;
         my $log = shift;
+       my %opts = @_;
  
  
+       if ($opts{'-remove_title'}) {
+               # remove title, i.e. first line of log
+               shift @$log;
+       }
         # remove leading empty lines
         while (defined $log->[0] && $log->[0] eq "") {
                 shift @$log;
         # remove leading empty lines
         while (defined $log->[0] && $log->[0] eq "") {
                 shift @$log;
@@ -1293,6 +1769,20 @@ sub git_print_log {
         my $signoff = 0;
         my $empty = 0;
         foreach my $line (@$log) {
         my $signoff = 0;
         my $empty = 0;
         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;
+                       } else {
+                               # remove signoff lines
+                               next;
+                       }
+               } else {
+                       $signoff = 0;
+               }
+
                 # print only one empty line
                 # do not print empty line after signoff
                 if ($line eq "") {
                 # print only one empty line
                 # do not print empty line after signoff
                 if ($line eq "") {
@@ -1301,51 +1791,80 @@ sub git_print_log {
                 } else {
                         $empty = 0;
                 }
                 } else {
                         $empty = 0;
                 }
-               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
-                       $signoff = 1;
-                       print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
-               } else {
-                       $signoff = 0;
-                       print format_log_line_html($line) . "<br/>\n";
-               }
-       }
-}
  
  
-sub git_print_simplified_log {
-       my $log = shift;
-       my $remove_title = shift;
+               print format_log_line_html($line) . "<br/>\n";
+       }
  
  
-       shift @$log if $remove_title;
-       # remove leading empty lines
-       while (defined $log->[0] && $log->[0] eq "") {
-               shift @$log;
+       if ($opts{'-final_empty_line'}) {
+               # end with single empty line
+               print "<br/>\n" unless $empty;
         }
         }
+}
  
  
-       # simplify and print log
-       my $empty = 0;
-       foreach my $line (@$log) {
-               # remove signoff lines
-               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
-                       next;
+# 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_html($t->{'name'})) . "</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");
                 }
                 }
-               # print only one empty line
-               if ($line eq "") {
-                       next if $empty;
-                       $empty = 1;
-               } else {
-                       $empty = 0;
+               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_html($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 format_log_line_html($line) . "<br/>\n";
+               print "</td>\n";
         }
         }
-       # end with single empty line
-       print "<br/>\n" unless $empty;
  }
  
  ## ......................................................................
  ## functions printing large fragments of HTML
  
  sub git_difftree_body {
  }
  
  ## ......................................................................
  ## functions printing large fragments of HTML
  
  sub git_difftree_body {
-       my ($difftree, $parent) = @_;
+       my ($difftree, $hash, $parent) = @_;
  
         print "<div class=\"list_head\">\n";
         if ($#{$difftree} > 10) {
  
         print "<div class=\"list_head\">\n";
         if ($#{$difftree} > 10) {
@@ -1354,7 +1873,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);
  
@@ -1386,35 +1906,45 @@ 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'},
-                                                    hash_base=>$hash, file_name=>$diff{'file'})},
-                                     "blob") .
-                             "</td>\n";
+                                     -class => "list"}, esc_html($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 "</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_html($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,
-                                                    file_name=>$diff{'file'})},\
-                                     "history") .
-                             "</td>\n";
+                                     "blob") . " | ";
+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
+                                                    file_name=>$diff{'file'})},
+                                     "blame") . " | ";
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
+                                                    file_name=>$diff{'file'})},
+                                     "history");
+                       print "</td>\n";
  
                 } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
                         my $mode_chnge = "";
  
                 } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
                         my $mode_chnge = "";
@@ -1433,31 +1963,35 @@ sub git_difftree_body {
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff{'file'}),
+                                     -class => "list"}, esc_html($diff{'file'}));
+                       print "</td>\n";
+                       print "<td>$mode_chnge</td>\n";
+                       print "<td class=\"link\">";
                         if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
                         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, 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'}));
+                               if ($action eq 'commitdiff') {
+                                       # link to patch
+                                       $patchno++;
+                                       print $cgi->a({-href => "#patch$patchno"}, "patch");
+                               } else {
+                                       print $cgi->a({-href => href(action=>"blobdiff",
+                                                                    hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                                    hash_base=>$hash, hash_parent_base=>$parent,
+                                                                    file_name=>$diff{'file'})},
+                                                     "diff");
+                               }
+                               print " | ";
                         }
                         }
-                       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, file_name=>$diff{'file'})},
-                                               "diff");
-                       }
-                       print " | " .
-                               $cgi->a({-href => href(action=>"history",
-                                                      hash_base=>$hash, file_name=>$diff{'file'})},
-                                       "history");
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff{'file'})},
+                                     "blob") . " | ";
+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
+                                                    file_name=>$diff{'file'})},
+                                     "blame") . " | ";
+                       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
@@ -1477,17 +2011,30 @@ sub git_difftree_body {
                                                      hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
                                       -class => "list"}, esc_html($diff{'from_file'})) .
                               " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
                                                      hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
                                       -class => "list"}, esc_html($diff{'from_file'})) .
                               " 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");
+                             "<td class=\"link\">";
                         if ($diff{'to_id'} ne $diff{'from_id'}) {
                         if ($diff{'to_id'} ne $diff{'from_id'}) {
-                               print " | " .
-                                       $cgi->a({-href => href(action=>"blobdiff", hash_base=>$hash,
-                                                              hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
-                                                              file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
-                                               "diff");
+                               if ($action eq 'commitdiff') {
+                                       # link to patch
+                                       $patchno++;
+                                       print $cgi->a({-href => "#patch$patchno"}, "patch");
+                               } else {
+                                       print $cgi->a({-href => href(action=>"blobdiff",
+                                                                    hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                                    hash_base=>$hash, hash_parent_base=>$parent,
+                                                                    file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
+                                                     "diff");
+                               }
+                               print " | ";
                         }
                         }
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
+                                                    hash_base=>$parent, file_name=>$diff{'from_file'})},
+                                     "blob") . " | ";
+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
+                                                    file_name=>$diff{'from_file'})},
+                                     "blame") . " | ";
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
+                                                   file_name=>$diff{'from_file'})},
+                                     "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
@@ -1496,18 +2043,258 @@ sub git_difftree_body {
         print "</table>\n";
  }
  
         print "</table>\n";
  }
  
+sub git_patchset_body {
+       my ($fd, $difftree, $hash, $hash_parent) = @_;
+
+       my $patch_idx = 0;
+       my $in_header = 0;
+       my $patch_found = 0;
+       my $diffinfo;
+
+       print "<div class=\"patchset\">\n";
+
+       LINE:
+       while (my $patch_line = <$fd>) {
+               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;
+                       }
+                       print "<div class=\"patch\" id=\"patch". ($patch_idx+1) ."\">\n";
+
+                       if (ref($difftree->[$patch_idx]) eq "HASH") {
+                               $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;
+                       }
+
+                       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"
+                       }
+
+                       #print "<div class=\"diff extended_header\">\n";
+                       $in_header = 1;
+                       next LINE;
+               } # start of patch in patchset
+
+
+               if ($in_header && $patch_line =~ m/^---/) {
+                       #print "</div>\n"; # class="diff extended_header"
+                       $in_header = 0;
+
+                       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";
+
+                       $patch_line = <$fd>;
+                       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 LINE;
+               }
+               next LINE if $in_header;
+
+               print format_diff_line($patch_line);
+       }
+       print "</div>\n" if $patch_found; # class="patch"
+
+       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'} = chop_str($descr, 25, 5);
+               }
+               if (!defined $pr->{'owner'}) {
+                       $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}") || "";
+               }
+               if ($check_forks) {
+                       my $pname = $pr->{'path'};
+                       $pname =~ s/\.git$//;
+                       $pr->{'forks'} = -d "$projectroot/$pname";
+               }
+               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 $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>" . 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 => '/git-browser/by-commit.html?r='.$pr->{'path'}}, "graphiclog") . " | " .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"log")}, "log") . " | " .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"tree")}, "tree") .
+                     ($pr->{'forks'} ? " | " . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"forks")}, "forks") : '') .
+                     "</td>\n" .
+                     "</tr>\n";
+       }
+       if (defined $extra) {
+               print "<tr>\n";
+               if ($check_forks) {
+                       print "<td></td>\n";
+               }
+               print "<td colspan=\"5\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
  sub git_shortlog_body {
         # uses global variable $project
         my ($revlist, $from, $to, $refs, $extra) = @_;
  
  sub git_shortlog_body {
         # uses global variable $project
         my ($revlist, $from, $to, $refs, $extra) = @_;
  
-       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
-       my $have_snapshot = (defined $ctype && defined $suffix);
-
         $from = 0 unless defined $from;
         $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
  
         print "<table class=\"shortlog\" cellspacing=\"0\">\n";
         $from = 0 unless defined $from;
         $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
  
         print "<table class=\"shortlog\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
                 my $commit = $revlist->[$i];
                 #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
         for (my $i = $from; $i <= $to; $i++) {
                 my $commit = $revlist->[$i];
                 #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
@@ -1523,13 +2310,15 @@ sub git_shortlog_body {
                 print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                       "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
                       "<td>";
                 print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                       "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
                       "<td>";
-               print format_subject_html($co{'title'}, $co{'title_short'}, href(action=>"commit", hash=>$commit), $ref);
+               print format_subject_html($co{'title'}, $co{'title_short'},
+                                         href(action=>"commit", hash=>$commit), $ref);
                 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");
-               if ($have_snapshot) {
-                       print " | " .  $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree");
+               if (gitweb_have_snapshot()) {
+                       print " | " . $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
                 }
                 print "</td>\n" .
                       "</tr>\n";
                 }
                 print "</td>\n" .
                       "</tr>\n";
@@ -1544,12 +2333,15 @@ 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 ($revlist, $from, $to, $refs, $hash_base, $ftype, $extra) = @_;
+
+       $from = 0 unless defined $from;
+       $to = $#{$revlist} unless (defined $to && $to <= $#{$revlist});
  
         print "<table class=\"history\" cellspacing=\"0\">\n";
  
         print "<table class=\"history\" cellspacing=\"0\">\n";
-       my $alternate = 0;
-       while (my $line = <$fd>) {
-               if ($line !~ m/^([0-9a-fA-F]{40})/) {
+       my $alternate = 1;
+       for (my $i = $from; $i <= $to; $i++) {
+               if ($revlist->[$i] !~ m/^([0-9a-fA-F]{40})/) {
                         next;
                 }
  
                         next;
                 }
  
@@ -1572,12 +2364,12 @@ sub git_history_body {
                       "<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 3)) . "</i></td>\n" .
                       "<td>";
                 # originally git_history used chop_str($co{'title'}, 50)
                       "<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 3)) . "</i></td>\n" .
                       "<td>";
                 # originally git_history used chop_str($co{'title'}, 50)
-               print format_subject_html($co{'title'}, $co{'title_short'}, href(action=>"commit", hash=>$commit), $ref);
+               print format_subject_html($co{'title'}, $co{'title_short'},
+                                         href(action=>"commit", hash=>$commit), $ref);
                 print "</td>\n" .
                       "<td class=\"link\">" .
                 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);
@@ -1585,7 +2377,10 @@ sub git_history_body {
                         if (defined $blob_current && defined $blob_parent &&
                                         $blob_current ne $blob_parent) {
                                 print " | " .
                         if (defined $blob_current && defined $blob_parent &&
                                         $blob_current ne $blob_parent) {
                                 print " | " .
-                                       $cgi->a({-href => href(action=>"blobdiff", hash=>$blob_current, hash_parent=>$blob_parent, hash_base=>$commit, file_name=>$file_name)},
+                                       $cgi->a({-href => href(action=>"blobdiff",
+                                                              hash=>$blob_current, hash_parent=>$blob_parent,
+                                                              hash_base=>$hash_base, hash_parent_base=>$commit,
+                                                              file_name=>$file_name)},
                                                 "diff to current");
                         }
                 }
                                                 "diff to current");
                         }
                 }
@@ -1607,7 +2402,7 @@ 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;
@@ -1630,7 +2425,8 @@ sub git_tags_body {
                       "</td>\n" .
                       "<td>";
                 if (defined $comment) {
                       "</td>\n" .
                       "<td>";
                 if (defined $comment) {
-                       print format_subject_html($comment, $comment_short, href(action=>"tag", hash=>$tag{'id'}));
+                       print format_subject_html($comment, $comment_short,
+                                                 href(action=>"tag", hash=>$tag{'id'}));
                 }
                 print "</td>\n" .
                       "<td class=\"selflink\">";
                 }
                 print "</td>\n" .
                       "<td class=\"selflink\">";
@@ -1661,14 +2457,14 @@ 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 $entry = $headlist->[$i];
                 my %tag = %$entry;
                 my $curr = $tag{'id'} eq $head;
                 if ($alternate) {
                 my %tag = %$entry;
                 my $curr = $tag{'id'} eq $head;
                 if ($alternate) {
@@ -1684,7 +2480,8 @@ sub git_heads_body {
                       "</td>\n" .
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") . " | " .
                       "</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=>"log", hash=>$tag{'name'})}, "log") . " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$tag{'name'}, hash_base=>$tag{'name'})}, "tree") .
                       "</td>\n" .
                       "</tr>";
         }
                       "</td>\n" .
                       "</tr>";
         }
@@ -1696,77 +2493,6 @@ sub git_heads_body {
         print "</table>\n";
  }
  
         print "</table>\n";
  }
  
-## ----------------------------------------------------------------------
-## functions printing large fragments, format as one of arguments
-
-sub git_diff_print {
-       my $from = shift;
-       my $from_name = shift;
-       my $to = shift;
-       my $to_name = shift;
-       my $format = shift || "html";
-
-       my $from_tmp = "/dev/null";
-       my $to_tmp = "/dev/null";
-       my $pid = $$;
-
-       # create tmp from-file
-       if (defined $from) {
-               $from_tmp = "$git_temp/gitweb_" . $$ . "_from";
-               open my $fd2, "> $from_tmp";
-               open my $fd, "-|", $GIT, "cat-file", "blob", $from;
-               my @file = <$fd>;
-               print $fd2 @file;
-               close $fd2;
-               close $fd;
-       }
-
-       # create tmp to-file
-       if (defined $to) {
-               $to_tmp = "$git_temp/gitweb_" . $$ . "_to";
-               open my $fd2, "> $to_tmp";
-               open my $fd, "-|", $GIT, "cat-file", "blob", $to;
-               my @file = <$fd>;
-               print $fd2 @file;
-               close $fd2;
-               close $fd;
-       }
-
-       open my $fd, "-|", "/usr/bin/diff -u -p -L \'$from_name\' -L \'$to_name\' $from_tmp $to_tmp";
-       if ($format eq "plain") {
-               undef $/;
-               print <$fd>;
-               $/ = "\n";
-       } else {
-               while (my $line = <$fd>) {
-                       chomp $line;
-                       my $char = substr($line, 0, 1);
-                       my $diff_class = "";
-                       if ($char eq '+') {
-                               $diff_class = " add";
-                       } elsif ($char eq "-") {
-                               $diff_class = " rem";
-                       } elsif ($char eq "@") {
-                               $diff_class = " chunk_header";
-                       } elsif ($char eq "\\") {
-                               # skip errors
-                               next;
-                       }
-                       $line = untabify($line);
-                       print "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
-               }
-       }
-       close $fd;
-
-       if (defined $from) {
-               unlink($from_tmp);
-       }
-       if (defined $to) {
-               unlink($to_tmp);
-       }
-}
-
-
  ## ======================================================================
  ## ======================================================================
  ## actions
  ## ======================================================================
  ## ======================================================================
  ## actions
@@ -1778,30 +2504,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;
-               }
-               $ENV{'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) {
@@ -1811,70 +2516,50 @@ 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/$project");
                 }
                 }
-               $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 {
  }
  
  sub git_summary {
@@ -1885,7 +2570,23 @@ sub git_summary {
  
         my $owner = git_get_project_owner($project);
  
  
         my $owner = git_get_project_owner($project);
  
-       my $refs = git_get_references();
+       my ($reflist, $refs) = git_get_refs_list();
+
+       my @taglist;
+       my @headlist;
+       foreach my $ref (@$reflist) {
+               if ($ref->{'name'} =~ s!^heads/!!) {
+                       push @headlist, $ref;
+               } else {
+                       $ref->{'name'} =~ s!^tags/!!;
+                       push @taglist, $ref;
+               }
+       }
+       my @forklist;
+       if (gitweb_check_feature('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);
  
@@ -1906,7 +2607,16 @@ sub git_summary {
         }
         print "</table>\n";
  
         }
         print "</table>\n";
  
-       open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_get_head_hash($project)
+       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;
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
@@ -1914,20 +2624,25 @@ sub git_summary {
         git_shortlog_body(\@revlist, 0, 15, $refs,
                           $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
         git_shortlog_body(\@revlist, 0, 15, $refs,
                           $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,
                               $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,
                                $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,
+                                     $cgi->a({-href => href(action=>"forks")}, "..."),
+                                     'noheader');
+       }
+
         git_footer_html();
  }
  
         git_footer_html();
  }
  
@@ -1941,13 +2656,17 @@ sub git_tag {
               "<table cellspacing=\"0\">\n" .
               "<tr>\n" .
               "<td>object</td>\n" .
               "<table cellspacing=\"0\">\n" .
               "<tr>\n" .
               "<td>object</td>\n" .
-             "<td>" . $cgi->a({-class => "list", -href => href(action=>$tag{'type'}, hash=>$tag{'object'})}, $tag{'object'}) . "</td>\n" .
-             "<td class=\"link\">" . $cgi->a({-href => href(action=>$tag{'type'}, hash=>$tag{'object'})}, $tag{'type'}) . "</td>\n" .
+             "<td>" . $cgi->a({-class => "list", -href => href(action=>$tag{'type'}, hash=>$tag{'object'})},
+                              $tag{'object'}) . "</td>\n" .
+             "<td class=\"link\">" . $cgi->a({-href => href(action=>$tag{'type'}, hash=>$tag{'object'})},
+                                             $tag{'type'}) . "</td>\n" .
               "</tr>\n";
         if (defined($tag{'author'})) {
                 my %ad = parse_date($tag{'epoch'}, $tag{'tz'});
                 print "<tr><td>author</td><td>" . esc_html($tag{'author'}) . "</td></tr>\n";
               "</tr>\n";
         if (defined($tag{'author'})) {
                 my %ad = parse_date($tag{'epoch'}, $tag{'tz'});
                 print "<tr><td>author</td><td>" . esc_html($tag{'author'}) . "</td></tr>\n";
-               print "<tr><td></td><td>" . $ad{'rfc2822'} . sprintf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}) . "</td></tr>\n";
+               print "<tr><td></td><td>" . $ad{'rfc2822'} .
+                       sprintf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}) .
+                       "</td></tr>\n";
         }
         print "</table>\n\n" .
               "</div>\n";
         }
         print "</table>\n\n" .
               "</div>\n";
@@ -1964,7 +2683,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);
@@ -1980,12 +2700,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, "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 =
                 or die_error(undef, "Open git-blame failed");
         git_header_html();
         my $formats_nav =
-               $cgi->a({-href => href(action=>"blobl", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, "blob") .
-               " | " . $cgi->a({-href => href(action=>"blame", file_name=>$file_name)}, "head");
+               $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)},
+                       "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);
@@ -1993,39 +2720,72 @@ sub git_blame2 {
         my $num_colors = scalar(@rev_color);
         my $current_color = 0;
         my $last_rev;
         my $num_colors = scalar(@rev_color);
         my $current_color = 0;
         my $last_rev;
-       print "<div class=\"page_body\">\n";
-       print "<table class=\"blame\">\n";
-       print "<tr><th>Commit</th><th>Line</th><th>Data</th></tr>\n";
-       while (<$fd>) {
-               /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
-               my $full_rev = $1;
+       print <<HTML;
+<div class="page_body">
+<table class="blame">
+<tr><th>Commit</th><th>Line</th><th>Data</th></tr>
+HTML
+       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 = $_;
                 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=\"$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";
+               }
+               my $blamed = href(action => 'blame',
+                                 file_name => $meta->{'filename'},
+                                 hash_base => $full_rev);
+               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 "</table>\n";
         print "</div>";
                 print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                 print "</tr>\n";
         }
         print "</table>\n";
         print "</div>";
-       close $fd or print "Reading blob failed\n";
+       close $fd
+               or print "Reading blob failed\n";
         git_footer_html();
  }
  
  sub git_blame {
         my $fd;
  
         git_footer_html();
  }
  
  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);
@@ -2037,12 +2797,18 @@ sub git_blame {
                 $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
                         or die_error(undef, "Error lookup file");
         }
                 $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
                         or die_error(undef, "Error lookup file");
         }
-       open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base)
+       open ($fd, "-|", git_cmd(), "annotate", '-l', '-t', '-r', $file_name, $hash_base)
                 or die_error(undef, "Open git-annotate failed");
         git_header_html();
         my $formats_nav =
                 or die_error(undef, "Open git-annotate failed");
         git_header_html();
         my $formats_nav =
-               $cgi->a({-href => href(action=>"blobl", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, "blob") .
-               " | " . $cgi->a({-href => href(action=>"blame", file_name=>$file_name)}, "head");
+               $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)},
+                       "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);
@@ -2074,7 +2840,7 @@ HTML
                 chomp $line;
                 $line_class_num = ($line_class_num + 1) % $line_class_len;
  
                 chomp $line;
                 $line_class_num = ($line_class_num + 1) % $line_class_len;
  
-               if ($line =~ m/^([0-9a-fA-F]{40})\t\(\s*([^\t]+)\t(\d+) \+\d\d\d\d\t(\d+)\)(.*)$/) {
+               if ($line =~ m/^([0-9a-fA-F]{40})\t\(\s*([^\t]+)\t(\d+) [+-]\d\d\d\d\t(\d+)\)(.*)$/) {
                         $long_rev = $1;
                         $author   = $2;
                         $time     = $3;
                         $long_rev = $1;
                         $author   = $2;
                         $time     = $3;
@@ -2106,7 +2872,8 @@ HTML
  HTML
         } # while (my $line = <$fd>)
         print "</table>\n\n";
  HTML
         } # while (my $line = <$fd>)
         print "</table>\n\n";
-       close $fd or print "Reading blob failed.\n";
+       close $fd
+               or print "Reading blob failed.\n";
         print "</div>";
         git_footer_html();
  }
         print "</div>";
         git_footer_html();
  }
@@ -2117,8 +2884,8 @@ 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) {
+       my ($taglist) = git_get_refs_list("tags");
+       if (@$taglist) {
                 git_tags_body($taglist);
         }
         git_footer_html();
                 git_tags_body($taglist);
         }
         git_footer_html();
@@ -2130,14 +2897,16 @@ 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 ($headlist) = git_get_refs_list("heads");
+       if (@$headlist) {
+               git_heads_body($headlist, $head);
         }
         git_footer_html();
  }
  
  sub git_blob_plain {
         }
         git_footer_html();
  }
  
  sub git_blob_plain {
+       my $expires;
+
         if (!defined $hash) {
                 if (defined $file_name) {
                         my $base = $hash_base || git_get_head_hash($project);
         if (!defined $hash) {
                 if (defined $file_name) {
                         my $base = $hash_base || git_get_head_hash($project);
@@ -2146,9 +2915,13 @@ 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;
         my $type = shift;
-       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
+       open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                 or die_error(undef, "Couldn't cat $file_name, $hash");
  
         $type ||= blob_mimetype($fd, $file_name);
                 or die_error(undef, "Couldn't cat $file_name, $hash");
  
         $type ||= blob_mimetype($fd, $file_name);
@@ -2161,7 +2934,10 @@ sub git_blob_plain {
                 $save_as .= '.txt';
         }
  
                 $save_as .= '.txt';
         }
  
-       print $cgi->header(-type => "$type", '-content-disposition' => "inline; filename=\"$save_as\"");
+       print $cgi->header(
+               -type => "$type",
+               -expires=>$expires,
+               -content_disposition => 'inline; filename="' . "$save_as" . '"');
         undef $/;
         binmode STDOUT, ':raw';
         print <$fd>;
         undef $/;
         binmode STDOUT, ':raw';
         print <$fd>;
@@ -2171,6 +2947,8 @@ sub git_blob_plain {
  }
  
  sub git_blob {
  }
  
  sub git_blob {
+       my $expires;
+
         if (!defined $hash) {
                 if (defined $file_name) {
                         my $base = $hash_base || git_get_head_hash($project);
         if (!defined $hash) {
                 if (defined $file_name) {
                         my $base = $hash_base || git_get_head_hash($project);
@@ -2179,27 +2957,45 @@ 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');
-       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
+
+       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);
         if ($mimetype !~ m/^text\//) {
                 close $fd;
                 return git_blob_plain($mimetype);
         }
                 or die_error(undef, "Couldn't cat $file_name, $hash");
         my $mimetype = blob_mimetype($fd, $file_name);
         if ($mimetype !~ m/^text\//) {
                 close $fd;
                 return git_blob_plain($mimetype);
         }
-       git_header_html();
+       git_header_html(undef, $expires);
         my $formats_nav = '';
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                 if (defined $file_name) {
                         if ($have_blame) {
         my $formats_nav = '';
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                 if (defined $file_name) {
                         if ($have_blame) {
-                               $formats_nav .= $cgi->a({-href => href(action=>"blame", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, "blame") . " | ";
+                               $formats_nav .=
+                                       $cgi->a({-href => href(action=>"blame", hash_base=>$hash_base,
+                                                              hash=>$hash, file_name=>$file_name)},
+                                               "blame") .
+                                       " | ";
                         }
                         $formats_nav .=
                         }
                         $formats_nav .=
-                               $cgi->a({-href => href(action=>"blob_plain", hash=>$hash, file_name=>$file_name)}, "plain") .
-                               " | " . $cgi->a({-href => href(action=>"blob", hash_base=>"HEAD", file_name=>$file_name)}, "head");
+                               $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)},
+                                       "raw") .
+                               " | " .
+                               $cgi->a({-href => href(action=>"blob",
+                                                      hash_base=>"HEAD", file_name=>$file_name)},
+                                       "HEAD");
                 } else {
                 } else {
-                       $formats_nav .= $cgi->a({-href => href(action=>"blob_plain", hash=>$hash)}, "plain");
+                       $formats_nav .=
+                               $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);
@@ -2215,26 +3011,30 @@ sub git_blob {
                 chomp $line;
                 $nr++;
                 $line = untabify($line);
                 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);
+               printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
+                      $nr, $nr, $nr, esc_html($line);
         }
         }
-       close $fd or print "Reading blob failed.\n";
+       close $fd
+               or print "Reading blob failed.\n";
         print "</div>";
         git_footer_html();
  }
  
  sub git_tree {
         print "</div>";
         git_footer_html();
  }
  
  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";
-       open my $fd, "-|", $GIT, "ls-tree", '-z', $hash
+       open my $fd, "-|", git_cmd(), "ls-tree", '-z', $hash
                 or die_error(undef, "Open git-ls-tree failed");
         my @entries = map { chomp; $_ } <$fd>;
         close $fd or die_error(undef, "Reading tree failed");
                 or die_error(undef, "Open git-ls-tree failed");
         my @entries = map { chomp; $_ } <$fd>;
         close $fd or die_error(undef, "Reading tree failed");
@@ -2243,60 +3043,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=>$t_hash, hash_base=>$hash_base, 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" .
@@ -2305,7 +3124,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) {
@@ -2318,14 +3136,18 @@ sub git_snapshot {
  
         my $filename = basename($project) . "-$hash.tar.$suffix";
  
  
         my $filename = 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/x-tar',
+               -content_encoding => $ctype,
+               -content_disposition => 'inline; filename="' . "$filename" . '"',
+               -status => '200 OK');
  
  
-       open my $fd, "-|", "$GIT 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
@@ -2344,7 +3166,7 @@ sub git_log {
         my $refs = git_get_references();
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
         my $refs = git_get_references();
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
@@ -2373,14 +3195,17 @@ sub git_log {
                 print "<div class=\"title_text\">\n" .
                       "<div class=\"log_link\">\n" .
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") .
                 print "<div class=\"title_text\">\n" .
                       "<div class=\"log_link\">\n" .
                       $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") .
                       "<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";
         }
         git_footer_html();
                 print "</div>\n";
         }
         git_footer_html();
@@ -2398,7 +3223,8 @@ sub git_commit {
         if (!defined $parent) {
                 $parent = "--root";
         }
         if (!defined $parent) {
                 $parent = "--root";
         }
-       open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
+       open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id",
+               @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");
                 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");
@@ -2411,18 +3237,18 @@ 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 = '';
+       my @views_nav = ();
         if (defined $file_name && defined $co{'parent'}) {
         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");
+               push @views_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',
-                    $hash, $co{'tree'}, $hash,
-                    $formats_nav);
+       git_print_page_nav('commit', '',
+                          $hash, $co{'tree'}, $hash,
+                          join (' | ', @views_nav));
  
         if (defined $co{'parent'}) {
                 git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
  
         if (defined $co{'parent'}) {
                 git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
@@ -2435,23 +3261,31 @@ sub git_commit {
               "<tr>" .
               "<td></td><td> $ad{'rfc2822'}";
         if ($ad{'hour_local'} < 6) {
               "<tr>" .
               "<td></td><td> $ad{'rfc2822'}";
         if ($ad{'hour_local'} < 6) {
-               printf(" (<span class=\"atnight\">%02d:%02d</span> %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+               printf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
+                      $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
         } else {
         } else {
-               printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+               printf(" (%02d:%02d %s)",
+                      $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
         }
         print "</td>" .
               "</tr>\n";
         print "<tr><td>committer</td><td>" . esc_html($co{'committer'}) . "</td></tr>\n";
         }
         print "</td>" .
               "</tr>\n";
         print "<tr><td>committer</td><td>" . esc_html($co{'committer'}) . "</td></tr>\n";
-       print "<tr><td></td><td> $cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "</td></tr>\n";
+       print "<tr><td></td><td> $cd{'rfc2822'}" .
+             sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) .
+             "</td></tr>\n";
         print "<tr><td>commit</td><td class=\"sha1\">$co{'id'}</td></tr>\n";
         print "<tr>" .
               "<td>tree</td>" .
               "<td class=\"sha1\">" .
         print "<tr><td>commit</td><td class=\"sha1\">$co{'id'}</td></tr>\n";
         print "<tr>" .
               "<td>tree</td>" .
               "<td class=\"sha1\">" .
-             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$hash), class => "list"}, $co{'tree'}) .
+             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$hash),
+                      class => "list"}, $co{'tree'}) .
               "</td>" .
               "</td>" .
-             "<td class=\"link\">" . $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$hash)}, "tree");
+             "<td class=\"link\">" .
+             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$hash)},
+                     "tree");
         if ($have_snapshot) {
         if ($have_snapshot) {
-               print " | " .  $cgi->a({-href => href(action=>"snapshot", hash=>$hash)}, "snapshot");
+               print " | " .
+                     $cgi->a({-href => href(action=>"snapshot", hash=>$hash)}, "snapshot");
         }
         print "</td>" .
               "</tr>\n";
         }
         print "</td>" .
               "</tr>\n";
@@ -2459,10 +3293,14 @@ sub git_commit {
         foreach my $par (@$parents) {
                 print "<tr>" .
                       "<td>parent</td>" .
         foreach my $par (@$parents) {
                 print "<tr>" .
                       "<td>parent</td>" .
-                     "<td class=\"sha1\">" . $cgi->a({-href => href(action=>"commit", hash=>$par), class => "list"}, $par) . "</td>" .
+                     "<td class=\"sha1\">" .
+                     $cgi->a({-href => href(action=>"commit", hash=>$par),
+                              class => "list"}, $par) .
+                     "</td>" .
                       "<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";
         }
@@ -2473,44 +3311,181 @@ sub git_commit {
         git_print_log($co{'comment'});
         print "</div>\n";
  
         git_print_log($co{'comment'});
         print "</div>\n";
  
-       git_difftree_body(\@difftree, $parent);
+       git_difftree_body(\@difftree, $hash, $parent);
  
         git_footer_html();
  }
  
  sub git_blobdiff {
  
         git_footer_html();
  }
  
  sub git_blobdiff {
-       mkdir($git_temp, 0700);
-       git_header_html();
-       if (defined $hash_base && (my %co = parse_commit($hash_base))) {
+       my $format = shift || 'html';
+
+       my $fd;
+       my @difftree;
+       my %diffinfo;
+       my $expires;
+
+       # preparing $fd and %diffinfo for git_patchset_body
+       # new style URI
+       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,
+                               "--", $file_name
+                               or die_error(undef, "Open git-diff-tree failed");
+                       @difftree = map { chomp; $_ } <$fd>;
+                       close $fd
+                               or die_error(undef, "Reading git-diff-tree failed");
+                       @difftree
+                               or die_error('404 Not Found', "Blob diff not found");
+
+               } 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
+                               or die_error(undef, "Open git-diff-tree failed");
+                       @difftree =
+                               # ':100644 100644 03b21826... 3b93d5e7... M     ls-files.c'
+                               # $hash == to_id
+                               grep { /^:[0-7]{6} [0-7]{6} [0-9a-fA-F]{40} $hash/ }
+                               map { chomp; $_ } <$fd>;
+                       close $fd
+                               or die_error(undef, "Reading git-diff-tree failed");
+                       @difftree
+                               or die_error('404 Not Found', "Blob diff not found");
+
+               } else {
+                       die_error('404 Not Found', "Missing one of the blob diff parameters");
+               }
+
+               if (@difftree > 1) {
+                       die_error('404 Not Found', "Ambiguous blob diff specification");
+               }
+
+               %diffinfo = parse_difftree_raw_line($difftree[0]);
+               $file_parent ||= $diffinfo{'from_file'} || $file_name || $diffinfo{'file'};
+               $file_name   ||= $diffinfo{'to_file'}   || $diffinfo{'file'};
+
+               $hash_parent ||= $diffinfo{'from_id'};
+               $hash        ||= $diffinfo{'to_id'};
+
+               # non-textual hash id's can be cached
+               if ($hash_base =~ m/^[0-9a-fA-F]{40}$/ &&
+                   $hash_parent_base =~ m/^[0-9a-fA-F]{40}$/) {
+                       $expires = '+1d';
+               }
+
+               # open patch output
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       '-p', $hash_parent_base, $hash_base,
+                       "--", $file_name
+                       or die_error(undef, "Open git-diff-tree failed");
+       }
+
+       # old/legacy style URI
+       if (!%diffinfo && # if new style URI failed
+           defined $hash && defined $hash_parent) {
+               # fake git-diff-tree raw output
+               $diffinfo{'from_mode'} = $diffinfo{'to_mode'} = "blob";
+               $diffinfo{'from_id'} = $hash_parent;
+               $diffinfo{'to_id'}   = $hash;
+               if (defined $file_name) {
+                       if (defined $file_parent) {
+                               $diffinfo{'status'} = '2';
+                               $diffinfo{'from_file'} = $file_parent;
+                               $diffinfo{'to_file'}   = $file_name;
+                       } else { # assume not renamed
+                               $diffinfo{'status'} = '1';
+                               $diffinfo{'from_file'} = $file_name;
+                               $diffinfo{'to_file'}   = $file_name;
+                       }
+               } else { # no filename given
+                       $diffinfo{'status'} = '2';
+                       $diffinfo{'from_file'} = $hash_parent;
+                       $diffinfo{'to_file'}   = $hash;
+               }
+
+               # non-textual hash id's can be cached
+               if ($hash =~ m/^[0-9a-fA-F]{40}$/ &&
+                   $hash_parent =~ m/^[0-9a-fA-F]{40}$/) {
+                       $expires = '+1d';
+               }
+
+               # open patch output
+               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")
+                       unless %diffinfo;
+       }
+
+       # header
+       if ($format eq 'html') {
                 my $formats_nav =
                 my $formats_nav =
-                       $cgi->a({-href => href(action=>"blobdiff_plain", hash=>$hash, hash_parent=>$hash_parent)}, "plain");
-               git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-               git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
+                       $cgi->a({-href => href(action=>"blobdiff_plain",
+                                              hash=>$hash, hash_parent=>$hash_parent,
+                                              hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
+                                              file_name=>$file_name, file_parent=>$file_parent)},
+                               "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_print_header_div('commit', esc_html($co{'title'}), $hash_base);
+               } else {
+                       print "<div class=\"page_nav\"><br/>$formats_nav<br/></div>\n";
+                       print "<div class=\"title\">$hash vs $hash_parent</div>\n";
+               }
+               if (defined $file_name) {
+                       git_print_page_path($file_name, "blob", $hash_base);
+               } else {
+                       print "<div class=\"page_path\"></div>\n";
+               }
+
+       } elsif ($format eq 'plain') {
+               print $cgi->header(
+                       -type => 'text/plain',
+                       -charset => 'utf-8',
+                       -expires => $expires,
+                       -content_disposition => 'inline; filename="' . "$file_name" . '.patch"');
+
+               print "X-Git-Url: " . $cgi->self_url() . "\n\n";
+
         } else {
         } else {
-               print "<div class=\"page_nav\">\n" .
-                     "<br/><br/></div>\n" .
-                     "<div class=\"title\">$hash vs $hash_parent</div>\n";
+               die_error(undef, "Unknown blobdiff format");
+       }
+
+       # patch
+       if ($format eq 'html') {
+               print "<div class=\"page_body\">\n";
+
+               git_patchset_body($fd, [ \%diffinfo ], $hash_base, $hash_parent_base);
+               close $fd;
+
+               print "</div>\n"; # class="page_body"
+               git_footer_html();
+
+       } else {
+               while (my $line = <$fd>) {
+                       $line =~ s!a/($hash|$hash_parent)!'a/'.esc_html($diffinfo{'from_file'})!eg;
+                       $line =~ s!b/($hash|$hash_parent)!'b/'.esc_html($diffinfo{'to_file'})!eg;
+
+                       print $line;
+
+                       last if $line =~ m!^\+\+\+!;
+               }
+               local $/ = undef;
+               print <$fd>;
+               close $fd;
         }
         }
-       git_print_page_path($file_name, "blob", $hash_base);
-       print "<div class=\"page_body\">\n" .
-             "<div class=\"diff_info\">blob:" .
-             $cgi->a({-href => href(action=>"blob", hash=>$hash_parent, hash_base=>$hash_base, file_name=>($file_parent || $file_name))}, $hash_parent) .
-             " -> blob:" .
-             $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, $hash) .
-             "</div>\n";
-       git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash);
-       print "</div>";
-       git_footer_html();
  }
  
  sub git_blobdiff_plain {
  }
  
  sub git_blobdiff_plain {
-       mkdir($git_temp, 0700);
-       print $cgi->header(-type => "text/plain", -charset => 'utf-8');
-       git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash, "plain");
+       git_blobdiff('plain');
  }
  
  sub git_commitdiff {
  }
  
  sub git_commitdiff {
-       mkdir($git_temp, 0700);
+       my $format = shift || 'html';
         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");
@@ -2518,156 +3493,172 @@ sub git_commitdiff {
         if (!defined $hash_parent) {
                 $hash_parent = $co{'parent'} || '--root';
         }
         if (!defined $hash_parent) {
                 $hash_parent = $co{'parent'} || '--root';
         }
-       open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_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");
+
+       # read commitdiff
+       my $fd;
+       my @difftree;
+       if ($format eq 'html') {
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       "--no-commit-id",
+                       "--patch-with-raw", "--full-index", $hash_parent, $hash
+                       or die_error(undef, "Open git-diff-tree failed");
+
+               while (chomp(my $line = <$fd>)) {
+                       # empty line ends raw part of diff-tree output
+                       last unless $line;
+                       push @difftree, $line;
+               }
+
+       } elsif ($format eq 'plain') {
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       '-p', $hash_parent, $hash
+                       or die_error(undef, "Open git-diff-tree failed");
+
+       } else {
+               die_error(undef, "Unknown commitdiff format");
+       }
  
         # non-textual hash id's can be cached
         my $expires;
         if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
                 $expires = "+1d";
         }
  
         # non-textual hash id's can be cached
         my $expires;
         if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
                 $expires = "+1d";
         }
-       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);
-       print "<div class=\"page_body\">\n";
-       git_print_simplified_log($co{'comment'}, 1); # skip title
-       print "<br/>\n";
-       foreach my $line (@difftree) {
-               # ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M      ls-files.c'
-               # ':100644 100644 7f9281985086971d3877aca27704f2aaf9c448ce bc190ebc71bbd923f2b728e505408f5e54bd073a M      rev-tree.c'
-               if ($line !~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) {
-                       next;
-               }
-               my $from_mode = $1;
-               my $to_mode = $2;
-               my $from_id = $3;
-               my $to_id = $4;
-               my $status = $5;
-               my $file = validate_input(unquote($6));
-               if ($status eq "A") {
-                       print "<div class=\"diff_info\">" . file_type($to_mode) . ":" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$to_id, hash_base=>$hash, file_name=>$file)}, $to_id) . "(new)" .
-                             "</div>\n";
-                       git_diff_print(undef, "/dev/null", $to_id, "b/$file");
-               } elsif ($status eq "D") {
-                       print "<div class=\"diff_info\">" . file_type($from_mode) . ":" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$from_id, hash_base=>$hash_parent, file_name=>$file)}, $from_id) . "(deleted)" .
-                             "</div>\n";
-                       git_diff_print($from_id, "a/$file", undef, "/dev/null");
-               } elsif ($status eq "M") {
-                       if ($from_id ne $to_id) {
-                               print "<div class=\"diff_info\">" .
-                                     file_type($from_mode) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash=>$from_id, hash_base=>$hash_parent, file_name=>$file)}, $from_id) .
-                                     " -> " .
-                                     file_type($to_mode) . ":" .
-                                     $cgi->a({-href => href(action=>"blob", hash=>$to_id, hash_base=>$hash, file_name=>$file)}, $to_id);
-                               print "</div>\n";
-                               git_diff_print($from_id, "a/$file",  $to_id, "b/$file");
-                       }
-               }
-       }
-       print "<br/>\n" .
-             "</div>";
-       git_footer_html();
-}
  
  
-sub git_commitdiff_plain {
-       mkdir($git_temp, 0700);
-       my %co = parse_commit($hash);
-       if (!%co) {
-               die_error(undef, "Unknown commit object");
-       }
-       if (!defined $hash_parent) {
-               $hash_parent = $co{'parent'} || '--root';
-       }
-       open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
-               or die_error(undef, "Open git-diff-tree failed");
-       my @difftree = map { chomp; $_ } <$fd>;
-       close $fd or die_error(undef, "Reading diff-tree failed");
-
-       # try to figure out the next tag after this commit
-       my $tagname;
-       my $refs = git_get_references("tags");
-       open $fd, "-|", $GIT, "rev-list", "HEAD";
-       my @commits = map { chomp; $_ } <$fd>;
-       close $fd;
-       foreach my $commit (@commits) {
-               if (defined $refs->{$commit}) {
-                       $tagname = $refs->{$commit}
-               }
-               if ($commit eq $hash) {
-                       last;
-               }
-       }
+       # write commit message
+       if ($format eq 'html') {
+               my $refs = git_get_references();
+               my $ref = format_ref_marker($refs, $co{'id'});
+               my $formats_nav =
+                       $cgi->a({-href => href(action=>"commitdiff_plain",
+                                              hash=>$hash, hash_parent=>$hash_parent)},
+                               "raw");
+
+               git_header_html(undef, $expires);
+               git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
+               git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
+               git_print_authorship(\%co);
+               print "<div class=\"page_body\">\n";
+               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");
+               my $tagname = git_get_rev_name_tags($hash);
+               my $filename = basename($project) . "-$hash.patch";
+
+               print $cgi->header(
+                       -type => 'text/plain',
+                       -charset => 'utf-8',
+                       -expires => $expires,
+                       -content_disposition => 'inline; filename="' . "$filename" . '"');
+               my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
+               print <<TEXT;
+From: $co{'author'}
+Date: $ad{'rfc2822'} ($ad{'tz_local'})
+Subject: $co{'title'}
+TEXT
+               print "X-Git-Tag: $tagname\n" if $tagname;
+               print "X-Git-Url: " . $cgi->self_url() . "\n\n";
+
+               foreach my $line (@{$co{'comment'}}) {
+                       print "$line\n";
+               }
+               print "---\n\n";
+       }
+
+       # write patch
+       if ($format eq 'html') {
+               git_difftree_body(\@difftree, $hash, $hash_parent);
+               print "<br/>\n";
  
  
-       print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"git-$hash.patch\"");
-       my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
-       my $comment = $co{'comment'};
-       print "From: $co{'author'}\n" .
-             "Date: $ad{'rfc2822'} ($ad{'tz_local'})\n".
-             "Subject: $co{'title'}\n";
-       if (defined $tagname) {
-               print "X-Git-Tag: $tagname\n";
-       }
-       print "X-Git-Url: $my_url?p=$project;a=commitdiff;h=$hash\n" .
-             "\n";
+               git_patchset_body($fd, \@difftree, $hash, $hash_parent);
+               close $fd;
+               print "</div>\n"; # class="page_body"
+               git_footer_html();
  
  
-       foreach my $line (@$comment) {;
-               print "$line\n";
+       } elsif ($format eq 'plain') {
+               local $/ = undef;
+               print <$fd>;
+               close $fd
+                       or print "Reading git-diff-tree failed\n";
         }
         }
-       print "---\n\n";
+}
  
  
-       foreach my $line (@difftree) {
-               if ($line !~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) {
-                       next;
-               }
-               my $from_id = $3;
-               my $to_id = $4;
-               my $status = $5;
-               my $file = $6;
-               if ($status eq "A") {
-                       git_diff_print(undef, "/dev/null", $to_id, "b/$file", "plain");
-               } elsif ($status eq "D") {
-                       git_diff_print($from_id, "a/$file", undef, "/dev/null", "plain");
-               } elsif ($status eq "M") {
-                       git_diff_print($from_id, "a/$file",  $to_id, "b/$file", "plain");
-               }
-       }
+sub git_commitdiff_plain {
+       git_commitdiff('plain');
  }
  
  sub git_history {
         if (!defined $hash_base) {
                 $hash_base = git_get_head_hash($project);
         }
  }
  
  sub git_history {
         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, "-|",
  
         open my $fd, "-|",
-               $GIT, "rev-list", "--full-history", $hash_base, "--", $file_name;
-       git_history_body($fd, $refs, $hash_base, $ftype);
+               git_cmd(), "rev-list", $limit, "--full-history", $hash_base, "--", $file_name
+                       or die_error(undef, "Open git-rev-list-failed");
+       my @revlist = map { chomp; $_ } <$fd>;
+       close $fd
+               or die_error(undef, "Reading git-rev-list failed");
+
+       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 ($#revlist >= (100 * ($page+1)-1)) {
+               $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 ($#revlist >= (100 * ($page+1)-1)) {
+               $next_link =
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name, page=>$page+1),
+                                -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(\@revlist, ($page * 100), $#revlist,
+                        $refs, $hash_base, $ftype, $next_link);
  
  
-       close $fd;
         git_footer_html();
  }
  
         git_footer_html();
  }
  
@@ -2682,37 +3673,34 @@ 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;
+
+       $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_print_page_nav('','', $hash,$co{'tree'},$hash);
         git_print_header_div('commit', esc_html($co{'title'}), $hash);
  
         print "<table cellspacing=\"0\">\n";
         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) {
+       my $alternate = 1;
+       if ($searchtype eq 'commit' or $searchtype eq 'author' or $searchtype eq 'committer') {
                 $/ = "\0";
                 $/ = "\0";
-               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash or next;
+               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;
                         }
                 while (my $commit_text = <$fd>) {
                         if (!grep m/$searchtext/i, $commit_text) {
                                 next;
                         }
-                       if ($author_search && !grep m/\nauthor .*$searchtext/i, $commit_text) {
+                       if ($searchtype eq 'author' && !grep m/\nauthor .*$searchtext/i, $commit_text) {
                                 next;
                         }
                                 next;
                         }
-                       if ($committer_search && !grep m/\ncommitter .*$searchtext/i, $commit_text) {
+                       if ($searchtype eq 'committer' && !grep m/\ncommitter .*$searchtext/i, $commit_text) {
                                 next;
                         }
                         my @commit_lines = split "\n", $commit_text;
                                 next;
                         }
                         my @commit_lines = split "\n", $commit_text;
@@ -2746,16 +3734,19 @@ sub git_search {
                         print "</td>\n" .
                               "<td class=\"link\">" .
                               $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
                         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");
+                             " | " .
+                             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
                         print "</td>\n" .
                               "</tr>\n";
                 }
                 close $fd;
         }
  
                         print "</td>\n" .
                               "</tr>\n";
                 }
                 close $fd;
         }
  
-       if ($pickaxe_search) {
+       if ($searchtype eq 'pickaxe') {
                 $/ = "\n";
                 $/ = "\n";
-               open my $fd, "-|", "$GIT rev-list $hash | $GIT diff-tree -r --stdin -S\'$searchtext\'";
+               my $git_command = git_cmd_str();
+               open my $fd, "-|", "$git_command rev-list $hash | " .
+                       "$git_command diff-tree -r --stdin -S\'$searchtext\'";
                 undef %co;
                 my @files;
                 while (my $line = <$fd>) {
                 undef %co;
                 my @files;
                 while (my $line = <$fd>) {
@@ -2783,18 +3774,22 @@ sub git_search {
                                         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>" .
                                         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"},
+                                             $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}),
+                                                     -class => "list subject"},
                                                       esc_html(chop_str($co{'title'}, 50)) . "<br/>");
                                         while (my $setref = shift @files) {
                                                 my %set = %$setref;
                                                       esc_html(chop_str($co{'title'}, 50)) . "<br/>");
                                         while (my $setref = shift @files) {
                                                 my %set = %$setref;
-                                               print $cgi->a({-href => href(action=>"blob", hash=>$set{'id'}, hash_base=>$co{'id'}, file_name=>$set{'file'}), class => "list"},
-                                                     "<span class=\"match\">" . esc_html($set{'file'}) . "</span>") .
+                                               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>") .
                                                       "<br/>\n";
                                         }
                                         print "</td>\n" .
                                               "<td class=\"link\">" .
                                               $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
                                                       "<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");
+                                             " | " .
+                                             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
                                         print "</td>\n" .
                                               "</tr>\n";
                                 }
                                         print "</td>\n" .
                                               "</tr>\n";
                                 }
@@ -2807,6 +3802,31 @@ sub git_search {
         git_footer_html();
  }
  
         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();
+}
+
  sub git_shortlog {
         my $head = git_get_head_hash($project);
         if (!defined $hash) {
  sub git_shortlog {
         my $head = git_get_head_hash($project);
         if (!defined $hash) {
@@ -2818,7 +3838,7 @@ sub git_shortlog {
         my $refs = git_get_references();
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
         my $refs = git_get_references();
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
                 or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
@@ -2846,18 +3866,20 @@ sub git_shortlog {
  
  sub git_rss {
         # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
  
  sub git_rss {
         # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
-       open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_get_head_hash($project)
+       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');
                 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 version=\"1.0\" encoding=\"utf-8\"?>\n".
-             "<rss version=\"2.0\" xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">\n";
-       print "<channel>\n";
-       print "<title>$project</title>\n".
-             "<link>" . esc_html("$my_url?p=$project;a=summary") . "</link>\n".
-             "<description>$project log</description>\n".
-             "<language>en</language>\n";
+       print <<XML;
+<?xml version="1.0" encoding="utf-8"?>
+<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
  
         for (my $i = 0; $i <= $#revlist; $i++) {
                 my $commit = $revlist[$i];
  
         for (my $i = 0; $i <= $#revlist; $i++) {
                 my $commit = $revlist[$i];
@@ -2867,9 +3889,12 @@ sub git_rss {
                         last;
                 }
                 my %cd = parse_date($co{'committer_epoch'});
                         last;
                 }
                 my %cd = parse_date($co{'committer_epoch'});
-               open $fd, "-|", $GIT, "diff-tree", '-r', $co{'parent'}, $co{'id'} or next;
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       $co{'parent'}, $co{'id'}
+                       or next;
                 my @difftree = map { chomp; $_ } <$fd>;
                 my @difftree = map { chomp; $_ } <$fd>;
-               close $fd or next;
+               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'}) .
                 print "<item>\n" .
                       "<title>" .
                       sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . esc_html($co{'title'}) .
@@ -2883,7 +3908,7 @@ sub git_rss {
                       "<![CDATA[\n";
                 my $comment = $co{'comment'};
                 foreach my $line (@$comment) {
                       "<![CDATA[\n";
                 my $comment = $co{'comment'};
                 foreach my $line (@$comment) {
-                       $line = decode("utf8", $line, Encode::FB_DEFAULT);
+                       $line = to_utf8($line);
                         print "$line<br/>\n";
                 }
                 print "<br/>\n";
                         print "$line<br/>\n";
                 }
                 print "<br/>\n";
@@ -2891,8 +3916,8 @@ sub git_rss {
                         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;
                         }
                         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;
                         }
-                       my $file = validate_input(unquote($7));
-                       $file = decode("utf8", $file, Encode::FB_DEFAULT);
+                       my $file = esc_html(unquote($7));
+                       $file = to_utf8($file);
                         print "$file<br/>\n";
                 }
                 print "]]>\n" .
                         print "$file<br/>\n";
                 }
                 print "]]>\n" .
@@ -2906,13 +3931,15 @@ sub git_opml {
         my @list = git_get_projects_list();
  
         print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
         my @list = git_get_projects_list();
  
         print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
-       print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
-             "<opml version=\"1.0\">\n".
-             "<head>".
-             "  <title>$site_name Git OPML Export</title>\n".
-             "</head>\n".
-             "<body>\n".
-             "<outline text=\"git RSS feeds\">\n";
+       print <<XML;
+<?xml version="1.0" encoding="utf-8"?>
+<opml version="1.0">
+<head>
+  <title>$site_name OPML Export</title>
+</head>
+<body>
+<outline text="git RSS feeds">
+XML
  
         foreach my $pr (@list) {
                 my %proj = %$pr;
  
         foreach my $pr (@list) {
                 my %proj = %$pr;
@@ -2920,7 +3947,7 @@ sub git_opml {
                 if (!defined $head) {
                         next;
                 }
                 if (!defined $head) {
                         next;
                 }
-               $ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
+               $git_dir = "$projectroot/$proj{'path'}";
                 my %co = parse_commit($head);
                 if (!%co) {
                         next;
                 my %co = parse_commit($head);
                 if (!%co) {
                         next;
@@ -2931,7 +3958,9 @@ sub git_opml {
                 my $html = "$my_url?p=$proj{'path'};a=summary";
                 print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
         }
                 my $html = "$my_url?p=$proj{'path'};a=summary";
                 print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
         }
-       print "</outline>\n".
-             "</body>\n".
-             "</opml>\n";
+       print <<XML;
+</outline>
+</body>
+</opml>
+XML
  }
  }