gitweb: Add local time and timezone to git_print_authorship

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

index 8a979d5959d94f8e67a00dbf1558d126d273b11e441487de0e3f96d7d9a6e4eb..2701317afbed067c82cc1237046d6dfe429da68b51b420fc94d3f3fdde15e9be 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -15,48 +15,46 @@ use CGI::Carp qw(fatalsToBrowser);
  use Encode;
  use Fcntl ':mode';
  use File::Find qw();
  use Encode;
  use Fcntl ':mode';
  use File::Find qw();
+use File::Basename qw(basename);
  binmode STDOUT, ':utf8';
  
  our $cgi = new CGI;
  binmode STDOUT, ':utf8';
  
  our $cgi = new CGI;
-our $version = "@@GIT_VERSION@@";
+our $version = "++GIT_VERSION++";
  our $my_url = $cgi->url();
  our $my_uri = $cgi->url(-absolute => 1);
  our $my_url = $cgi->url();
  our $my_uri = $cgi->url(-absolute => 1);
-our $rss_link = "";
  
  # core git executable to use
  # this can just be "git" if your webserver has a sensible PATH
  
  # core git executable to use
  # this can just be "git" if your webserver has a sensible PATH
-our $GIT = "@@GIT_BINDIR@@/git";
+our $GIT = "++GIT_BINDIR++/git";
  
  # absolute fs-path which will be prepended to the project path
  #our $projectroot = "/pub/scm";
  
  # absolute fs-path which will be prepended to the project path
  #our $projectroot = "/pub/scm";
-our $projectroot = "@@GITWEB_PROJECTROOT@@";
-
-# version of the core git binary
-our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
-
-# location for temporary files needed for diffs
-our $git_temp = "/tmp/gitweb";
-if (! -d $git_temp) {
-       mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp");
-}
+our $projectroot = "++GITWEB_PROJECTROOT++";
  
  # target of the home link on top of all pages
  
  # target of the home link on top of all pages
-our $home_link = $my_uri;
+our $home_link = $my_uri || "/";
+
+# string of the home link on top of all pages
+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";
  
  # html text to include at home page
  
  # html text to include at home page
-our $home_text = "@@GITWEB_HOMETEXT@@";
+our $home_text = "++GITWEB_HOMETEXT++";
  
  # URI of default stylesheet
  
  # URI of default stylesheet
-our $stylesheet = "@@GITWEB_CSS@@";
+our $stylesheet = "++GITWEB_CSS++";
  # URI of GIT logo
  # URI of GIT logo
-our $logo = "@@GITWEB_LOGO@@";
+our $logo = "++GITWEB_LOGO++";
  
  # source of projects list
  
  # source of projects list
-our $projects_list = "@@GITWEB_LIST@@" || "$projectroot";
+our $projects_list = "++GITWEB_LIST++";
+
+# 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++");
  
  # default blob_plain mimetype and default charset for text/plain blob
  our $default_blob_plain_mimetype = 'text/plain';
  
  # default blob_plain mimetype and default charset for text/plain blob
  our $default_blob_plain_mimetype = 'text/plain';
@@ -66,87 +64,185 @@ our $default_text_plain_charset  = undef;
  # (relative to the current git repository)
  our $mimetypes_file = undef;
  
  # (relative to the current git repository)
  our $mimetypes_file = undef;
  
+# You define site-wide feature defaults here; override them with
+# $GITWEB_CONFIG as necessary.
+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
+
+       'blame' => {
+               'sub' => \&feature_blame,
+               'override' => 0,
+               'default' => [0]},
+
+       'snapshot' => {
+               'sub' => \&feature_snapshot,
+               'override' => 0,
+               #         => [content-encoding, suffix, program]
+               'default' => ['x-gzip', 'gz', 'gzip']},
+);
+
+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'}});
+       if (!$override) { return @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');
+
+       if ($val eq 'true') {
+               return 1;
+       } elsif ($val eq 'false') {
+               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) = @_;
+
+       my ($val) = git_get_project_config('snapshot');
+
+       if ($val eq 'gzip') {
+               return ('x-gzip', 'gz', 'gzip');
+       } elsif ($val eq 'bzip2') {
+               return ('x-bzip2', 'bz2', 'bzip2');
+       } elsif ($val eq 'none') {
+               return ();
+       }
+
+       return ($ctype, $suffix, $command);
+}
+
+# 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++";
+require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
+
+# version of the core git binary
+our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
+
+# path to the current git repository
+our $git_dir;
+
+$projects_list ||= $projectroot;
+
+# ======================================================================
  # input validation and dispatch
  our $action = $cgi->param('a');
  if (defined $action) {
         if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
  # input validation and dispatch
  our $action = $cgi->param('a');
  if (defined $action) {
         if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
-               undef $action;
-               die_error(undef, "Invalid action parameter.");
-       }
-       if ($action eq "opml") {
-               git_opml();
-               exit;
+               die_error(undef, "Invalid action parameter");
         }
  }
  
  our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
  if (defined $project) {
         }
  }
  
  our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
  if (defined $project) {
-       $project =~ s|^/||; $project =~ s|/$||;
-       $project = validate_input($project);
-       if (!defined($project)) {
-               die_error(undef, "Invalid project parameter.");
+       $project =~ s|^/||;
+       $project =~ s|/$||;
+       $project = undef unless $project;
+}
+if (defined $project) {
+       if (!validate_input($project)) {
+               die_error(undef, "Invalid project parameter");
         }
         if (!(-d "$projectroot/$project")) {
         }
         if (!(-d "$projectroot/$project")) {
-               undef $project;
-               die_error(undef, "No such directory.");
+               die_error(undef, "No such directory");
         }
         if (!(-e "$projectroot/$project/HEAD")) {
         }
         if (!(-e "$projectroot/$project/HEAD")) {
-               undef $project;
-               die_error(undef, "No such project.");
+               die_error(undef, "No such project");
         }
         }
-       $rss_link = "<link rel=\"alternate\" title=\"" . esc_param($project) . " log\" href=\"" .
-                   "$my_uri?" . esc_param("p=$project;a=rss") . "\" type=\"application/rss+xml\"/>";
-       $ENV{'GIT_DIR'} = "$projectroot/$project";
-} else {
-       git_project_list();
-       exit;
+       $git_dir = "$projectroot/$project";
  }
  
  our $file_name = $cgi->param('f');
  if (defined $file_name) {
  }
  
  our $file_name = $cgi->param('f');
  if (defined $file_name) {
-       $file_name = validate_input($file_name);
-       if (!defined($file_name)) {
-               die_error(undef, "Invalid file parameter.");
+       if (!validate_input($file_name)) {
+               die_error(undef, "Invalid file parameter");
+       }
+}
+
+our $file_parent = $cgi->param('fp');
+if (defined $file_parent) {
+       if (!validate_input($file_parent)) {
+               die_error(undef, "Invalid file parent parameter");
         }
  }
  
  our $hash = $cgi->param('h');
  if (defined $hash) {
         }
  }
  
  our $hash = $cgi->param('h');
  if (defined $hash) {
-       $hash = validate_input($hash);
-       if (!defined($hash)) {
-               die_error(undef, "Invalid hash parameter.");
+       if (!validate_input($hash)) {
+               die_error(undef, "Invalid hash parameter");
         }
  }
  
  our $hash_parent = $cgi->param('hp');
  if (defined $hash_parent) {
         }
  }
  
  our $hash_parent = $cgi->param('hp');
  if (defined $hash_parent) {
-       $hash_parent = validate_input($hash_parent);
-       if (!defined($hash_parent)) {
-               die_error(undef, "Invalid hash parent parameter.");
+       if (!validate_input($hash_parent)) {
+               die_error(undef, "Invalid hash parent parameter");
         }
  }
  
  our $hash_base = $cgi->param('hb');
  if (defined $hash_base) {
         }
  }
  
  our $hash_base = $cgi->param('hb');
  if (defined $hash_base) {
-       $hash_base = validate_input($hash_base);
-       if (!defined($hash_base)) {
-               die_error(undef, "Invalid hash base parameter.");
+       if (!validate_input($hash_base)) {
+               die_error(undef, "Invalid hash base parameter");
+       }
+}
+
+our $hash_parent_base = $cgi->param('hpb');
+if (defined $hash_parent_base) {
+       if (!validate_input($hash_parent_base)) {
+               die_error(undef, "Invalid hash parent base parameter");
         }
  }
  
  our $page = $cgi->param('pg');
  if (defined $page) {
         if ($page =~ m/[^0-9]$/) {
         }
  }
  
  our $page = $cgi->param('pg');
  if (defined $page) {
         if ($page =~ m/[^0-9]$/) {
-               undef $page;
-               die_error(undef, "Invalid page parameter.");
+               die_error(undef, "Invalid page parameter");
         }
  }
  
  our $searchtext = $cgi->param('s');
  if (defined $searchtext) {
         if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
         }
  }
  
  our $searchtext = $cgi->param('s');
  if (defined $searchtext) {
         if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
-               undef $searchtext;
-               die_error(undef, "Invalid search parameter.");
+               die_error(undef, "Invalid search parameter");
         }
         $searchtext = quotemeta $searchtext;
  }
         }
         $searchtext = quotemeta $searchtext;
  }
@@ -171,16 +267,56 @@ my %actions = (
         "tag" => \&git_tag,
         "tags" => \&git_tags,
         "tree" => \&git_tree,
         "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,
  );
  
  );
  
-$action = 'summary' if (!defined($action));
+if (defined $project) {
+       $action ||= 'summary';
+} else {
+       $action ||= 'project_list';
+}
  if (!defined($actions{$action})) {
  if (!defined($actions{$action})) {
-       undef $action;
-       die_error(undef, "Unknown action.");
+       die_error(undef, "Unknown action");
  }
  $actions{$action}->();
  exit;
  
  }
  $actions{$action}->();
  exit;
  
+## ======================================================================
+## action links
+
+sub href(%) {
+       my %params = @_;
+
+       my @mapping = (
+               project => "p",
+               action => "a",
+               file_name => "f",
+               file_parent => "fp",
+               hash => "h",
+               hash_parent => "hp",
+               hash_base => "hb",
+               hash_parent_base => "hpb",
+               page => "pg",
+               searchtext => "s",
+       );
+       my %mapping = @mapping;
+
+       $params{"project"} ||= $project;
+
+       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});
+               }
+       }
+       return "$my_uri?" . join(';', @result);
+}
+
+
  ## ======================================================================
  ## validation, quoting/unquoting and escaping
  
  ## ======================================================================
  ## validation, quoting/unquoting and escaping
  
@@ -228,6 +364,20 @@ sub unquote {
         return $str;
  }
  
         return $str;
  }
  
+# escape tabs (convert tabs to spaces)
+sub untabify {
+       my $line = shift;
+
+       while ((my $pos = index($line, "\t")) != -1) {
+               if (my $count = (8 - ($pos % 8))) {
+                       my $spaces = ' ' x $count;
+                       $line =~ s/\t/$spaces/;
+               }
+       }
+
+       return $line;
+}
+
  ## ----------------------------------------------------------------------
  ## HTML aware string manipulation
  
  ## ----------------------------------------------------------------------
  ## HTML aware string manipulation
  
@@ -318,7 +468,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";
@@ -344,7 +500,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 => "$my_uri?" . esc_param("p=$project;a=commit;h=$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/;
                 }
         }
@@ -352,34 +510,96 @@ sub format_log_line_html {
  }
  
  # format marker of refs pointing to given object
  }
  
  # format marker of refs pointing to given object
-sub git_get_referencing {
+sub format_ref_marker {
         my ($refs, $id) = @_;
         my ($refs, $id) = @_;
+       my $markers = '';
  
         if (defined $refs->{$id}) {
  
         if (defined $refs->{$id}) {
-               return ' <span class="tag">' . esc_html($refs->{$id}) . '</span>';
+               foreach my $ref (@{$refs->{$id}}) {
+                       my ($type, $name) = qw();
+                       # e.g. tags/v2.6.11 or heads/next
+                       if ($ref =~ m!^(.*?)s?/(.*)$!) {
+                               $type = $1;
+                               $name = $2;
+                       } else {
+                               $type = "ref";
+                               $name = $ref;
+                       }
+
+                       $markers .= " <span class=\"$type\">" . esc_html($name) . "</span>";
+               }
+       }
+
+       if ($markers) {
+               return ' <span class="refs">'. $markers . '</span>';
         } else {
                 return "";
         }
  }
  
         } else {
                 return "";
         }
  }
  
+# format, perhaps shortened and with markers, title line
+sub format_subject_html {
+       my ($long, $short, $href, $extra) = @_;
+       $extra = '' unless defined($extra);
+
+       if (length($short) < length($long)) {
+               return $cgi->a({-href => $href, -class => "list subject",
+                               -title => $long},
+                      esc_html($short) . $extra);
+       } else {
+               return $cgi->a({-href => $href, -class => "list subject"},
+                      esc_html($long)  . $extra);
+       }
+}
+
+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
  # get HEAD ref of given project as hash
-sub git_read_head {
+sub git_get_head_hash {
         my $project = shift;
         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;
  }
@@ -388,7 +608,7 @@ sub git_read_head {
  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;
@@ -396,24 +616,21 @@ sub git_get_type {
  }
  
  sub git_get_project_config {
  }
  
  sub git_get_project_config {
-       my $key = shift;
+       my ($key, $type) = @_;
  
         return unless ($key);
         $key =~ s/^gitweb\.//;
         return if ($key =~ m/\W/);
  
  
         return unless ($key);
         $key =~ s/^gitweb\.//;
         return if ($key =~ m/\W/);
  
-       my $val = qx($GIT repo-config --get gitweb.$key);
+       my @x = (git_cmd(), 'repo-config');
+       if (defined $type) { push @x, $type; }
+       push @x, "--get";
+       push @x, "gitweb.$key";
+       my $val = qx(@x);
+       chomp $val;
         return ($val);
  }
  
         return ($val);
  }
  
-sub git_get_project_config_bool {
-       my $val = git_get_project_config (@_);
-       if ($val and $val =~ m/true|yes|on/) {
-               return (1);
-       }
-       return; # implicit false
-}
-
  # get hash of given path at given ref
  sub git_get_hash_by_path {
         my $base = shift;
  # get hash of given path at given ref
  sub git_get_hash_by_path {
         my $base = shift;
@@ -421,8 +638,8 @@ sub git_get_hash_by_path {
  
         my $tree = $base;
  
  
         my $tree = $base;
  
-       open my $fd, "-|", $GIT, "ls-tree", $base, "--", $path
-               or die_error(undef, "Open git-ls-tree failed.");
+       open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path
+               or die_error(undef, "Open git-ls-tree failed");
         my $line = <$fd>;
         close $fd or return undef;
  
         my $line = <$fd>;
         close $fd or return undef;
  
@@ -435,7 +652,7 @@ sub git_get_hash_by_path {
  ## git utility functions, directly accessing git repository
  
  # assumes that PATH is not symref
  ## git utility functions, directly accessing git repository
  
  # assumes that PATH is not symref
-sub git_read_hash {
+sub git_get_hash_by_ref {
         my $path = shift;
  
         open my $fd, "$projectroot/$path" or return undef;
         my $path = shift;
  
         open my $fd, "$projectroot/$path" or return undef;
@@ -447,7 +664,7 @@ sub git_read_hash {
         }
  }
  
         }
  }
  
-sub git_read_description {
+sub git_get_project_description {
         my $path = shift;
  
         open my $fd, "$projectroot/$path/description" or return undef;
         my $path = shift;
  
         open my $fd, "$projectroot/$path/description" or return undef;
@@ -457,7 +674,17 @@ sub git_read_description {
         return $descr;
  }
  
         return $descr;
  }
  
-sub git_read_projects {
+sub git_get_project_url_list {
+       my $path = shift;
+
+       open my $fd, "$projectroot/$path/cloneurl" or return undef;
+       my @git_project_url_list = map { chomp; $_ } <$fd>;
+       close $fd;
+
+       return wantarray ? @git_project_url_list : \@git_project_url_list;
+}
+
+sub git_get_projects_list {
         my @list;
  
         if (-d $projects_list) {
         my @list;
  
         if (-d $projects_list) {
@@ -501,21 +728,58 @@ sub git_read_projects {
         return @list;
  }
  
         return @list;
  }
  
-sub read_info_ref {
+sub git_get_project_owner {
+       my $project = shift;
+       my $owner;
+
+       return undef unless $project;
+
+       # read from file (url-encoded):
+       # 'git%2Fgit.git Linus+Torvalds'
+       # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
+       # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
+       if (-f $projects_list) {
+               open (my $fd , $projects_list);
+               while (my $line = <$fd>) {
+                       chomp $line;
+                       my ($pr, $ow) = split ' ', $line;
+                       $pr = unescape($pr);
+                       $ow = unescape($ow);
+                       if ($pr eq $project) {
+                               $owner = decode("utf8", $ow, Encode::FB_DEFAULT);
+                               last;
+                       }
+               }
+               close $fd;
+       }
+       if (!defined $owner) {
+               $owner = get_file_owner("$projectroot/$project");
+       }
+
+       return $owner;
+}
+
+sub git_get_references {
         my $type = shift || "";
         my %refs;
         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^{}
-       open my $fd, "$projectroot/$project/info/refs" or return;
+       if (-f "$projectroot/$project/info/refs") {
+               open $fd, "$projectroot/$project/info/refs"
+                       or return;
+       } else {
+               open $fd, "-|", git_cmd(), "ls-remote", "."
+                       or return;
+       }
+
         while (my $line = <$fd>) {
                 chomp $line;
         while (my $line = <$fd>) {
                 chomp $line;
-               # attention: for $type == "" it saves only last path part of ref name
-               # e.g. from 'refs/heads/jn/gitweb' it would leave only 'gitweb'
-               if ($line =~ m/^([0-9a-fA-F]{40})\t.*$type\/([^\^]+)/) {
+               if ($line =~ m/^([0-9a-fA-F]{40})\trefs\/($type\/?[^\^]+)/) {
                         if (defined $refs{$1}) {
                         if (defined $refs{$1}) {
-                               $refs{$1} .= " / $2";
+                               push @{$refs{$1}}, $2;
                         } else {
                         } else {
-                               $refs{$1} = $2;
+                               $refs{$1} = [ $2 ];
                         }
                 }
         }
                         }
                 }
         }
@@ -523,10 +787,26 @@ sub read_info_ref {
         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
  
-sub date_str {
+sub parse_date {
         my $epoch = shift;
         my $tz = shift || "-0000";
  
         my $epoch = shift;
         my $tz = shift || "-0000";
  
@@ -539,8 +819,10 @@ sub date_str {
         $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);
@@ -551,12 +833,12 @@ sub date_str {
         return %date;
  }
  
         return %date;
  }
  
-sub git_read_tag {
+sub parse_tag {
         my $tag_id = shift;
         my %tag;
         my @comment;
  
         my $tag_id = shift;
         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;
@@ -586,7 +868,7 @@ sub git_read_tag {
         return %tag
  }
  
         return %tag
  }
  
-sub git_read_commit {
+sub parse_commit {
         my $commit_id = shift;
         my $commit_text = shift;
  
         my $commit_id = shift;
         my $commit_text = shift;
  
@@ -597,7 +879,8 @@ sub git_read_commit {
                 @commit_lines = @$commit_text;
         } else {
                 $/ = "\0";
                 @commit_lines = @$commit_text;
         } else {
                 $/ = "\0";
-               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", "--max-count=1", $commit_id or return;
+               open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", "--max-count=1", $commit_id
+                       or return;
                 @commit_lines = split '\n', <$fd>;
                 close $fd or return;
                 $/ = "\n";
                 @commit_lines = split '\n', <$fd>;
                 close $fd or return;
                 $/ = "\n";
@@ -680,10 +963,81 @@ sub git_read_commit {
         return %co;
  }
  
         return %co;
  }
  
+# parse ref from ref_file, given by ref_id, with given type
+sub parse_ref {
+       my $ref_file = shift;
+       my $ref_id = shift;
+       my $type = shift || git_get_type($ref_id);
+       my %ref_item;
+
+       $ref_item{'type'} = $type;
+       $ref_item{'id'} = $ref_id;
+       $ref_item{'epoch'} = 0;
+       $ref_item{'age'} = "unknown";
+       if ($type eq "tag") {
+               my %tag = parse_tag($ref_id);
+               $ref_item{'comment'} = $tag{'comment'};
+               if ($tag{'type'} eq "commit") {
+                       my %co = parse_commit($tag{'object'});
+                       $ref_item{'epoch'} = $co{'committer_epoch'};
+                       $ref_item{'age'} = $co{'age_string'};
+               } elsif (defined($tag{'epoch'})) {
+                       my $age = time - $tag{'epoch'};
+                       $ref_item{'epoch'} = $tag{'epoch'};
+                       $ref_item{'age'} = age_string($age);
+               }
+               $ref_item{'reftype'} = $tag{'type'};
+               $ref_item{'name'} = $tag{'name'};
+               $ref_item{'refid'} = $tag{'object'};
+       } elsif ($type eq "commit"){
+               my %co = parse_commit($ref_id);
+               $ref_item{'reftype'} = "commit";
+               $ref_item{'name'} = $ref_file;
+               $ref_item{'title'} = $co{'title'};
+               $ref_item{'refid'} = $ref_id;
+               $ref_item{'epoch'} = $co{'committer_epoch'};
+               $ref_item{'age'} = $co{'age_string'};
+       } else {
+               $ref_item{'reftype'} = $type;
+               $ref_item{'name'} = $ref_file;
+               $ref_item{'refid'} = $ref_id;
+       }
+
+       return %ref_item;
+}
+
+# parse line of git-diff-tree "raw" output
+sub parse_difftree_raw_line {
+       my $line = shift;
+       my %res;
+
+       # ':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}) (.)([0-9]{0,3})\t(.*)$/) {
+               $res{'from_mode'} = $1;
+               $res{'to_mode'} = $2;
+               $res{'from_id'} = $3;
+               $res{'to_id'} = $4;
+               $res{'status'} = $5;
+               $res{'similarity'} = $6;
+               if ($res{'status'} eq 'R' || $res{'status'} eq 'C') { # renamed or copied
+                       ($res{'from_file'}, $res{'to_file'}) = map { unquote($_) } split("\t", $7);
+               } else {
+                       $res{'file'} = unquote($7);
+               }
+       }
+       # 'c512b523472485aef4fff9e57b229d9d243c967f'
+       #elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
+       #       $res{'commit'} = $1;
+       #}
+
+       return wantarray ? %res : \%res;
+}
+
  ## ......................................................................
  ## parse to array of hashes functions
  
  ## ......................................................................
  ## parse to array of hashes functions
  
-sub git_read_refs {
+sub git_get_refs_list {
         my $ref_dir = shift;
         my @reflist;
  
         my $ref_dir = shift;
         my @reflist;
  
@@ -697,46 +1051,13 @@ sub git_read_refs {
         }, "$projectroot/$project/$ref_dir");
  
         foreach my $ref_file (@refs) {
         }, "$projectroot/$project/$ref_dir");
  
         foreach my $ref_file (@refs) {
-               my $ref_id = git_read_hash("$project/$ref_dir/$ref_file");
+               my $ref_id = git_get_hash_by_ref("$project/$ref_dir/$ref_file");
                 my $type = git_get_type($ref_id) || next;
                 my $type = git_get_type($ref_id) || next;
-               my %ref_item;
-               my %co;
-               $ref_item{'type'} = $type;
-               $ref_item{'id'} = $ref_id;
-               $ref_item{'epoch'} = 0;
-               $ref_item{'age'} = "unknown";
-               if ($type eq "tag") {
-                       my %tag = git_read_tag($ref_id);
-                       $ref_item{'comment'} = $tag{'comment'};
-                       if ($tag{'type'} eq "commit") {
-                               %co = git_read_commit($tag{'object'});
-                               $ref_item{'epoch'} = $co{'committer_epoch'};
-                               $ref_item{'age'} = $co{'age_string'};
-                       } elsif (defined($tag{'epoch'})) {
-                               my $age = time - $tag{'epoch'};
-                               $ref_item{'epoch'} = $tag{'epoch'};
-                               $ref_item{'age'} = age_string($age);
-                       }
-                       $ref_item{'reftype'} = $tag{'type'};
-                       $ref_item{'name'} = $tag{'name'};
-                       $ref_item{'refid'} = $tag{'object'};
-               } elsif ($type eq "commit"){
-                       %co = git_read_commit($ref_id);
-                       $ref_item{'reftype'} = "commit";
-                       $ref_item{'name'} = $ref_file;
-                       $ref_item{'title'} = $co{'title'};
-                       $ref_item{'refid'} = $ref_id;
-                       $ref_item{'epoch'} = $co{'committer_epoch'};
-                       $ref_item{'age'} = $co{'age_string'};
-               } else {
-                       $ref_item{'reftype'} = $type;
-                       $ref_item{'name'} = $ref_file;
-                       $ref_item{'refid'} = $ref_id;
-               }
+               my %ref_item = parse_ref($ref_file, $ref_id, $type);
  
                 push @reflist, \%ref_item;
         }
  
                 push @reflist, \%ref_item;
         }
-       # sort tags by age
+       # sort refs by age
         @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
         return \@reflist;
  }
         @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
         return \@reflist;
  }
@@ -768,6 +1089,7 @@ sub mimetype_guess_file {
         my %mimemap;
         open(MIME, $mimemap) or return undef;
         while (<MIME>) {
         my %mimemap;
         open(MIME, $mimemap) or return undef;
         while (<MIME>) {
+               next if m/^#/; # skip comments
                 my ($mime, $exts) = split(/\t+/);
                 if (defined $exts) {
                         my @exts = split(/\s+/, $exts);
                 my ($mime, $exts) = split(/\t+/);
                 if (defined $exts) {
                         my @exts = split(/\s+/, $exts);
@@ -789,14 +1111,17 @@ sub mimetype_guess {
  
         if ($mimetypes_file) {
                 my $file = $mimetypes_file;
  
         if ($mimetypes_file) {
                 my $file = $mimetypes_file;
-               #$file =~ m#^/# or $file = "$projectroot/$path/$file";
+               if ($file !~ m!^/!) { # if it is relative path
+                       # it is relative to project
+                       $file = "$projectroot/$project/$file";
+               }
                 $mime = mimetype_guess_file($filename, $file);
         }
         $mime ||= mimetype_guess_file($filename, '/etc/mime.types');
         return $mime;
  }
  
                 $mime = mimetype_guess_file($filename, $file);
         }
         $mime ||= mimetype_guess_file($filename, '/etc/mime.types');
         return $mime;
  }
  
-sub git_blob_plain_mimetype {
+sub blob_mimetype {
         my $fd = shift;
         my $filename = shift;
  
         my $fd = shift;
         my $filename = shift;
  
@@ -849,34 +1174,43 @@ 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 ($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">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
         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">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- git web interface v$version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
+<!-- git web interface version $version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
  <!-- git core binaries version $git_version -->
  <head>
  <meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
  <!-- git core binaries version $git_version -->
  <head>
  <meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
+<meta name="generator" content="gitweb/$version git/$git_version"/>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>
  <link rel="stylesheet" type="text/css" href="$stylesheet"/>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>
  <link rel="stylesheet" type="text/css" href="$stylesheet"/>
-$rss_link
-</head>
-<body>
  EOF
  EOF
-       print "<div class=\"page_header\">\n" .
+       if (defined $project) {
+               printf('<link rel="alternate" title="%s log" '.
+                      'href="%s" type="application/rss+xml"/>'."\n",
+                      esc_param($project), href(action=>"rss"));
+       }
+
+       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";
               "<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)}, "projects") . " / ";
+       print $cgi->a({-href => esc_param($home_link)}, $home_link_str) . " / ";
         if (defined $project) {
         if (defined $project) {
-               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, esc_html($project));
+               print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                 if (defined $action) {
                         print " / $action";
                 }
                 if (defined $action) {
                         print " / $action";
                 }
@@ -909,13 +1243,13 @@ EOF
  sub git_footer_html {
         print "<div class=\"page_footer\">\n";
         if (defined $project) {
  sub git_footer_html {
         print "<div class=\"page_footer\">\n";
         if (defined $project) {
-               my $descr = git_read_description($project);
+               my $descr = git_get_project_description($project);
                 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 => "$my_uri?" . esc_param("p=$project;a=rss"), -class => "rss_logo"}, "RSS") . "\n";
+               print $cgi->a({-href => href(action=>"rss"), -class => "rss_logo"}, "RSS") . "\n";
         } else {
         } else {
-               print $cgi->a({-href => "$my_uri?" . esc_param("a=opml"), -class => "rss_logo"}, "OPML") . "\n";
+               print $cgi->a({-href => href(action=>"opml"), -class => "rss_logo"}, "OPML") . "\n";
         }
         print "</div>\n" .
               "</body>\n" .
         }
         print "</div>\n" .
               "</body>\n" .
@@ -927,11 +1261,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;
  }
@@ -939,7 +1275,7 @@ sub die_error {
  ## ----------------------------------------------------------------------
  ## functions printing or outputting HTML: navigation
  
  ## ----------------------------------------------------------------------
  ## functions printing or outputting HTML: navigation
  
-sub git_page_nav {
+sub git_print_page_nav {
         my ($current, $suppress, $head, $treehead, $treebase, $extra) = @_;
         $extra = '' if !defined $extra; # pager or formats
  
         my ($current, $suppress, $head, $treehead, $treebase, $extra) = @_;
         $extra = '' if !defined $extra; # pager or formats
  
@@ -948,54 +1284,52 @@ sub git_page_nav {
                 @navs = grep { $_ ne $suppress } @navs;
         }
  
                 @navs = grep { $_ ne $suppress } @navs;
         }
  
-       my %arg = map { $_, ''} @navs;
+       my %arg = map { $_ => {action=>$_} } @navs;
         if (defined $head) {
                 for (qw(commit commitdiff)) {
         if (defined $head) {
                 for (qw(commit commitdiff)) {
-                       $arg{$_} = ";h=$head";
+                       $arg{$_}{hash} = $head;
                 }
                 if ($current =~ m/^(tree | log | shortlog | commit | commitdiff | search)$/x) {
                         for (qw(shortlog log)) {
                 }
                 if ($current =~ m/^(tree | log | shortlog | commit | commitdiff | search)$/x) {
                         for (qw(shortlog log)) {
-                               $arg{$_} = ";h=$head";
+                               $arg{$_}{hash} = $head;
                         }
                 }
         }
                         }
                 }
         }
-       $arg{tree} .= ";h=$treehead" if defined $treehead;
-       $arg{tree} .= ";hb=$treebase" if defined $treebase;
+       $arg{tree}{hash} = $treehead if defined $treehead;
+       $arg{tree}{hash_base} = $treebase if defined $treebase;
  
         print "<div class=\"page_nav\">\n" .
                 (join " | ",
  
         print "<div class=\"page_nav\">\n" .
                 (join " | ",
-                map { $_ eq $current
-                                        ? $_
-                                        : $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$_$arg{$_}")}, "$_")
-                                }
-                @navs);
+                map { $_ eq $current ?
+                      $_ : $cgi->a({-href => href(%{$arg{$_}})}, "$_")
+                } @navs);
         print "<br/>\n$extra<br/>\n" .
               "</div>\n";
  }
  
         print "<br/>\n$extra<br/>\n" .
               "</div>\n";
  }
  
-sub git_get_paging_nav {
+sub format_paging_nav {
         my ($action, $hash, $head, $page, $nrevs) = @_;
         my $paging_nav;
  
  
         if ($hash ne $head || $page) {
         my ($action, $hash, $head, $page, $nrevs) = @_;
         my $paging_nav;
  
  
         if ($hash ne $head || $page) {
-               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action")}, "HEAD");
+               $paging_nav .= $cgi->a({-href => href(action=>$action)}, "HEAD");
         } else {
                 $paging_nav .= "HEAD";
         }
  
         if ($page > 0) {
                 $paging_nav .= " &sdot; " .
         } else {
                 $paging_nav .= "HEAD";
         }
  
         if ($page > 0) {
                 $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page-1)),
-                                                        -accesskey => "p", -title => "Alt-p"}, "prev");
+                       $cgi->a({-href => href(action=>$action, hash=>$hash, page=>$page-1),
+                                -accesskey => "p", -title => "Alt-p"}, "prev");
         } else {
                 $paging_nav .= " &sdot; prev";
         }
  
         if ($nrevs >= (100 * ($page+1)-1)) {
                 $paging_nav .= " &sdot; " .
         } else {
                 $paging_nav .= " &sdot; prev";
         }
  
         if ($nrevs >= (100 * ($page+1)-1)) {
                 $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page+1)),
-                                                        -accesskey => "n", -title => "Alt-n"}, "next");
+                       $cgi->a({-href => href(action=>$action, hash=>$hash, page=>$page+1),
+                                -accesskey => "n", -title => "Alt-n"}, "next");
         } else {
                 $paging_nav .= " &sdot; next";
         }
         } else {
                 $paging_nav .= " &sdot; next";
         }
@@ -1006,137 +1340,589 @@ sub git_get_paging_nav {
  ## ......................................................................
  ## functions printing or outputting HTML: div
  
  ## ......................................................................
  ## functions printing or outputting HTML: div
  
-sub git_header_div {
+sub git_print_header_div {
         my ($action, $title, $hash, $hash_base) = @_;
         my ($action, $title, $hash, $hash_base) = @_;
-       my $rest = '';
+       my %args = ();
  
  
-       $rest .= ";h=$hash" if $hash;
-       $rest .= ";hb=$hash_base" if $hash_base;
+       $args{action} = $action;
+       $args{hash} = $hash if $hash;
+       $args{hash_base} = $hash_base if $hash_base;
  
         print "<div class=\"header\">\n" .
  
         print "<div class=\"header\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action$rest"),
-                      -class => "title"}, $title ? $title : $action) . "\n" .
-             "</div>\n";
+             $cgi->a({-href => href(%args), -class => "title"},
+             $title ? $title : $action) .
+             "\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;
  }
  
  sub git_print_page_path {
         my $name = shift;
         my $type = shift;
+       my $hb = shift;
  
         if (!defined $name) {
  
         if (!defined $name) {
-               print "<div class=\"page_path\"><b>/</b></div>\n";
+               print "<div class=\"page_path\">/</div>\n";
         } elsif (defined $type && $type eq 'blob') {
         } elsif (defined $type && $type eq 'blob') {
-               print "<div class=\"page_path\"><b>" .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;f=$file_name")}, esc_html($name)) . "</b><br/></div>\n";
+               print "<div class=\"page_path\">";
+               if (defined $hb) {
+                       print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
+                                                    hash_base=>$hb)},
+                                     esc_html($name));
+               } else {
+                       print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name)},
+                                     esc_html($name));
+               }
+               print "<br/></div>\n";
         } else {
         } else {
-               print "<div class=\"page_path\"><b>" . esc_html($name) . "</b><br/></div>\n";
+               print "<div class=\"page_path\">" . esc_html($name) . "<br/></div>\n";
         }
  }
  
         }
  }
  
-## ......................................................................
-## functions printing large fragments of HTML
+# sub git_print_log (\@;%) {
+sub git_print_log ($;%) {
+       my $log = shift;
+       my %opts = @_;
  
  
-sub git_shortlog_body {
-       # uses global variable $project
-       my ($revlist, $from, $to, $refs, $extra) = @_;
-       $from = 0 unless defined $from;
-       $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
+       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;
+       }
  
  
-       print "<table class=\"shortlog\" cellspacing=\"0\">\n";
-       my $alternate = 0;
-       for (my $i = $from; $i <= $to; $i++) {
-               my $commit = $revlist->[$i];
-               #my $ref = defined $refs ? git_get_referencing($refs, $commit) : '';
-               my $ref = git_get_referencing($refs, $commit);
-               my %co = git_read_commit($commit);
-               my %ad = date_str($co{'author_epoch'});
-               if ($alternate) {
-                       print "<tr class=\"dark\">\n";
+       # print 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 {
                 } else {
-                       print "<tr class=\"light\">\n";
+                       $signoff = 0;
                 }
                 }
-               $alternate ^= 1;
-               # git_summary() used print "<td><i>$co{'age_string'}</i></td>\n" .
-               print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
-                     "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
-                     "<td>";
-               if (length($co{'title_short'}) < length($co{'title'})) {
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"),
-                                      -class => "list", -title => "$co{'title'}"},
-                             "<b>" . esc_html($co{'title_short'}) . "$ref</b>");
+
+               # print only one empty line
+               # do not print empty line after signoff
+               if ($line eq "") {
+                       next if ($empty || $signoff);
+                       $empty = 1;
                 } else {
                 } else {
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"),
-                                      -class => "list"},
-                             "<b>" . esc_html($co{'title'}) . "$ref</b>");
+                       $empty = 0;
                 }
                 }
-               print "</td>\n" .
-                     "<td class=\"link\">" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . " | " .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$commit")}, "commitdiff") .
-                     "</td>\n" .
-                     "</tr>\n";
+
+               print format_log_line_html($line) . "<br/>\n";
         }
         }
-       if (defined $extra) {
-               print "<tr>\n" .
-                     "<td colspan=\"4\">$extra</td>\n" .
-                     "</tr>\n";
+
+       if ($opts{'-final_empty_line'}) {
+               # end with single empty line
+               print "<br/>\n" unless $empty;
         }
         }
-       print "</table>\n";
  }
  
  }
  
-sub git_tags_body {
-       # uses global variable $project
-       my ($taglist, $from, $to, $extra) = @_;
-       $from = 0 unless defined $from;
-       $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
+sub git_print_simplified_log {
+       my $log = shift;
+       my $remove_title = shift;
  
  
-       print "<table class=\"tags\" cellspacing=\"0\">\n";
+       git_print_log($log,
+               -final_empty_line=> 1,
+               -remove_title => $remove_title);
+}
+
+## ......................................................................
+## functions printing large fragments of HTML
+
+sub git_difftree_body {
+       my ($difftree, $hash, $parent) = @_;
+
+       print "<div class=\"list_head\">\n";
+       if ($#{$difftree} > 10) {
+               print(($#{$difftree} + 1) . " files changed:\n");
+       }
+       print "</div>\n";
+
+       print "<table class=\"diff_tree\">\n";
         my $alternate = 0;
         my $alternate = 0;
-       for (my $i = $from; $i <= $to; $i++) {
-               my $entry = $taglist->[$i];
-               my %tag = %$entry;
-               my $comment_lines = $tag{'comment'};
-               my $comment = shift @$comment_lines;
-               my $comment_short;
-               if (defined $comment) {
-                       $comment_short = chop_str($comment, 30, 5);
-               }
+       my $patchno = 0;
+       foreach my $line (@{$difftree}) {
+               my %diff = parse_difftree_raw_line($line);
+
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
                 } else {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
                 } else {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
-               print "<td><i>$tag{'age'}</i></td>\n" .
-                     "<td>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}"),
-                              -class => "list"}, "<b>" . esc_html($tag{'name'}) . "</b>") .
-                     "</td>\n" .
-                     "<td>";
-               if (defined $comment) {
-                       if (length($comment_short) < length($comment)) {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}"),
-                                              -class => "list", -title => $comment}, $comment_short);
-                       } else {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}"),
-                                              -class => "list"}, $comment);
+
+               my ($to_mode_oct, $to_mode_str, $to_file_type);
+               my ($from_mode_oct, $from_mode_str, $from_file_type);
+               if ($diff{'to_mode'} ne ('0' x 6)) {
+                       $to_mode_oct = oct $diff{'to_mode'};
+                       if (S_ISREG($to_mode_oct)) { # only for regular file
+                               $to_mode_str = sprintf("%04o", $to_mode_oct & 0777); # permission bits
                         }
                         }
+                       $to_file_type = file_type($diff{'to_mode'});
                 }
                 }
-               print "</td>\n" .
-                     "<td class=\"selflink\">";
-               if ($tag{'type'} eq "tag") {
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag");
-               } else {
-                       print "&nbsp;";
+               if ($diff{'from_mode'} ne ('0' x 6)) {
+                       $from_mode_oct = oct $diff{'from_mode'};
+                       if (S_ISREG($to_mode_oct)) { # only for regular file
+                               $from_mode_str = sprintf("%04o", $from_mode_oct & 0777); # permission bits
+                       }
+                       $from_file_type = file_type($diff{'from_mode'});
                 }
                 }
-               print "</td>\n" .
+
+               if ($diff{'status'} eq "A") { # created
+                       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'},
+                                                    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");
+                       if ($action == "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>";
+                       print "<td>" .
+                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
+                                                    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'},
+                                                    hash_base=>$parent, file_name=>$diff{'file'})},
+                                     "blob") .
+                             " | ";
+                       if ($action == "commitdiff") {
+                               # link to patch
+                               $patchno++;
+                               print " | " .
+                                     $cgi->a({-href => "#patch$patchno"}, "patch");
+                       }
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
+                                                    file_name=>$diff{'file'})},
+                                     "history") .
+                             "</td>\n";
+
+               } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
+                       my $mode_chnge = "";
+                       if ($diff{'from_mode'} != $diff{'to_mode'}) {
+                               $mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
+                               if ($from_file_type != $to_file_type) {
+                                       $mode_chnge .= " from $from_file_type to $to_file_type";
+                               }
+                               if (($from_mode_oct & 0777) != ($to_mode_oct & 0777)) {
+                                       if ($from_mode_str && $to_mode_str) {
+                                               $mode_chnge .= " mode: $from_mode_str->$to_mode_str";
+                                       } elsif ($to_mode_str) {
+                                               $mode_chnge .= " mode: $to_mode_str";
+                                       }
+                               }
+                               $mode_chnge .= "]</span>\n";
+                       }
+                       print "<td>";
+                       if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
+                               print $cgi->a({-href => href(action=>"blobdiff",
+                                                            hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                            hash_base=>$hash, hash_parent_base=>$parent,
+                                                            file_name=>$diff{'file'}),
+                                             -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'}));
+                       }
+                       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
+                               if ($action == "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 " | " .
+                               $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
+                       my %status_name = ('R' => 'moved', 'C' => 'copied');
+                       my $nstatus = $status_name{$diff{'status'}};
+                       my $mode_chng = "";
+                       if ($diff{'from_mode'} != $diff{'to_mode'}) {
+                               # mode also for directories, so we cannot use $to_mode_str
+                               $mode_chng = sprintf(", mode: %04o", $to_mode_oct & 0777);
+                       }
+                       print "<td>" .
+                             $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
+                                                    hash=>$diff{'to_id'}, file_name=>$diff{'to_file'}),
+                                     -class => "list"}, esc_html($diff{'to_file'})) . "</td>\n" .
+                             "<td><span class=\"file_status $nstatus\">[$nstatus from " .
+                             $cgi->a({-href => href(action=>"blob", hash_base=>$parent,
+                                                    hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
+                                     -class => "list"}, esc_html($diff{'from_file'})) .
+                             " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
+                             "<td class=\"link\">" .
+                             $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
+                                                    hash=>$diff{'to_id'}, file_name=>$diff{'to_file'})},
+                                     "blob");
+                       if ($diff{'to_id'} ne $diff{'from_id'}) {
+                               if ($action == "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 "</td>\n";
+
+               } # we should not encounter Unmerged (U) or Unknown (X) status
+               print "</tr>\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_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";
+       my $alternate = 0;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $commit = $revlist->[$i];
+               #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
+               my $ref = format_ref_marker($refs, $commit);
+               my %co = parse_commit($commit);
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               # git_summary() used print "<td><i>$co{'age_string'}</i></td>\n" .
+               print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+                     "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
+                     "<td>";
+               print 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") . " | " .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");
+               if ($have_snapshot) {
+                       print " | " .  $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
+               }
+               print "</td>\n" .
+                     "</tr>\n";
+       }
+       if (defined $extra) {
+               print "<tr>\n" .
+                     "<td colspan=\"4\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
+sub git_history_body {
+       # Warning: assumes constant type (blob or tree) during history
+       my ($fd, $refs, $hash_base, $ftype, $extra) = @_;
+
+       print "<table class=\"history\" cellspacing=\"0\">\n";
+       my $alternate = 0;
+       while (my $line = <$fd>) {
+               if ($line !~ m/^([0-9a-fA-F]{40})/) {
+                       next;
+               }
+
+               my $commit = $1;
+               my %co = parse_commit($commit);
+               if (!%co) {
+                       next;
+               }
+
+               my $ref = format_ref_marker($refs, $commit);
+
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+                     # shortlog uses      chop_str($co{'author_name'}, 10)
+                     "<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 "</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);
+
+               if ($ftype eq 'blob') {
+                       my $blob_current = git_get_hash_by_path($hash_base, $file_name);
+                       my $blob_parent  = git_get_hash_by_path($commit, $file_name);
+                       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=>$hash_base, hash_parent_base=>$commit,
+                                                              file_name=>$file_name)},
+                                               "diff to current");
+                       }
+               }
+               print "</td>\n" .
+                     "</tr>\n";
+       }
+       if (defined $extra) {
+               print "<tr>\n" .
+                     "<td colspan=\"4\">$extra</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+}
+
+sub git_tags_body {
+       # uses global variable $project
+       my ($taglist, $from, $to, $extra) = @_;
+       $from = 0 unless defined $from;
+       $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
+
+       print "<table class=\"tags\" cellspacing=\"0\">\n";
+       my $alternate = 0;
+       for (my $i = $from; $i <= $to; $i++) {
+               my $entry = $taglist->[$i];
+               my %tag = %$entry;
+               my $comment_lines = $tag{'comment'};
+               my $comment = shift @$comment_lines;
+               my $comment_short;
+               if (defined $comment) {
+                       $comment_short = chop_str($comment, 30, 5);
+               }
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td><i>$tag{'age'}</i></td>\n" .
+                     "<td>" .
+                     $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'}),
+                              -class => "list name"}, esc_html($tag{'name'})) .
+                     "</td>\n" .
+                     "<td>";
+               if (defined $comment) {
+                       print format_subject_html($comment, $comment_short,
+                                                 href(action=>"tag", hash=>$tag{'id'}));
+               }
+               print "</td>\n" .
+                     "<td class=\"selflink\">";
+               if ($tag{'type'} eq "tag") {
+                       print $cgi->a({-href => href(action=>"tag", hash=>$tag{'id'})}, "tag");
+               } else {
+                       print "&nbsp;";
+               }
+               print "</td>\n" .
                       "<td class=\"link\">" . " | " .
                       "<td class=\"link\">" . " | " .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'});
+                     $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'})}, $tag{'reftype'});
                 if ($tag{'reftype'} eq "commit") {
                 if ($tag{'reftype'} eq "commit") {
-                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
+                       print " | " . $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") .
+                             " | " . $cgi->a({-href => href(action=>"log", hash=>$tag{'refid'})}, "log");
                 } elsif ($tag{'reftype'} eq "blob") {
                 } elsif ($tag{'reftype'} eq "blob") {
-                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$tag{'refid'}")}, "raw");
+                       print " | " . $cgi->a({-href => href(action=>"blob_plain", hash=>$tag{'refid'})}, "raw");
                 }
                 print "</td>\n" .
                       "</tr>";
                 }
                 print "</td>\n" .
                       "</tr>";
@@ -1169,12 +1955,12 @@ sub git_heads_body {
                 $alternate ^= 1;
                 print "<td><i>$tag{'age'}</i></td>\n" .
                       ($tag{'id'} eq $head ? "<td class=\"current_head\">" : "<td>") .
                 $alternate ^= 1;
                 print "<td><i>$tag{'age'}</i></td>\n" .
                       ($tag{'id'} eq $head ? "<td class=\"current_head\">" : "<td>") .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}"),
-                              -class => "list"}, "<b>" . esc_html($tag{'name'}) . "</b>") .
+                     $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'}),
+                              -class => "list name"},esc_html($tag{'name'})) .
                       "</td>\n" .
                       "<td class=\"link\">" .
                       "</td>\n" .
                       "<td class=\"link\">" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . " | " .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'name'}")}, "log") .
+                     $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") . " | " .
+                     $cgi->a({-href => href(action=>"log", hash=>$tag{'name'})}, "log") .
                       "</td>\n" .
                       "</tr>";
         }
                       "</td>\n" .
                       "</tr>";
         }
@@ -1186,82 +1972,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;
-                       }
-                       while ((my $pos = index($line, "\t")) != -1) {
-                               if (my $count = (8 - (($pos-1) % 8))) {
-                                       my $spaces = ' ' x $count;
-                                       $line =~ s/\t/$spaces/;
-                               }
-                       }
-                       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
@@ -1269,27 +1979,27 @@ sub git_diff_print {
  sub git_project_list {
         my $order = $cgi->param('o');
         if (defined $order && $order !~ m/project|descr|owner|age/) {
  sub git_project_list {
         my $order = $cgi->param('o');
         if (defined $order && $order !~ m/project|descr|owner|age/) {
-               die_error(undef, "Invalid order parameter '$order'.");
+               die_error(undef, "Unknown order parameter");
         }
  
         }
  
-       my @list = git_read_projects();
+       my @list = git_get_projects_list();
         my @projects;
         if (!@list) {
         my @projects;
         if (!@list) {
-               die_error(undef, "No projects found.");
+               die_error(undef, "No projects found");
         }
         foreach my $pr (@list) {
         }
         foreach my $pr (@list) {
-               my $head = git_read_head($pr->{'path'});
+               my $head = git_get_head_hash($pr->{'path'});
                 if (!defined $head) {
                         next;
                 }
                 if (!defined $head) {
                         next;
                 }
-               $ENV{'GIT_DIR'} = "$projectroot/$pr->{'path'}";
-               my %co = git_read_commit($head);
+               $git_dir = "$projectroot/$pr->{'path'}";
+               my %co = parse_commit($head);
                 if (!%co) {
                         next;
                 }
                 $pr->{'commit'} = \%co;
                 if (!defined $pr->{'descr'}) {
                 if (!%co) {
                         next;
                 }
                 $pr->{'commit'} = \%co;
                 if (!defined $pr->{'descr'}) {
-                       my $descr = git_read_description($pr->{'path'}) || "";
+                       my $descr = git_get_project_description($pr->{'path'}) || "";
                         $pr->{'descr'} = chop_str($descr, 25, 5);
                 }
                 if (!defined $pr->{'owner'}) {
                         $pr->{'descr'} = chop_str($descr, 25, 5);
                 }
                 if (!defined $pr->{'owner'}) {
@@ -1355,16 +2065,16 @@ sub git_project_list {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
-               print "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$pr->{'path'};a=summary"),
+               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\">" .
                                         -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 => "$my_uri?" . esc_param("p=$pr->{'path'};a=summary")}, "summary")   . " | " .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$pr->{'path'};a=shortlog")}, "shortlog") . " | " .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$pr->{'path'};a=log")}, "log") .
+                     $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";
         }
                       "</td>\n" .
                       "</tr>\n";
         }
@@ -1373,83 +2083,81 @@ sub git_project_list {
  }
  
  sub git_summary {
  }
  
  sub git_summary {
-       my $descr = git_read_description($project) || "none";
-       my $head = git_read_head($project);
-       my %co = git_read_commit($head);
-       my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
+       my $descr = git_get_project_description($project) || "none";
+       my $head = git_get_head_hash($project);
+       my %co = parse_commit($head);
+       my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
  
  
-       my $owner;
-       if (-f $projects_list) {
-               open (my $fd , $projects_list);
-               while (my $line = <$fd>) {
-                       chomp $line;
-                       my ($pr, $ow) = split ' ', $line;
-                       $pr = unescape($pr);
-                       $ow = unescape($ow);
-                       if ($pr eq $project) {
-                               $owner = decode("utf8", $ow, Encode::FB_DEFAULT);
-                               last;
-                       }
-               }
-               close $fd;
-       }
-       if (!defined $owner) {
-               $owner = get_file_owner("$projectroot/$project");
-       }
+       my $owner = git_get_project_owner($project);
  
  
-       my $refs = read_info_ref();
+       my $refs = git_get_references();
         git_header_html();
         git_header_html();
-       git_page_nav('summary','', $head);
+       git_print_page_nav('summary','', $head);
  
         print "<div class=\"title\">&nbsp;</div>\n";
         print "<table cellspacing=\"0\">\n" .
               "<tr><td>description</td><td>" . esc_html($descr) . "</td></tr>\n" .
               "<tr><td>owner</td><td>$owner</td></tr>\n" .
  
         print "<div class=\"title\">&nbsp;</div>\n";
         print "<table cellspacing=\"0\">\n" .
               "<tr><td>description</td><td>" . esc_html($descr) . "</td></tr>\n" .
               "<tr><td>owner</td><td>$owner</td></tr>\n" .
-             "<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n" .
-             "</table>\n";
+             "<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n";
+       # use per project git URL list in $projectroot/$project/cloneurl
+       # or make project git URL from git base URL and project name
+       my $url_tag = "URL";
+       my @url_list = git_get_project_url_list($project);
+       @url_list = map { "$_/$project" } @git_base_url_list unless @url_list;
+       foreach my $git_url (@url_list) {
+               next unless $git_url;
+               print "<tr><td>$url_tag</td><td>$git_url</td></tr>\n";
+               $url_tag = "";
+       }
+       print "</table>\n";
  
  
-       open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_read_head($project)
-               or die_error(undef, "Open git-rev-list failed.");
+       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;
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
-       git_header_div('shortlog');
+       git_print_header_div('shortlog');
         git_shortlog_body(\@revlist, 0, 15, $refs,
         git_shortlog_body(\@revlist, 0, 15, $refs,
-                         $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "..."));
+                         $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
  
-       my $taglist = git_read_refs("refs/tags");
+       my $taglist = git_get_refs_list("refs/tags");
         if (defined @$taglist) {
         if (defined @$taglist) {
-               git_header_div('tags');
+               git_print_header_div('tags');
                 git_tags_body($taglist, 0, 15,
                 git_tags_body($taglist, 0, 15,
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tags")}, "..."));
+                             $cgi->a({-href => href(action=>"tags")}, "..."));
         }
  
         }
  
-       my $headlist = git_read_refs("refs/heads");
+       my $headlist = git_get_refs_list("refs/heads");
         if (defined @$headlist) {
         if (defined @$headlist) {
-               git_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 => "$my_uri?" . esc_param("p=$project;a=heads")}, "..."));
+                              $cgi->a({-href => href(action=>"heads")}, "..."));
         }
  
         git_footer_html();
  }
  
  sub git_tag {
         }
  
         git_footer_html();
  }
  
  sub git_tag {
-       my $head = git_read_head($project);
+       my $head = git_get_head_hash($project);
         git_header_html();
         git_header_html();
-       git_page_nav('','', $head,undef,$head);
-       my %tag = git_read_tag($hash);
-       git_header_div('commit', esc_html($tag{'name'}), $hash);
+       git_print_page_nav('','', $head,undef,$head);
+       my %tag = parse_tag($hash);
+       git_print_header_div('commit', esc_html($tag{'name'}), $hash);
         print "<div class=\"title_text\">\n" .
               "<table cellspacing=\"0\">\n" .
               "<tr>\n" .
               "<td>object</td>\n" .
         print "<div class=\"title_text\">\n" .
               "<table cellspacing=\"0\">\n" .
               "<tr>\n" .
               "<td>object</td>\n" .
-             "<td>" . $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=$tag{'type'};h=$tag{'object'}")}, $tag{'object'}) . "</td>\n" .
-             "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'type'};h=$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'})) {
               "</tr>\n";
         if (defined($tag{'author'})) {
-               my %ad = date_str($tag{'epoch'}, $tag{'tz'});
+               my %ad = parse_date($tag{'epoch'}, $tag{'tz'});
                 print "<tr><td>author</td><td>" . esc_html($tag{'author'}) . "</td></tr>\n";
                 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";
@@ -1465,11 +2173,14 @@ sub git_tag {
  sub git_blame2 {
         my $fd;
         my $ftype;
  sub git_blame2 {
         my $fd;
         my $ftype;
-       die_error(undef, "Permission denied.") if (!git_get_project_config_bool ('blame'));
+
+       if (!gitweb_check_feature('blame')) {
+               die_error('403 Permission denied', "Permission denied");
+       }
         die_error('404 Not Found', "File name not defined") if (!$file_name);
         die_error('404 Not Found', "File name not defined") if (!$file_name);
-       $hash_base ||= git_read_head($project);
-       die_error(undef, "Reading commit failed") unless ($hash_base);
-       my %co = git_read_commit($hash_base)
+       $hash_base ||= git_get_head_hash($project);
+       die_error(undef, "Couldn't find base commit") unless ($hash_base);
+       my %co = parse_commit($hash_base)
                 or die_error(undef, "Reading commit failed");
         if (!defined $hash) {
                 $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
                 or die_error(undef, "Reading commit failed");
         if (!defined $hash) {
                 $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
@@ -1477,24 +2188,29 @@ sub git_blame2 {
         }
         $ftype = git_get_type($hash);
         if ($ftype !~ "blob") {
         }
         $ftype = git_get_type($hash);
         if ($ftype !~ "blob") {
-               die_error("400 Bad Request", "object is not a blob");
+               die_error("400 Bad Request", "Object is not a blob");
         }
         }
-       open ($fd, "-|", $GIT, "blame", '-l', $file_name, $hash_base)
-               or die_error(undef, "Open git-blame failed.");
+       open ($fd, "-|", git_cmd(), "blame", '-l', $file_name, $hash_base)
+               or die_error(undef, "Open git-blame failed");
         git_header_html();
         my $formats_nav =
         git_header_html();
         my $formats_nav =
-               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
-               " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
-       git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-       git_header_div('commit', esc_html($co{'title'}), $hash_base);
-       git_print_page_path($file_name, $ftype);
-       my @rev_color = (qw(light dark));
+               $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
+                       "blob") .
+               " | " .
+               $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);
+       my @rev_color = (qw(light2 dark2));
         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";
+       print <<HTML;
+<div class="page_body">
+<table class="blame">
+<tr><th>Commit</th><th>Line</th><th>Data</th></tr>
+HTML
         while (<$fd>) {
                 /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
                 my $full_rev = $1;
         while (<$fd>) {
                 /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
                 my $full_rev = $1;
@@ -1510,38 +2226,47 @@ sub git_blame2 {
                 }
                 print "<tr class=\"$rev_color[$current_color]\">\n";
                 print "<td class=\"sha1\">" .
                 }
                 print "<tr class=\"$rev_color[$current_color]\">\n";
                 print "<td class=\"sha1\">" .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$full_rev;f=$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";
+                       $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";
                 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;
-       die_error('403 Permission denied', "Permission denied.") if (!git_get_project_config_bool ('blame'));
-       die_error('404 Not Found', "What file will it be, master?") if (!$file_name);
-       $hash_base ||= git_read_head($project);
-       die_error(undef, "Reading commit failed.") unless ($hash_base);
-       my %co = git_read_commit($hash_base)
-               or die_error(undef, "Reading commit failed.");
+
+       if (!gitweb_check_feature('blame')) {
+               die_error('403 Permission denied', "Permission denied");
+       }
+       die_error('404 Not Found', "File name not defined") if (!$file_name);
+       $hash_base ||= git_get_head_hash($project);
+       die_error(undef, "Couldn't find base commit") unless ($hash_base);
+       my %co = parse_commit($hash_base)
+               or die_error(undef, "Reading commit failed");
         if (!defined $hash) {
                 $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
         if (!defined $hash) {
                 $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
-                       or die_error(undef, "Error lookup file.");
+                       or die_error(undef, "Error lookup file");
         }
         }
-       open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base)
-               or die_error(undef, "Open git-annotate failed.");
+       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 =
         git_header_html();
         my $formats_nav =
-               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
-               " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
-       git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-       git_header_div('commit', esc_html($co{'title'}), $hash_base);
-       git_print_page_path($file_name, 'blob');
+               $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
+                       "blob") .
+               " | " .
+               $cgi->a({-href => href(action=>"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);
         print "<div class=\"page_body\">\n";
         print <<HTML;
  <table class="blame">
         print "<div class=\"page_body\">\n";
         print <<HTML;
  <table class="blame">
@@ -1570,7 +2295,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;
@@ -1587,18 +2312,13 @@ HTML
                 $age_class  = age_class($age);
                 $author     = esc_html ($author);
                 $author     =~ s/ /&nbsp;/g;
                 $age_class  = age_class($age);
                 $author     = esc_html ($author);
                 $author     =~ s/ /&nbsp;/g;
-               # escape tabs
-               while ((my $pos = index($data, "\t")) != -1) {
-                       if (my $count = (8 - ($pos % 8))) {
-                               my $spaces = ' ' x $count;
-                               $data =~ s/\t/$spaces/;
-                       }
-               }
+
+               $data = untabify($data);
                 $data = esc_html ($data);
  
                 print <<HTML;
    <tr class="$line_class[$line_class_num]">
                 $data = esc_html ($data);
  
                 print <<HTML;
    <tr class="$line_class[$line_class_num]">
-    <td class="sha1"><a href="$my_uri?${\esc_param ("p=$project;a=commit;h=$long_rev")}" class="text">$short_rev..</a></td>
+    <td class="sha1"><a href="${\href (action=>"commit", hash=>$long_rev)}" class="text">$short_rev..</a></td>
      <td class="$age_class">$age_str</td>
      <td>$author</td>
      <td class="linenr"><a id="$lineno" href="#$lineno" class="linenr">$lineno</a></td>
      <td class="$age_class">$age_str</td>
      <td>$author</td>
      <td class="linenr"><a id="$lineno" href="#$lineno" class="linenr">$lineno</a></td>
@@ -1607,18 +2327,19 @@ 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();
  }
  
  sub git_tags {
         print "</div>";
         git_footer_html();
  }
  
  sub git_tags {
-       my $head = git_read_head($project);
+       my $head = git_get_head_hash($project);
         git_header_html();
         git_header_html();
-       git_page_nav('','', $head,undef,$head);
-       git_header_div('summary', $project);
+       git_print_page_nav('','', $head,undef,$head);
+       git_print_header_div('summary', $project);
  
  
-       my $taglist = git_read_refs("refs/tags");
+       my $taglist = git_get_refs_list("refs/tags");
         if (defined @$taglist) {
                 git_tags_body($taglist);
         }
         if (defined @$taglist) {
                 git_tags_body($taglist);
         }
@@ -1626,13 +2347,12 @@ sub git_tags {
  }
  
  sub git_heads {
  }
  
  sub git_heads {
-       my $head = git_read_head($project);
+       my $head = git_get_head_hash($project);
         git_header_html();
         git_header_html();
-       git_page_nav('','', $head,undef,$head);
-       git_header_div('summary', $project);
+       git_print_page_nav('','', $head,undef,$head);
+       git_print_header_div('summary', $project);
  
  
-       my $taglist = git_read_refs("refs/heads");
-       my $alternate = 0;
+       my $taglist = git_get_refs_list("refs/heads");
         if (defined @$taglist) {
                 git_heads_body($taglist, $head);
         }
         if (defined @$taglist) {
                 git_heads_body($taglist, $head);
         }
@@ -1640,20 +2360,26 @@ sub git_heads {
  }
  
  sub git_blob_plain {
  }
  
  sub git_blob_plain {
+       # blobs defined by non-textual hash id's can be cached
+       my $expires;
+       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               $expires = "+1d";
+       }
+
         if (!defined $hash) {
                 if (defined $file_name) {
         if (!defined $hash) {
                 if (defined $file_name) {
-                       my $base = $hash_base || git_read_head($project);
+                       my $base = $hash_base || git_get_head_hash($project);
                         $hash = git_get_hash_by_path($base, $file_name, "blob")
                         $hash = git_get_hash_by_path($base, $file_name, "blob")
-                               or die_error(undef, "Error lookup file.");
+                               or die_error(undef, "Error lookup file");
                 } else {
                 } else {
-                       die_error(undef, "No file name defined.");
+                       die_error(undef, "No file name defined");
                 }
         }
         my $type = shift;
                 }
         }
         my $type = shift;
-       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
-               or die_error("Couldn't cat $file_name, $hash");
+       open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+               or die_error(undef, "Couldn't cat $file_name, $hash");
  
  
-       $type ||= git_blob_plain_mimetype($fd, $file_name);
+       $type ||= blob_mimetype($fd, $file_name);
  
         # save as filename, even when no $file_name is given
         my $save_as = "$hash";
  
         # save as filename, even when no $file_name is given
         my $save_as = "$hash";
@@ -1663,7 +2389,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>;
@@ -1673,65 +2402,78 @@ sub git_blob_plain {
  }
  
  sub git_blob {
  }
  
  sub git_blob {
+       # blobs defined by non-textual hash id's can be cached
+       my $expires;
+       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               $expires = "+1d";
+       }
+
         if (!defined $hash) {
                 if (defined $file_name) {
         if (!defined $hash) {
                 if (defined $file_name) {
-                       my $base = $hash_base || git_read_head($project);
+                       my $base = $hash_base || git_get_head_hash($project);
                         $hash = git_get_hash_by_path($base, $file_name, "blob")
                         $hash = git_get_hash_by_path($base, $file_name, "blob")
-                               or die_error(undef, "Error lookup file.");
+                               or die_error(undef, "Error lookup file");
                 } else {
                 } else {
-                       die_error(undef, "No file name defined.");
+                       die_error(undef, "No file name defined");
                 }
         }
                 }
         }
-       my $have_blame = git_get_project_config_bool ('blame');
-       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
-               or die_error(undef, "Couldn't cat $file_name, $hash.");
-       my $mimetype = git_blob_plain_mimetype($fd, $file_name);
+       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);
         }
         if ($mimetype !~ m/^text\//) {
                 close $fd;
                 return git_blob_plain($mimetype);
         }
-       git_header_html();
+       git_header_html(undef, $expires);
         my $formats_nav = '';
         my $formats_nav = '';
-       if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
+       if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                 if (defined $file_name) {
                         if ($have_blame) {
                 if (defined $file_name) {
                         if ($have_blame) {
-                               $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;h=$hash;hb=$hash_base;f=$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 => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash;f=$file_name")}, "plain") .
-                               " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;hb=HEAD;f=$file_name")}, "head");
+                               $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");
                 } else {
                 } else {
-                       $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain");
+                       $formats_nav .=
+                               $cgi->a({-href => href(action=>"blob_plain", hash=>$hash)}, "plain");
                 }
                 }
-               git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-               git_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);
         } else {
                 print "<div class=\"page_nav\">\n" .
                       "<br/><br/></div>\n" .
                       "<div class=\"title\">$hash</div>\n";
         }
         } else {
                 print "<div class=\"page_nav\">\n" .
                       "<br/><br/></div>\n" .
                       "<div class=\"title\">$hash</div>\n";
         }
-       git_print_page_path($file_name, "blob");
+       git_print_page_path($file_name, "blob", $hash_base);
         print "<div class=\"page_body\">\n";
         my $nr;
         while (my $line = <$fd>) {
                 chomp $line;
                 $nr++;
         print "<div class=\"page_body\">\n";
         my $nr;
         while (my $line = <$fd>) {
                 chomp $line;
                 $nr++;
-               while ((my $pos = index($line, "\t")) != -1) {
-                       if (my $count = (8 - ($pos % 8))) {
-                               my $spaces = ' ' x $count;
-                               $line =~ s/\t/$spaces/;
-                       }
-               }
-               printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n", $nr, $nr, $nr, esc_html($line);
+               $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);
         }
         }
-       close $fd or print "Reading blob failed.\n";
+       close $fd
+               or print "Reading blob failed.\n";
         print "</div>";
         git_footer_html();
  }
  
  sub git_tree {
         if (!defined $hash) {
         print "</div>";
         git_footer_html();
  }
  
  sub git_tree {
         if (!defined $hash) {
-               $hash = git_read_head($project);
+               $hash = git_get_head_hash($project);
                 if (defined $file_name) {
                         my $base = $hash_base || $hash;
                         $hash = git_get_hash_by_path($base, $file_name, "tree");
                 if (defined $file_name) {
                         my $base = $hash_base || $hash;
                         $hash = git_get_hash_by_path($base, $file_name, "tree");
@@ -1741,21 +2483,22 @@ sub git_tree {
                 }
         }
         $/ = "\0";
                 }
         }
         $/ = "\0";
-       open my $fd, "-|", $GIT, "ls-tree", '-z', $hash
-               or die_error(undef, "Open git-ls-tree failed.");
+       open my $fd, "-|", git_cmd(), "ls-tree", '-z', $hash
+               or die_error(undef, "Open git-ls-tree failed");
         my @entries = map { chomp; $_ } <$fd>;
         my @entries = map { chomp; $_ } <$fd>;
-       close $fd or die_error(undef, "Reading tree failed.");
+       close $fd or die_error(undef, "Reading tree failed");
         $/ = "\n";
  
         $/ = "\n";
  
-       my $refs = read_info_ref();
-       my $ref = git_get_referencing($refs, $hash_base);
+       my $refs = git_get_references();
+       my $ref = format_ref_marker($refs, $hash_base);
         git_header_html();
         git_header_html();
-       my $base_key = "";
+       my %base_key = ();
         my $base = "";
         my $base = "";
-       if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
-               $base_key = ";hb=$hash_base";
-               git_page_nav('tree','', $hash_base);
-               git_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
+       my $have_blame = gitweb_check_feature('blame');
+       if (defined $hash_base && (my %co = parse_commit($hash_base))) {
+               $base_key{hash_base} = $hash_base;
+               git_print_page_nav('tree','', $hash_base);
+               git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
         } else {
                 print "<div class=\"page_nav\">\n";
                 print "<br/><br/></div>\n";
         } else {
                 print "<div class=\"page_nav\">\n";
                 print "<br/><br/></div>\n";
@@ -1764,7 +2507,7 @@ sub git_tree {
         if (defined $file_name) {
                 $base = esc_html("$file_name/");
         }
         if (defined $file_name) {
                 $base = esc_html("$file_name/");
         }
-       git_print_page_path($file_name, 'tree');
+       git_print_page_path($file_name, 'tree', $hash_base);
         print "<div class=\"page_body\">\n";
         print "<table cellspacing=\"0\">\n";
         my $alternate = 0;
         print "<div class=\"page_body\">\n";
         print "<table cellspacing=\"0\">\n";
         my $alternate = 0;
@@ -1784,21 +2527,37 @@ sub git_tree {
                 print "<td class=\"mode\">" . mode_str($t_mode) . "</td>\n";
                 if ($t_type eq "blob") {
                         print "<td class=\"list\">" .
                 print "<td class=\"mode\">" . mode_str($t_mode) . "</td>\n";
                 if ($t_type eq "blob") {
                         print "<td class=\"list\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$t_hash$base_key;f=$base$t_name"), -class => "list"}, esc_html($t_name)) .
+                             $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\">" .
                               "</td>\n" .
                               "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$t_hash$base_key;f=$base$t_name")}, "blob") .
-#                            " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;h=$t_hash$base_key;f=$base$t_name")}, "blame") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;h=$t_hash;hb=$hash_base;f=$base$t_name")}, "history") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$t_hash;f=$base$t_name")}, "raw") .
+                             $cgi->a({-href => href(action=>"blob", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
+                                     "blob");
+                       if ($have_blame) {
+                               print " | " .
+                                       $cgi->a({-href => href(action=>"blame", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
+                                               "blame");
+                       }
+                       print " | " .
+                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                    hash=>$t_hash, file_name=>"$base$t_name")},
+                                     "history") .
+                             " | " .
+                             $cgi->a({-href => href(action=>"blob_plain",
+                                                    hash=>$t_hash, file_name=>"$base$t_name")},
+                                     "raw") .
                               "</td>\n";
                 } elsif ($t_type eq "tree") {
                         print "<td class=\"list\">" .
                               "</td>\n";
                 } elsif ($t_type eq "tree") {
                         print "<td class=\"list\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$t_hash$base_key;f=$base$t_name")}, esc_html($t_name)) .
+                             $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\">" .
                               "</td>\n" .
                               "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$t_hash$base_key;f=$base$t_name")}, "tree") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$hash_base;f=$base$t_name")}, "history") .
+                             $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";
                 }
                 print "</tr>\n";
                               "</td>\n";
                 }
                 print "</tr>\n";
@@ -1808,114 +2567,133 @@ sub git_tree {
         git_footer_html();
  }
  
         git_footer_html();
  }
  
+sub git_snapshot {
+
+       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
+       my $have_snapshot = (defined $ctype && defined $suffix);
+       if (!$have_snapshot) {
+               die_error('403 Permission denied', "Permission denied");
+       }
+
+       if (!defined $hash) {
+               $hash = git_get_head_hash($project);
+       }
+
+       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');
+
+       my $git_command = git_cmd_str();
+       open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
+               die_error(undef, "Execute git-tar-tree failed.");
+       binmode STDOUT, ':raw';
+       print <$fd>;
+       binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
+       close $fd;
+
+}
+
  sub git_log {
  sub git_log {
-       my $head = git_read_head($project);
+       my $head = git_get_head_hash($project);
         if (!defined $hash) {
                 $hash = $head;
         }
         if (!defined $page) {
                 $page = 0;
         }
         if (!defined $hash) {
                 $hash = $head;
         }
         if (!defined $page) {
                 $page = 0;
         }
-       my $refs = read_info_ref();
+       my $refs = git_get_references();
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
-               or die_error(undef, "Open git-rev-list failed.");
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
+               or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
  
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
  
-       my $paging_nav = git_get_paging_nav('log', $hash, $head, $page, $#revlist);
+       my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#revlist);
  
         git_header_html();
  
         git_header_html();
-       git_page_nav('log','', $hash,undef,undef, $paging_nav);
+       git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
  
         if (!@revlist) {
  
         if (!@revlist) {
-               my %co = git_read_commit($hash);
+               my %co = parse_commit($hash);
  
  
-               git_header_div('summary', $project);
+               git_print_header_div('summary', $project);
                 print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
         }
         for (my $i = ($page * 100); $i <= $#revlist; $i++) {
                 my $commit = $revlist[$i];
                 print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
         }
         for (my $i = ($page * 100); $i <= $#revlist; $i++) {
                 my $commit = $revlist[$i];
-               my $ref = git_get_referencing($refs, $commit);
-               my %co = git_read_commit($commit);
+               my $ref = format_ref_marker($refs, $commit);
+               my %co = parse_commit($commit);
                 next if !%co;
                 next if !%co;
-               my %ad = date_str($co{'author_epoch'});
-               git_header_div('commit',
-                                                                        "<span class=\"age\">$co{'age_string'}</span>" .
-                                                                        esc_html($co{'title'}) . $ref,
-                                                                        $commit);
+               my %ad = parse_date($co{'author_epoch'});
+               git_print_header_div('commit',
+                              "<span class=\"age\">$co{'age_string'}</span>" .
+                              esc_html($co{'title'}) . $ref,
+                              $commit);
                 print "<div class=\"title_text\">\n" .
                       "<div class=\"log_link\">\n" .
                 print "<div class=\"title_text\">\n" .
                       "<div class=\"log_link\">\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$commit")}, "commitdiff") .
+                     $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") .
+                     " | " .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") .
                       "<br/>\n" .
                       "</div>\n" .
                       "<i>" . esc_html($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\n" .
                       "<br/>\n" .
                       "</div>\n" .
                       "<i>" . esc_html($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\n" .
-                     "</div>\n" .
-                     "<div class=\"log_body\">\n";
-               my $comment = $co{'comment'};
-               my $empty = 0;
-               foreach my $line (@$comment) {
-                       if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
-                               next;
-                       }
-                       if ($line eq "") {
-                               if ($empty) {
-                                       next;
-                               }
-                               $empty = 1;
-                       } else {
-                               $empty = 0;
-                       }
-                       print format_log_line_html($line) . "<br/>\n";
-               }
-               if (!$empty) {
-                       print "<br/>\n";
-               }
+                     "</div>\n";
+
+               print "<div class=\"log_body\">\n";
+               git_print_simplified_log($co{'comment'});
                 print "</div>\n";
         }
         git_footer_html();
  }
  
  sub git_commit {
                 print "</div>\n";
         }
         git_footer_html();
  }
  
  sub git_commit {
-       my %co = git_read_commit($hash);
+       my %co = parse_commit($hash);
         if (!%co) {
         if (!%co) {
-               die_error(undef, "Unknown commit object.");
+               die_error(undef, "Unknown commit object");
         }
         }
-       my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
-       my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
+       my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
+       my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
  
         my $parent = $co{'parent'};
         if (!defined $parent) {
                 $parent = "--root";
         }
  
         my $parent = $co{'parent'};
         if (!defined $parent) {
                 $parent = "--root";
         }
-       open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
-               or die_error(undef, "Open git-diff-tree failed.");
+       open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $parent, $hash
+               or die_error(undef, "Open git-diff-tree failed");
         my @difftree = map { chomp; $_ } <$fd>;
         my @difftree = map { chomp; $_ } <$fd>;
-       close $fd or die_error(undef, "Reading git-diff-tree failed.");
+       close $fd or die_error(undef, "Reading git-diff-tree failed");
  
         # 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 = read_info_ref();
-       my $ref = git_get_referencing($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 $formats_nav = '';
         if (defined $file_name && defined $co{'parent'}) {
                 my $parent = $co{'parent'};
         my $formats_nav = '';
         if (defined $file_name && defined $co{'parent'}) {
                 my $parent = $co{'parent'};
-               $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;hb=$parent;f=$file_name")}, "blame");
+               $formats_nav .=
+                       $cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
+                               "blame");
         }
         git_header_html(undef, $expires);
         }
         git_header_html(undef, $expires);
-       git_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
-                                                        $hash, $co{'tree'}, $hash,
-                                                        $formats_nav);
+       git_print_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
+                          $hash, $co{'tree'}, $hash,
+                          $formats_nav);
  
         if (defined $co{'parent'}) {
  
         if (defined $co{'parent'}) {
-               git_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
+               git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
         } else {
         } else {
-               git_header_div('tree', esc_html($co{'title'}) . $ref, $co{'tree'}, $hash);
+               git_print_header_div('tree', esc_html($co{'title'}) . $ref, $co{'tree'}, $hash);
         }
         print "<div class=\"title_text\">\n" .
               "<table cellspacing=\"0\">\n";
         }
         print "<div class=\"title_text\">\n" .
               "<table cellspacing=\"0\">\n";
@@ -1923,404 +2701,377 @@ 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 => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash"), class => "list"}, $co{'tree'}) .
-             "</td>" .
-             "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "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");
+       if ($have_snapshot) {
+               print " | " .
+                     $cgi->a({-href => href(action=>"snapshot", hash=>$hash)}, "snapshot");
+       }
+       print "</td>" .
               "</tr>\n";
         my $parents = $co{'parents'};
         foreach my $par (@$parents) {
                 print "<tr>" .
                       "<td>parent</td>" .
               "</tr>\n";
         my $parents = $co{'parents'};
         foreach my $par (@$parents) {
                 print "<tr>" .
                       "<td>parent</td>" .
-                     "<td class=\"sha1\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$par"), class => "list"}, $par) . "</td>" .
+                     "<td class=\"sha1\">" .
+                     $cgi->a({-href => href(action=>"commit", hash=>$par),
+                              class => "list"}, $par) .
+                     "</td>" .
                       "<td class=\"link\">" .
                       "<td class=\"link\">" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$par")}, "commit") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash;hp=$par")}, "commitdiff") .
+                     $cgi->a({-href => href(action=>"commit", hash=>$par)}, "commit") .
+                     " | " .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "commitdiff") .
                       "</td>" .
                       "</tr>\n";
         }
         print "</table>".
               "</div>\n";
                       "</td>" .
                       "</tr>\n";
         }
         print "</table>".
               "</div>\n";
+
         print "<div class=\"page_body\">\n";
         print "<div class=\"page_body\">\n";
-       my $comment = $co{'comment'};
-       my $empty = 0;
-       my $signed = 0;
-       foreach my $line (@$comment) {
-               # print only one empty line
-               if ($line eq "") {
-                       if ($empty || $signed) {
-                               next;
+       git_print_log($co{'comment'});
+       print "</div>\n";
+
+       git_difftree_body(\@difftree, $hash, $parent);
+
+       git_footer_html();
+}
+
+sub git_blobdiff {
+       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) { # try to find filename from $hash
+                       if ($hash !~ /[0-9a-fA-F]{40}/) {
+                               $hash = git_to_hash($hash);
                         }
                         }
-                       $empty = 1;
+               } 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 {
                 } else {
-                       $empty = 0;
+                       die_error('404 Not Found', "Missing one of the blob diff parameters");
                 }
                 }
-               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
-                       $signed = 1;
-                       print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
-               } else {
-                       $signed = 0;
-                       print format_log_line_html($line) . "<br/>\n";
+
+               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");
         }
         }
-       print "</div>\n";
-       print "<div class=\"list_head\">\n";
-       if ($#difftree > 10) {
-               print(($#difftree + 1) . " files changed:\n");
-       }
-       print "</div>\n";
-       print "<table class=\"diff_tree\">\n";
-       my $alternate = 0;
-       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}) (.)([0-9]{0,3})\t(.*)$/)) {
-                       next;
+
+       # 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;
                 }
                 }
-               my $from_mode = $1;
-               my $to_mode = $2;
-               my $from_id = $3;
-               my $to_id = $4;
-               my $status = $5;
-               my $similarity = $6;
-               my $file = validate_input(unquote($7));
-               if ($alternate) {
-                       print "<tr class=\"dark\">\n";
+
+               # 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 =
+                       $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)},
+                               "plain");
+               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 {
                 } else {
-                       print "<tr class=\"light\">\n";
+                       print "<div class=\"page_nav\"><br/>$formats_nav<br/></div>\n";
+                       print "<div class=\"title\">$hash vs $hash_parent</div>\n";
                 }
                 }
-               $alternate ^= 1;
-               if ($status eq "A") {
-                       my $mode_chng = "";
-                       if (S_ISREG(oct $to_mode)) {
-                               $mode_chng = sprintf(" with mode: %04o", (oct $to_mode) & 0777);
-                       }
-                       print "<td>" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)) . "</td>\n" .
-                             "<td><span class=\"file_status new\">[new " . file_type($to_mode) . "$mode_chng]</span></td>\n" .
-                             "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, "blob") . "</td>\n";
-               } elsif ($status eq "D") {
-                       print "<td>" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)) . "</td>\n" .
-                             "<td><span class=\"file_status deleted\">[deleted " . file_type($from_mode). "]</span></td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, "blob") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$hash;f=$file")}, "history") .
-                             "</td>\n"
-               } elsif ($status eq "M" || $status eq "T") {
-                       my $mode_chnge = "";
-                       if ($from_mode != $to_mode) {
-                               $mode_chnge = " <span class=\"file_status mode_chnge\">[changed";
-                               if (((oct $from_mode) & S_IFMT) != ((oct $to_mode) & S_IFMT)) {
-                                       $mode_chnge .= " from " . file_type($from_mode) . " to " . file_type($to_mode);
-                               }
-                               if (((oct $from_mode) & 0777) != ((oct $to_mode) & 0777)) {
-                                       if (S_ISREG($from_mode) && S_ISREG($to_mode)) {
-                                               $mode_chnge .= sprintf(" mode: %04o->%04o", (oct $from_mode) & 0777, (oct $to_mode) & 0777);
-                                       } elsif (S_ISREG($to_mode)) {
-                                               $mode_chnge .= sprintf(" mode: %04o", (oct $to_mode) & 0777);
-                                       }
-                               }
-                               $mode_chnge .= "]</span>\n";
-                       }
-                       print "<td>";
-                       if ($to_id ne $from_id) {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file));
-                       } else {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file));
-                       }
-                       print "</td>\n" .
-                             "<td>$mode_chnge</td>\n" .
-                             "<td class=\"link\">";
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, "blob");
-                       if ($to_id ne $from_id) {
-                               print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file")}, "diff");
-                       }
-                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$hash;f=$file")}, "history") . "\n";
-                       print "</td>\n";
-               } elsif ($status eq "R") {
-                       my ($from_file, $to_file) = split "\t", $file;
-                       my $mode_chng = "";
-                       if ($from_mode != $to_mode) {
-                               $mode_chng = sprintf(", mode: %04o", (oct $to_mode) & 0777);
-                       }
-                       print "<td>" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file"), -class => "list"}, esc_html($to_file)) . "</td>\n" .
-                             "<td><span class=\"file_status moved\">[moved from " .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file"), -class => "list"}, esc_html($from_file)) .
-                             " with " . (int $similarity) . "% similarity$mode_chng]</span></td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file")}, "blob");
-                       if ($to_id ne $from_id) {
-                               print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file")}, "diff");
-                       }
-                       print "</td>\n";
+               if (defined $file_name) {
+                       git_print_page_path($file_name, "blob", $hash_base);
+               } else {
+                       print "<div class=\"page_path\"></div>\n";
                 }
                 }
-               print "</tr>\n";
+
+       } elsif ($format eq 'plain') {
+               print $cgi->header(
+                       -type => 'text/plain',
+                       -charset => 'utf-8',
+                       -expires => $expires,
+                       -content_disposition => qq(inline; filename="${file_name}.patch"));
+
+               print "X-Git-Url: " . $cgi->self_url() . "\n\n";
+
+       } else {
+               die_error(undef, "Unknown blobdiff format");
         }
         }
-       print "</table>\n";
-       git_footer_html();
-}
  
  
-sub git_blobdiff {
-       mkdir($git_temp, 0700);
-       git_header_html();
-       if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
-               my $formats_nav =
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
-               git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
-               git_header_div('commit', esc_html($co{'title'}), $hash_base);
+       # 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 {
         } else {
-               print "<div class=\"page_nav\">\n" .
-                     "<br/><br/></div>\n" .
-                     "<div class=\"title\">$hash vs $hash_parent</div>\n";
-       }
-       git_print_page_path($file_name, "blob");
-       print "<div class=\"page_body\">\n" .
-             "<div class=\"diff_info\">blob:" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash_parent;hb=$hash_base;f=$file_name")}, $hash_parent) .
-             " -> blob:" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, $hash) .
-             "</div>\n";
-       git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash);
-       print "</div>";
-       git_footer_html();
+               while (my $line = <$fd>) {
+                       $line =~ s!a/($hash|$hash_parent)!a/$diffinfo{'from_file'}!g;
+                       $line =~ s!b/($hash|$hash_parent)!b/$diffinfo{'to_file'}!g;
+
+                       print $line;
+
+                       last if $line =~ m!^\+\+\+!;
+               }
+               local $/ = undef;
+               print <$fd>;
+               close $fd;
+       }
  }
  
  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 %co = git_read_commit($hash);
+       my $format = shift || 'html';
+       my %co = parse_commit($hash);
         if (!%co) {
         if (!%co) {
-               die_error(undef, "Unknown commit object.");
+               die_error(undef, "Unknown commit object");
         }
         if (!defined $hash_parent) {
         }
         if (!defined $hash_parent) {
-               $hash_parent = $co{'parent'};
+               $hash_parent = $co{'parent'} || '--root';
+       }
+
+       # read commitdiff
+       my $fd;
+       my @difftree;
+       if ($format eq 'html') {
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       "--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");
         }
         }
-       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.");
  
         # 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 = read_info_ref();
-       my $ref = git_get_referencing($refs, $co{'id'});
-       my $formats_nav =
-               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
-       git_header_html(undef, $expires);
-       git_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
-       git_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
-       print "<div class=\"page_body\">\n";
-       my $comment = $co{'comment'};
-       my $empty = 0;
-       my $signed = 0;
-       my @log = @$comment;
-       # remove first and empty lines after that
-       shift @log;
-       while (defined $log[0] && $log[0] eq "") {
-               shift @log;
-       }
-       foreach my $line (@log) {
-               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
-                       next;
-               }
-               if ($line eq "") {
-                       if ($empty) {
-                               next;
-                       }
-                       $empty = 1;
-               } else {
-                       $empty = 0;
-               }
-               print format_log_line_html($line) . "<br/>\n";
-       }
-       print "<br/>\n";
-       foreach my $line (@difftree) {
-               # ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M      ls-files.c'
-               # ':100644 100644 7f9281985086971d3877aca27704f2aaf9c448ce bc190ebc71bbd923f2b728e505408f5e54bd073a M      rev-tree.c'
-               $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/;
-               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 => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$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 => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$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 => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, $from_id) .
-                                     " -> " .
-                                     file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$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);
-       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 = read_info_ref("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)},
+                               "plain");
+
+               git_header_html(undef, $expires);
+               git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
+               git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
+               git_print_authorship(\%co);
+               print "<div class=\"page_body\">\n";
+               print "<div class=\"log\">\n";
+               git_print_simplified_log($co{'comment'}, 1); # skip title
+               print "</div>\n"; # class="log"
+
+       } 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 => qq(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 %co = git_read_commit($hash);
-       my %ad = date_str($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) {
-               $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/;
-               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) {
  }
  
  sub git_history {
         if (!defined $hash_base) {
-               $hash_base = git_read_head($project);
+               $hash_base = git_get_head_hash($project);
         }
         my $ftype;
         }
         my $ftype;
-       my %co = git_read_commit($hash_base);
+       my %co = parse_commit($hash_base);
         if (!%co) {
         if (!%co) {
-               die_error(undef, "Unknown commit object.");
+               die_error(undef, "Unknown commit object");
         }
         }
-       my $refs = read_info_ref();
+       my $refs = git_get_references();
         git_header_html();
         git_header_html();
-       git_page_nav('','', $hash_base,$co{'tree'},$hash_base);
-       git_header_div('commit', esc_html($co{'title'}), $hash_base);
+       git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base);
+       git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         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);
+       git_print_page_path($file_name, $ftype, $hash_base);
  
         open my $fd, "-|",
  
         open my $fd, "-|",
-               $GIT, "rev-list", "--full-history", $hash_base, "--", $file_name;
-       print "<table cellspacing=\"0\">\n";
-       my $alternate = 0;
-       while (my $line = <$fd>) {
-               if ($line =~ m/^([0-9a-fA-F]{40})/){
-                       my $commit = $1;
-                       my %co = git_read_commit($commit);
-                       if (!%co) {
-                               next;
-                       }
-                       my $ref = git_get_referencing($refs, $commit);
-                       if ($alternate) {
-                               print "<tr class=\"dark\">\n";
-                       } else {
-                               print "<tr class=\"light\">\n";
-                       }
-                       $alternate ^= 1;
-                       print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
-                             "<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 3)) . "</i></td>\n" .
-                             "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"}, "<b>" .
-                             esc_html(chop_str($co{'title'}, 50)) . "$ref</b>") . "</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$commit")}, "commitdiff") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$ftype;hb=$commit;f=$file_name")}, $ftype);
-                       my $blob = git_get_hash_by_path($hash_base, $file_name);
-                       my $blob_parent = git_get_hash_by_path($commit, $file_name);
-                       if (defined $blob && defined $blob_parent && $blob ne $blob_parent) {
-                               print " | " .
-                               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=$file_name")},
-                               "diff to current");
-                       }
-                       print "</td>\n" .
-                             "</tr>\n";
-               }
-       }
-       print "</table>\n";
+               git_cmd(), "rev-list", "--full-history", $hash_base, "--", $file_name;
+
+       git_history_body($fd, $refs, $hash_base, $ftype);
+
         close $fd;
         git_footer_html();
  }
  
  sub git_search {
         if (!defined $searchtext) {
         close $fd;
         git_footer_html();
  }
  
  sub git_search {
         if (!defined $searchtext) {
-               die_error("", "Text field empty.");
+               die_error(undef, "Text field empty");
         }
         if (!defined $hash) {
         }
         if (!defined $hash) {
-               $hash = git_read_head($project);
+               $hash = git_get_head_hash($project);
         }
         }
-       my %co = git_read_commit($hash);
+       my %co = parse_commit($hash);
         if (!%co) {
         if (!%co) {
-               die_error(undef, "Unknown commit object.");
+               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 :)
         }
         # 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 :)
@@ -2337,14 +3088,14 @@ sub git_search {
                 $pickaxe_search = 1;
         }
         git_header_html();
                 $pickaxe_search = 1;
         }
         git_header_html();
-       git_page_nav('','', $hash,$co{'tree'},$hash);
-       git_header_div('commit', esc_html($co{'title'}), $hash);
+       git_print_page_nav('','', $hash,$co{'tree'},$hash);
+       git_print_header_div('commit', esc_html($co{'title'}), $hash);
  
         print "<table cellspacing=\"0\">\n";
         my $alternate = 0;
         if ($commit_search) {
                 $/ = "\0";
  
         print "<table cellspacing=\"0\">\n";
         my $alternate = 0;
         if ($commit_search) {
                 $/ = "\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;
@@ -2356,7 +3107,7 @@ sub git_search {
                                 next;
                         }
                         my @commit_lines = split "\n", $commit_text;
                                 next;
                         }
                         my @commit_lines = split "\n", $commit_text;
-                       my %co = git_read_commit(undef, \@commit_lines);
+                       my %co = parse_commit(undef, \@commit_lines);
                         if (!%co) {
                                 next;
                         }
                         if (!%co) {
                                 next;
                         }
@@ -2369,7 +3120,8 @@ 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 => "$my_uri?" . esc_param("p=$project;a=commit;h=$co{'id'}"), -class => "list"}, "<b>" . esc_html(chop_str($co{'title'}, 50)) . "</b><br/>");
+                             $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), -class => "list subject"},
+                                      esc_html(chop_str($co{'title'}, 50)) . "<br/>");
                         my $comment = $co{'comment'};
                         foreach my $line (@$comment) {
                                 if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
                         my $comment = $co{'comment'};
                         foreach my $line (@$comment) {
                                 if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
@@ -2384,8 +3136,9 @@ sub git_search {
                         }
                         print "</td>\n" .
                               "<td class=\"link\">" .
                         }
                         print "</td>\n" .
                               "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$co{'id'}")}, "commit") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}")}, "tree");
+                             $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
+                             " | " .
+                             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
                         print "</td>\n" .
                               "</tr>\n";
                 }
                         print "</td>\n" .
                               "</tr>\n";
                 }
@@ -2394,7 +3147,9 @@ sub git_search {
  
         if ($pickaxe_search) {
                 $/ = "\n";
  
         if ($pickaxe_search) {
                 $/ = "\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>) {
@@ -2422,22 +3177,26 @@ 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 => "$my_uri?" . esc_param("p=$project;a=commit;h=$co{'id'}"), -class => "list"}, "<b>" .
-                                             esc_html(chop_str($co{'title'}, 50)) . "</b><br/>");
+                                             $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;
                                         while (my $setref = shift @files) {
                                                 my %set = %$setref;
-                                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$set{'id'};hb=$co{'id'};f=$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\">" .
                                                       "<br/>\n";
                                         }
                                         print "</td>\n" .
                                               "<td class=\"link\">" .
-                                             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$co{'id'}")}, "commit") .
-                                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}")}, "tree");
+                                             $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
+                                             " | " .
+                                             $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
                                         print "</td>\n" .
                                               "</tr>\n";
                                 }
                                         print "</td>\n" .
                                               "</tr>\n";
                                 }
-                               %co = git_read_commit($1);
+                               %co = parse_commit($1);
                         }
                 }
                 close $fd;
                         }
                 }
                 close $fd;
@@ -2447,33 +3206,33 @@ sub git_search {
  }
  
  sub git_shortlog {
  }
  
  sub git_shortlog {
-       my $head = git_read_head($project);
+       my $head = git_get_head_hash($project);
         if (!defined $hash) {
                 $hash = $head;
         }
         if (!defined $page) {
                 $page = 0;
         }
         if (!defined $hash) {
                 $hash = $head;
         }
         if (!defined $page) {
                 $page = 0;
         }
-       my $refs = read_info_ref();
+       my $refs = git_get_references();
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
  
         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
-               or die_error(undef, "Open git-rev-list failed.");
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash
+               or die_error(undef, "Open git-rev-list failed");
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
  
         my @revlist = map { chomp; $_ } <$fd>;
         close $fd;
  
-       my $paging_nav = git_get_paging_nav('shortlog', $hash, $head, $page, $#revlist);
+       my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, $#revlist);
         my $next_link = '';
         if ($#revlist >= (100 * ($page+1)-1)) {
                 $next_link =
         my $next_link = '';
         if ($#revlist >= (100 * ($page+1)-1)) {
                 $next_link =
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)),
+                       $cgi->a({-href => href(action=>"shortlog", hash=>$hash, page=>$page+1),
                                  -title => "Alt-n"}, "next");
         }
  
  
         git_header_html();
                                  -title => "Alt-n"}, "next");
         }
  
  
         git_header_html();
-       git_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
-       git_header_div('summary', $project);
+       git_print_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
+       git_print_header_div('summary', $project);
  
         git_shortlog_body(\@revlist, ($page * 100), $#revlist, $refs, $next_link);
  
  
         git_shortlog_body(\@revlist, ($page * 100), $#revlist, $refs, $next_link);
  
@@ -2485,30 +3244,35 @@ 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_read_head($project)
-               or die_error(undef, "Open git-rev-list failed.");
+       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>;
         my @revlist = map { chomp; $_ } <$fd>;
-       close $fd or die_error(undef, "Reading rev-list failed.");
+       close $fd or die_error(undef, "Reading git-rev-list failed");
         print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
         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];
-               my %co = git_read_commit($commit);
+               my %co = parse_commit($commit);
                 # we read 150, we always show 30 and the ones more recent than 48 hours
                 if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) {
                         last;
                 }
                 # we read 150, we always show 30 and the ones more recent than 48 hours
                 if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) {
                         last;
                 }
-               my %cd = date_str($co{'committer_epoch'});
-               open $fd, "-|", $GIT, "diff-tree", '-r', $co{'parent'}, $co{'id'} or next;
+               my %cd = parse_date($co{'committer_epoch'});
+               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'}) .
@@ -2542,25 +3306,27 @@ sub git_rss {
  }
  
  sub git_opml {
  }
  
  sub git_opml {
-       my @list = git_read_projects();
+       my @list = git_get_projects_list();
  
         print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
  
         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 Git 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;
-               my $head = git_read_head($proj{'path'});
+               my $head = git_get_head_hash($proj{'path'});
                 if (!defined $head) {
                         next;
                 }
                 if (!defined $head) {
                         next;
                 }
-               $ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
-               my %co = git_read_commit($head);
+               $git_dir = "$projectroot/$proj{'path'}";
+               my %co = parse_commit($head);
                 if (!%co) {
                         next;
                 }
                 if (!%co) {
                         next;
                 }
@@ -2570,7 +3336,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
  }
  }