2005-08-08 01:49:46 +08:00
|
|
|
#!/usr/bin/perl
|
|
|
|
|
2005-08-08 02:27:18 +08:00
|
|
|
# gitweb - simple web interface to track changes in git repositories
|
2005-08-08 01:56:59 +08:00
|
|
|
#
|
2006-05-22 20:30:47 +08:00
|
|
|
# (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>
|
|
|
|
# (C) 2005, Christian Gierke
|
2005-08-08 01:57:58 +08:00
|
|
|
#
|
2005-10-04 07:12:47 +08:00
|
|
|
# This program is licensed under the GPLv2
|
2005-08-08 01:49:46 +08:00
|
|
|
|
|
|
|
use strict;
|
|
|
|
use warnings;
|
2005-08-08 02:26:27 +08:00
|
|
|
use CGI qw(:standard :escapeHTML -nosticky);
|
2005-08-08 02:23:49 +08:00
|
|
|
use CGI::Util qw(unescape);
|
2005-08-08 01:49:46 +08:00
|
|
|
use CGI::Carp qw(fatalsToBrowser);
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
use Encode;
|
2005-08-08 02:21:04 +08:00
|
|
|
use Fcntl ':mode';
|
2006-08-01 10:18:34 +08:00
|
|
|
use File::Find qw();
|
2006-08-17 23:29:46 +08:00
|
|
|
use File::Basename qw(basename);
|
2005-11-23 11:26:40 +08:00
|
|
|
binmode STDOUT, ':utf8';
|
2005-08-08 01:49:46 +08:00
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $cgi = new CGI;
|
2006-08-03 04:50:20 +08:00
|
|
|
our $version = "++GIT_VERSION++";
|
2006-06-21 21:07:08 +08:00
|
|
|
our $my_url = $cgi->url();
|
|
|
|
our $my_uri = $cgi->url(-absolute => 1);
|
2005-08-08 02:05:15 +08:00
|
|
|
|
2006-07-13 06:55:10 +08:00
|
|
|
# core git executable to use
|
|
|
|
# this can just be "git" if your webserver has a sensible PATH
|
2006-08-03 04:50:20 +08:00
|
|
|
our $GIT = "++GIT_BINDIR++/git";
|
2006-06-21 15:48:04 +08:00
|
|
|
|
2005-08-08 02:21:04 +08:00
|
|
|
# absolute fs-path which will be prepended to the project path
|
2006-06-21 21:07:08 +08:00
|
|
|
#our $projectroot = "/pub/scm";
|
2006-08-03 04:50:20 +08:00
|
|
|
our $projectroot = "++GITWEB_PROJECTROOT++";
|
2005-08-08 02:21:04 +08:00
|
|
|
|
|
|
|
# location for temporary files needed for diffs
|
2006-06-21 21:07:08 +08:00
|
|
|
our $git_temp = "/tmp/gitweb";
|
2005-08-08 02:20:07 +08:00
|
|
|
|
2005-08-08 02:21:04 +08:00
|
|
|
# target of the home link on top of all pages
|
2006-08-17 06:28:39 +08:00
|
|
|
our $home_link = $my_uri || "/";
|
2005-08-08 02:21:04 +08:00
|
|
|
|
2006-08-15 06:50:49 +08:00
|
|
|
# string of the home link on top of all pages
|
|
|
|
our $home_link_str = "++GITWEB_HOME_LINK_STR++";
|
|
|
|
|
2006-07-12 04:10:26 +08:00
|
|
|
# name of your site or organization to appear in page titles
|
|
|
|
# replace this with something more descriptive for clearer bookmarks
|
2006-08-03 04:50:20 +08:00
|
|
|
our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";
|
2006-07-12 04:10:26 +08:00
|
|
|
|
2005-08-08 02:22:53 +08:00
|
|
|
# html text to include at home page
|
2006-08-03 04:50:20 +08:00
|
|
|
our $home_text = "++GITWEB_HOMETEXT++";
|
2005-08-08 02:22:53 +08:00
|
|
|
|
2006-06-17 17:23:56 +08:00
|
|
|
# URI of default stylesheet
|
2006-08-03 04:50:20 +08:00
|
|
|
our $stylesheet = "++GITWEB_CSS++";
|
2006-07-31 06:38:39 +08:00
|
|
|
# URI of GIT logo
|
2006-08-03 04:50:20 +08:00
|
|
|
our $logo = "++GITWEB_LOGO++";
|
2006-06-17 17:23:56 +08:00
|
|
|
|
2005-08-08 02:21:23 +08:00
|
|
|
# source of projects list
|
2006-08-03 04:50:20 +08:00
|
|
|
our $projects_list = "++GITWEB_LIST++";
|
2005-08-08 02:21:04 +08:00
|
|
|
|
2006-08-16 05:03:17 +08:00
|
|
|
# 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++");
|
|
|
|
|
2006-06-17 19:32:15 +08:00
|
|
|
# default blob_plain mimetype and default charset for text/plain blob
|
2006-06-21 21:07:08 +08:00
|
|
|
our $default_blob_plain_mimetype = 'text/plain';
|
|
|
|
our $default_text_plain_charset = undef;
|
2006-06-17 19:32:15 +08:00
|
|
|
|
2006-06-18 06:01:06 +08:00
|
|
|
# file to use for guessing MIME types before trying /etc/mime.types
|
|
|
|
# (relative to the current git repository)
|
2006-06-21 21:07:08 +08:00
|
|
|
our $mimetypes_file = undef;
|
2006-06-18 06:01:06 +08:00
|
|
|
|
2006-08-20 14:23:04 +08:00
|
|
|
# You define site-wide feature defaults here; override them with
|
|
|
|
# $GITWEB_CONFIG as necessary.
|
2006-08-22 22:52:50 +08:00
|
|
|
our %feature = (
|
|
|
|
# feature => {'sub' => feature-sub, 'override' => allow-override, 'default' => [ default options...]
|
|
|
|
# if feature is overridable, feature-sub will be called with default options;
|
|
|
|
# return value indicates if to enable specified feature
|
|
|
|
|
|
|
|
'blame' => {
|
|
|
|
'sub' => \&feature_blame,
|
|
|
|
'override' => 0,
|
|
|
|
'default' => [0]},
|
|
|
|
|
|
|
|
'snapshot' => {
|
|
|
|
'sub' => \&feature_snapshot,
|
|
|
|
'override' => 0,
|
|
|
|
# => [content-encoding, suffix, program]
|
|
|
|
'default' => ['x-gzip', 'gz', 'gzip']},
|
2006-08-20 14:23:04 +08:00
|
|
|
);
|
|
|
|
|
|
|
|
sub gitweb_check_feature {
|
|
|
|
my ($name) = @_;
|
|
|
|
return undef unless exists $feature{$name};
|
2006-08-22 22:52:50 +08:00
|
|
|
my ($sub, $override, @defaults) = (
|
|
|
|
$feature{$name}{'sub'},
|
|
|
|
$feature{$name}{'override'},
|
|
|
|
@{$feature{$name}{'default'}});
|
2006-08-20 14:23:04 +08:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2006-08-03 04:50:20 +08:00
|
|
|
our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
|
2006-08-03 03:23:34 +08:00
|
|
|
require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
|
|
|
|
|
|
|
|
# version of the core git binary
|
|
|
|
our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
|
|
|
|
|
|
|
|
$projects_list ||= $projectroot;
|
|
|
|
if (! -d $git_temp) {
|
2006-08-05 18:56:04 +08:00
|
|
|
mkdir($git_temp, 0700) || die_error(undef, "Couldn't mkdir $git_temp");
|
2006-08-03 03:23:34 +08:00
|
|
|
}
|
|
|
|
|
2006-08-05 18:55:20 +08:00
|
|
|
# ======================================================================
|
2005-08-08 02:21:23 +08:00
|
|
|
# input validation and dispatch
|
2006-06-21 21:07:08 +08:00
|
|
|
our $action = $cgi->param('a');
|
2005-08-08 02:21:23 +08:00
|
|
|
if (defined $action) {
|
2005-09-03 20:50:33 +08:00
|
|
|
if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid action parameter");
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
|
|
|
}
|
2005-08-08 01:59:24 +08:00
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
|
2006-08-06 19:25:41 +08:00
|
|
|
if (defined $project) {
|
|
|
|
$project =~ s|^/||;
|
|
|
|
$project =~ s|/$||;
|
2006-08-17 06:28:40 +08:00
|
|
|
$project = undef unless $project;
|
2006-08-06 19:25:41 +08:00
|
|
|
}
|
2006-08-17 06:28:40 +08:00
|
|
|
if (defined $project) {
|
2006-08-05 18:58:06 +08:00
|
|
|
if (!validate_input($project)) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid project parameter");
|
2005-08-08 02:17:42 +08:00
|
|
|
}
|
|
|
|
if (!(-d "$projectroot/$project")) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "No such directory");
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
|
|
|
if (!(-e "$projectroot/$project/HEAD")) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "No such project");
|
2005-08-08 02:17:42 +08:00
|
|
|
}
|
2005-08-08 02:27:38 +08:00
|
|
|
$ENV{'GIT_DIR'} = "$projectroot/$project";
|
2005-08-08 02:15:44 +08:00
|
|
|
}
|
2005-08-08 02:19:56 +08:00
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $file_name = $cgi->param('f');
|
2005-08-08 02:21:04 +08:00
|
|
|
if (defined $file_name) {
|
2006-08-05 18:58:06 +08:00
|
|
|
if (!validate_input($file_name)) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid file parameter");
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
2005-08-08 02:15:44 +08:00
|
|
|
}
|
2005-08-08 02:19:56 +08:00
|
|
|
|
2006-08-17 06:28:38 +08:00
|
|
|
our $file_parent = $cgi->param('fp');
|
|
|
|
if (defined $file_parent) {
|
|
|
|
if (!validate_input($file_parent)) {
|
|
|
|
die_error(undef, "Invalid file parent parameter");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $hash = $cgi->param('h');
|
2005-08-08 02:27:38 +08:00
|
|
|
if (defined $hash) {
|
2006-08-05 18:58:06 +08:00
|
|
|
if (!validate_input($hash)) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid hash parameter");
|
2005-08-08 02:27:38 +08:00
|
|
|
}
|
2005-08-08 02:15:44 +08:00
|
|
|
}
|
2005-08-08 02:19:56 +08:00
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $hash_parent = $cgi->param('hp');
|
2005-09-03 20:50:33 +08:00
|
|
|
if (defined $hash_parent) {
|
2006-08-05 18:58:06 +08:00
|
|
|
if (!validate_input($hash_parent)) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid hash parent parameter");
|
2005-09-03 20:50:33 +08:00
|
|
|
}
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $hash_base = $cgi->param('hb');
|
2005-09-03 20:50:33 +08:00
|
|
|
if (defined $hash_base) {
|
2006-08-05 18:58:06 +08:00
|
|
|
if (!validate_input($hash_base)) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid hash base parameter");
|
2005-09-03 20:50:33 +08:00
|
|
|
}
|
2005-08-08 02:15:44 +08:00
|
|
|
}
|
2005-08-08 02:19:56 +08:00
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $page = $cgi->param('pg');
|
2005-08-08 02:26:49 +08:00
|
|
|
if (defined $page) {
|
2005-09-03 20:50:33 +08:00
|
|
|
if ($page =~ m/[^0-9]$/) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid page parameter");
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
2005-08-08 02:14:48 +08:00
|
|
|
}
|
2005-08-08 01:57:58 +08:00
|
|
|
|
2006-06-21 21:07:08 +08:00
|
|
|
our $searchtext = $cgi->param('s');
|
2005-08-08 02:26:27 +08:00
|
|
|
if (defined $searchtext) {
|
|
|
|
if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Invalid search parameter");
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
|
|
|
$searchtext = quotemeta $searchtext;
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# dispatch
|
2006-08-01 05:46:25 +08:00
|
|
|
my %actions = (
|
|
|
|
"blame" => \&git_blame2,
|
|
|
|
"blobdiff" => \&git_blobdiff,
|
|
|
|
"blobdiff_plain" => \&git_blobdiff_plain,
|
|
|
|
"blob" => \&git_blob,
|
|
|
|
"blob_plain" => \&git_blob_plain,
|
|
|
|
"commitdiff" => \&git_commitdiff,
|
|
|
|
"commitdiff_plain" => \&git_commitdiff_plain,
|
|
|
|
"commit" => \&git_commit,
|
|
|
|
"heads" => \&git_heads,
|
|
|
|
"history" => \&git_history,
|
|
|
|
"log" => \&git_log,
|
|
|
|
"rss" => \&git_rss,
|
|
|
|
"search" => \&git_search,
|
|
|
|
"shortlog" => \&git_shortlog,
|
|
|
|
"summary" => \&git_summary,
|
|
|
|
"tag" => \&git_tag,
|
|
|
|
"tags" => \&git_tags,
|
|
|
|
"tree" => \&git_tree,
|
2006-08-17 23:29:46 +08:00
|
|
|
"snapshot" => \&git_snapshot,
|
2006-08-22 22:59:20 +08:00
|
|
|
# those below don't need $project
|
|
|
|
"opml" => \&git_opml,
|
|
|
|
"project_list" => \&git_project_list,
|
2006-08-01 05:46:25 +08:00
|
|
|
);
|
|
|
|
|
2006-08-22 22:59:20 +08:00
|
|
|
if (defined $project) {
|
|
|
|
$action ||= 'summary';
|
|
|
|
} else {
|
|
|
|
$action ||= 'project_list';
|
|
|
|
}
|
2006-08-01 05:46:25 +08:00
|
|
|
if (!defined($actions{$action})) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Unknown action");
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
2006-08-01 05:46:25 +08:00
|
|
|
$actions{$action}->();
|
|
|
|
exit;
|
2005-08-08 02:21:23 +08:00
|
|
|
|
2006-08-16 06:23:50 +08:00
|
|
|
## ======================================================================
|
|
|
|
## action links
|
|
|
|
|
|
|
|
sub href(%) {
|
2006-08-23 01:05:25 +08:00
|
|
|
my %params = @_;
|
|
|
|
|
|
|
|
my @mapping = (
|
2006-08-16 06:23:50 +08:00
|
|
|
action => "a",
|
|
|
|
project => "p",
|
|
|
|
file_name => "f",
|
2006-08-17 06:28:38 +08:00
|
|
|
file_parent => "fp",
|
2006-08-16 06:23:50 +08:00
|
|
|
hash => "h",
|
|
|
|
hash_parent => "hp",
|
|
|
|
hash_base => "hb",
|
|
|
|
page => "pg",
|
|
|
|
searchtext => "s",
|
|
|
|
);
|
2006-08-23 01:05:25 +08:00
|
|
|
my %mapping = @mapping;
|
2006-08-16 06:23:50 +08:00
|
|
|
|
|
|
|
$params{"project"} ||= $project;
|
|
|
|
|
2006-08-23 01:05:25 +08:00
|
|
|
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);
|
2006-08-16 06:23:50 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ======================================================================
|
|
|
|
## validation, quoting/unquoting and escaping
|
|
|
|
|
|
|
|
sub validate_input {
|
|
|
|
my $input = shift;
|
|
|
|
|
|
|
|
if ($input =~ m/^[0-9a-fA-F]{40}$/) {
|
|
|
|
return $input;
|
|
|
|
}
|
|
|
|
if ($input =~ m/(^|\/)(|\.|\.\.)($|\/)/) {
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
if ($input =~ m/[^a-zA-Z0-9_\x80-\xff\ \t\.\/\-\+\#\~\%]/) {
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
return $input;
|
|
|
|
}
|
|
|
|
|
2005-11-24 23:56:55 +08:00
|
|
|
# quote unsafe chars, but keep the slash, even when it's not
|
|
|
|
# correct, but quoted slashes look too horrible in bookmarks
|
|
|
|
sub esc_param {
|
2005-11-14 12:47:18 +08:00
|
|
|
my $str = shift;
|
2005-11-24 23:56:55 +08:00
|
|
|
$str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
|
2005-11-14 13:10:07 +08:00
|
|
|
$str =~ s/\+/%2B/g;
|
2005-11-14 22:15:12 +08:00
|
|
|
$str =~ s/ /\+/g;
|
2005-11-14 12:47:18 +08:00
|
|
|
return $str;
|
|
|
|
}
|
|
|
|
|
2005-11-24 23:56:55 +08:00
|
|
|
# replace invalid utf8 character with SUBSTITUTION sequence
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
sub esc_html {
|
|
|
|
my $str = shift;
|
|
|
|
$str = decode("utf8", $str, Encode::FB_DEFAULT);
|
2005-11-23 11:26:40 +08:00
|
|
|
$str = escapeHTML($str);
|
2006-07-30 21:02:27 +08:00
|
|
|
$str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
return $str;
|
|
|
|
}
|
|
|
|
|
2005-11-24 23:56:55 +08:00
|
|
|
# git may return quoted and escaped filenames
|
|
|
|
sub unquote {
|
|
|
|
my $str = shift;
|
|
|
|
if ($str =~ m/^"(.*)"$/) {
|
|
|
|
$str = $1;
|
|
|
|
$str =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
|
|
|
|
}
|
|
|
|
return $str;
|
|
|
|
}
|
|
|
|
|
2006-08-06 08:08:31 +08:00
|
|
|
# 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;
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ----------------------------------------------------------------------
|
|
|
|
## HTML aware string manipulation
|
|
|
|
|
|
|
|
sub chop_str {
|
|
|
|
my $str = shift;
|
|
|
|
my $len = shift;
|
|
|
|
my $add_len = shift || 10;
|
|
|
|
|
|
|
|
# allow only $len chars, but don't cut a word if it would fit in $add_len
|
|
|
|
# if it doesn't fit, cut it if it's still longer than the dots we would add
|
|
|
|
$str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,$add_len})(.*)/;
|
|
|
|
my $body = $1;
|
|
|
|
my $tail = $2;
|
|
|
|
if (length($tail) > 4) {
|
|
|
|
$tail = " ...";
|
|
|
|
$body =~ s/&[^;]*$//; # remove chopped character entities
|
|
|
|
}
|
|
|
|
return "$body$tail";
|
|
|
|
}
|
|
|
|
|
|
|
|
## ----------------------------------------------------------------------
|
|
|
|
## functions returning short strings
|
|
|
|
|
2006-06-20 22:58:12 +08:00
|
|
|
# CSS class for given age value (in seconds)
|
|
|
|
sub age_class {
|
|
|
|
my $age = shift;
|
|
|
|
|
|
|
|
if ($age < 60*60*2) {
|
|
|
|
return "age0";
|
|
|
|
} elsif ($age < 60*60*24*2) {
|
|
|
|
return "age1";
|
|
|
|
} else {
|
|
|
|
return "age2";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# convert age in seconds to "nn units ago" string
|
|
|
|
sub age_string {
|
|
|
|
my $age = shift;
|
|
|
|
my $age_str;
|
2005-08-08 02:15:44 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
if ($age > 60*60*24*365*2) {
|
|
|
|
$age_str = (int $age/60/60/24/365);
|
|
|
|
$age_str .= " years ago";
|
|
|
|
} elsif ($age > 60*60*24*(365/12)*2) {
|
|
|
|
$age_str = int $age/60/60/24/(365/12);
|
|
|
|
$age_str .= " months ago";
|
|
|
|
} elsif ($age > 60*60*24*7*2) {
|
|
|
|
$age_str = int $age/60/60/24/7;
|
|
|
|
$age_str .= " weeks ago";
|
|
|
|
} elsif ($age > 60*60*24*2) {
|
|
|
|
$age_str = int $age/60/60/24;
|
|
|
|
$age_str .= " days ago";
|
|
|
|
} elsif ($age > 60*60*2) {
|
|
|
|
$age_str = int $age/60/60;
|
|
|
|
$age_str .= " hours ago";
|
|
|
|
} elsif ($age > 60*2) {
|
|
|
|
$age_str = int $age/60;
|
|
|
|
$age_str .= " min ago";
|
|
|
|
} elsif ($age > 2) {
|
|
|
|
$age_str = int $age;
|
|
|
|
$age_str .= " sec ago";
|
2006-07-11 18:19:34 +08:00
|
|
|
} else {
|
2006-08-01 03:22:15 +08:00
|
|
|
$age_str .= " right now";
|
2005-08-08 01:52:52 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
return $age_str;
|
2005-08-08 01:49:46 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# convert file mode in octal to symbolic file mode string
|
|
|
|
sub mode_str {
|
|
|
|
my $mode = oct shift;
|
|
|
|
|
|
|
|
if (S_ISDIR($mode & S_IFMT)) {
|
|
|
|
return 'drwxr-xr-x';
|
|
|
|
} elsif (S_ISLNK($mode)) {
|
|
|
|
return 'lrwxrwxrwx';
|
|
|
|
} elsif (S_ISREG($mode)) {
|
|
|
|
# git cares only about the executable bit
|
|
|
|
if ($mode & S_IXUSR) {
|
|
|
|
return '-rwxr-xr-x';
|
|
|
|
} else {
|
|
|
|
return '-rw-r--r--';
|
|
|
|
};
|
2005-08-08 02:27:18 +08:00
|
|
|
} else {
|
2006-08-01 03:22:15 +08:00
|
|
|
return '----------';
|
2005-08-08 02:13:02 +08:00
|
|
|
}
|
2005-08-08 01:49:46 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# convert file mode in octal to file type string
|
|
|
|
sub file_type {
|
|
|
|
my $mode = oct shift;
|
2005-08-08 02:17:19 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
if (S_ISDIR($mode & S_IFMT)) {
|
|
|
|
return "directory";
|
|
|
|
} elsif (S_ISLNK($mode)) {
|
|
|
|
return "symlink";
|
|
|
|
} elsif (S_ISREG($mode)) {
|
|
|
|
return "file";
|
|
|
|
} else {
|
|
|
|
return "unknown";
|
|
|
|
}
|
2005-08-08 02:15:44 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ----------------------------------------------------------------------
|
|
|
|
## functions returning short HTML fragments, or transforming HTML fragments
|
|
|
|
## which don't beling to other sections
|
2006-07-30 20:59:57 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# format line of commit message or tag comment
|
|
|
|
sub format_log_line_html {
|
|
|
|
my $line = shift;
|
2006-07-30 20:59:57 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
$line = esc_html($line);
|
|
|
|
$line =~ s/ / /g;
|
|
|
|
if ($line =~ m/([0-9a-fA-F]{40})/) {
|
|
|
|
my $hash_text = $1;
|
|
|
|
if (git_get_type($hash_text) eq "commit") {
|
2006-08-22 22:52:50 +08:00
|
|
|
my $link =
|
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$hash_text),
|
|
|
|
-class => "text"}, $hash_text);
|
2006-08-01 03:22:15 +08:00
|
|
|
$line =~ s/$hash_text/$link/;
|
2006-07-30 20:59:57 +08:00
|
|
|
}
|
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
return $line;
|
2006-07-30 20:59:57 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# format marker of refs pointing to given object
|
2006-08-14 08:05:47 +08:00
|
|
|
sub format_ref_marker {
|
2006-08-01 03:22:15 +08:00
|
|
|
my ($refs, $id) = @_;
|
2006-08-14 08:14:20 +08:00
|
|
|
my $markers = '';
|
2006-07-31 02:32:01 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined $refs->{$id}) {
|
2006-08-14 08:14:20 +08:00
|
|
|
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>';
|
2006-08-01 03:22:15 +08:00
|
|
|
} else {
|
|
|
|
return "";
|
|
|
|
}
|
2006-07-31 02:32:01 +08:00
|
|
|
}
|
|
|
|
|
2006-08-14 08:08:27 +08:00
|
|
|
# format, perhaps shortened and with markers, title line
|
|
|
|
sub format_subject_html {
|
2006-08-16 06:24:30 +08:00
|
|
|
my ($long, $short, $href, $extra) = @_;
|
2006-08-14 08:08:27 +08:00
|
|
|
$extra = '' unless defined($extra);
|
|
|
|
|
|
|
|
if (length($short) < length($long)) {
|
2006-08-22 18:02:48 +08:00
|
|
|
return $cgi->a({-href => $href, -class => "list subject",
|
2006-08-16 06:24:30 +08:00
|
|
|
-title => $long},
|
2006-08-14 08:08:27 +08:00
|
|
|
esc_html($short) . $extra);
|
|
|
|
} else {
|
2006-08-22 18:02:48 +08:00
|
|
|
return $cgi->a({-href => $href, -class => "list subject"},
|
2006-08-14 08:08:27 +08:00
|
|
|
esc_html($long) . $extra);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
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 "\\") {
|
2006-08-24 07:58:49 +08:00
|
|
|
$diff_class = " incomplete";
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
}
|
|
|
|
$line = untabify($line);
|
|
|
|
return "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ----------------------------------------------------------------------
|
|
|
|
## git utility subroutines, invoking git commands
|
2005-08-08 02:21:46 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# get HEAD ref of given project as hash
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_get_head_hash {
|
2006-01-09 20:13:39 +08:00
|
|
|
my $project = shift;
|
|
|
|
my $oENV = $ENV{'GIT_DIR'};
|
|
|
|
my $retval = undef;
|
|
|
|
$ENV{'GIT_DIR'} = "$projectroot/$project";
|
2006-07-13 06:55:10 +08:00
|
|
|
if (open my $fd, "-|", $GIT, "rev-parse", "--verify", "HEAD") {
|
2006-01-09 20:13:39 +08:00
|
|
|
my $head = <$fd>;
|
|
|
|
close $fd;
|
2006-01-17 10:50:20 +08:00
|
|
|
if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) {
|
|
|
|
$retval = $1;
|
2006-01-09 20:13:39 +08:00
|
|
|
}
|
|
|
|
}
|
2006-01-17 10:50:20 +08:00
|
|
|
if (defined $oENV) {
|
|
|
|
$ENV{'GIT_DIR'} = $oENV;
|
|
|
|
}
|
2006-01-09 20:13:39 +08:00
|
|
|
return $retval;
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
# get type of given object
|
|
|
|
sub git_get_type {
|
|
|
|
my $hash = shift;
|
|
|
|
|
|
|
|
open my $fd, "-|", $GIT, "cat-file", '-t', $hash or return;
|
|
|
|
my $type = <$fd>;
|
|
|
|
close $fd or return;
|
|
|
|
chomp $type;
|
|
|
|
return $type;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub git_get_project_config {
|
2006-08-20 14:23:04 +08:00
|
|
|
my ($key, $type) = @_;
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
return unless ($key);
|
|
|
|
$key =~ s/^gitweb\.//;
|
|
|
|
return if ($key =~ m/\W/);
|
|
|
|
|
2006-08-20 14:23:04 +08:00
|
|
|
my @x = ($GIT, 'repo-config');
|
|
|
|
if (defined $type) { push @x, $type; }
|
|
|
|
push @x, "--get";
|
|
|
|
push @x, "gitweb.$key";
|
|
|
|
my $val = qx(@x);
|
|
|
|
chomp $val;
|
2006-08-01 03:22:15 +08:00
|
|
|
return ($val);
|
|
|
|
}
|
|
|
|
|
|
|
|
# get hash of given path at given ref
|
|
|
|
sub git_get_hash_by_path {
|
|
|
|
my $base = shift;
|
|
|
|
my $path = shift || return undef;
|
|
|
|
|
|
|
|
my $tree = $base;
|
|
|
|
|
|
|
|
open my $fd, "-|", $GIT, "ls-tree", $base, "--", $path
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-ls-tree failed");
|
2006-08-01 03:22:15 +08:00
|
|
|
my $line = <$fd>;
|
|
|
|
close $fd or return undef;
|
|
|
|
|
|
|
|
#'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
|
|
|
|
$line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
|
|
|
|
return $3;
|
|
|
|
}
|
|
|
|
|
|
|
|
## ......................................................................
|
|
|
|
## git utility functions, directly accessing git repository
|
|
|
|
|
|
|
|
# assumes that PATH is not symref
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_get_hash_by_ref {
|
2005-08-08 02:08:03 +08:00
|
|
|
my $path = shift;
|
2005-08-08 02:21:23 +08:00
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
open my $fd, "$projectroot/$path" or return undef;
|
2005-08-08 02:02:47 +08:00
|
|
|
my $head = <$fd>;
|
|
|
|
close $fd;
|
|
|
|
chomp $head;
|
2005-08-08 02:21:04 +08:00
|
|
|
if ($head =~ m/^[0-9a-fA-F]{40}$/) {
|
|
|
|
return $head;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_get_project_description {
|
2005-08-08 02:21:04 +08:00
|
|
|
my $path = shift;
|
2005-08-08 02:21:23 +08:00
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
open my $fd, "$projectroot/$path/description" or return undef;
|
2005-08-08 02:21:04 +08:00
|
|
|
my $descr = <$fd>;
|
|
|
|
close $fd;
|
|
|
|
chomp $descr;
|
|
|
|
return $descr;
|
2005-08-08 02:02:47 +08:00
|
|
|
}
|
|
|
|
|
2006-08-16 20:50:34 +08:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_get_projects_list {
|
2006-08-01 03:22:15 +08:00
|
|
|
my @list;
|
|
|
|
|
|
|
|
if (-d $projects_list) {
|
|
|
|
# search in directory
|
|
|
|
my $dir = $projects_list;
|
|
|
|
opendir my ($dh), $dir or return undef;
|
|
|
|
while (my $dir = readdir($dh)) {
|
|
|
|
if (-e "$projectroot/$dir/HEAD") {
|
|
|
|
my $pr = {
|
|
|
|
path => $dir,
|
|
|
|
};
|
|
|
|
push @list, $pr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
closedir($dh);
|
|
|
|
} elsif (-f $projects_list) {
|
|
|
|
# read from file(url-encoded):
|
|
|
|
# 'git%2Fgit.git Linus+Torvalds'
|
|
|
|
# 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
|
|
|
|
# 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
|
|
|
|
open my ($fd), $projects_list or return undef;
|
|
|
|
while (my $line = <$fd>) {
|
|
|
|
chomp $line;
|
|
|
|
my ($path, $owner) = split ' ', $line;
|
|
|
|
$path = unescape($path);
|
|
|
|
$owner = unescape($owner);
|
|
|
|
if (!defined $path) {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
if (-e "$projectroot/$path/HEAD") {
|
|
|
|
my $pr = {
|
|
|
|
path => $path,
|
|
|
|
owner => decode("utf8", $owner, Encode::FB_DEFAULT),
|
|
|
|
};
|
|
|
|
push @list, $pr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
close $fd;
|
|
|
|
}
|
|
|
|
@list = sort {$a->{'path'} cmp $b->{'path'}} @list;
|
|
|
|
return @list;
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:10:06 +08:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_get_references {
|
2006-08-01 03:22:15 +08:00
|
|
|
my $type = shift || "";
|
|
|
|
my %refs;
|
2006-08-14 08:14:20 +08:00
|
|
|
my $fd;
|
2006-08-01 03:22:15 +08:00
|
|
|
# 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
|
|
|
|
# c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
|
2006-08-14 08:14:20 +08:00
|
|
|
if (-f "$projectroot/$project/info/refs") {
|
|
|
|
open $fd, "$projectroot/$project/info/refs"
|
|
|
|
or return;
|
|
|
|
} else {
|
|
|
|
open $fd, "-|", $GIT, "ls-remote", "."
|
|
|
|
or return;
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
while (my $line = <$fd>) {
|
|
|
|
chomp $line;
|
2006-08-14 08:14:20 +08:00
|
|
|
if ($line =~ m/^([0-9a-fA-F]{40})\trefs\/($type\/?[^\^]+)/) {
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined $refs{$1}) {
|
2006-08-14 08:14:20 +08:00
|
|
|
push @{$refs{$1}}, $2;
|
2006-08-01 03:22:15 +08:00
|
|
|
} else {
|
2006-08-14 08:14:20 +08:00
|
|
|
$refs{$1} = [ $2 ];
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
close $fd or return;
|
|
|
|
return \%refs;
|
|
|
|
}
|
|
|
|
|
|
|
|
## ----------------------------------------------------------------------
|
|
|
|
## parse to hash functions
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub parse_date {
|
2006-08-01 03:22:15 +08:00
|
|
|
my $epoch = shift;
|
|
|
|
my $tz = shift || "-0000";
|
|
|
|
|
|
|
|
my %date;
|
|
|
|
my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
|
|
|
|
my @days = ("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");
|
|
|
|
my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($epoch);
|
|
|
|
$date{'hour'} = $hour;
|
|
|
|
$date{'minute'} = $min;
|
|
|
|
$date{'mday'} = $mday;
|
|
|
|
$date{'day'} = $days[$wday];
|
|
|
|
$date{'month'} = $months[$mon];
|
2006-08-22 22:52:50 +08:00
|
|
|
$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;
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
$tz =~ m/^([+\-][0-9][0-9])([0-9][0-9])$/;
|
|
|
|
my $local = $epoch + ((int $1 + ($2/60)) * 3600);
|
|
|
|
($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($local);
|
|
|
|
$date{'hour_local'} = $hour;
|
|
|
|
$date{'minute_local'} = $min;
|
|
|
|
$date{'tz_local'} = $tz;
|
|
|
|
return %date;
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub parse_tag {
|
2005-08-08 02:23:12 +08:00
|
|
|
my $tag_id = shift;
|
|
|
|
my %tag;
|
2005-08-08 02:28:53 +08:00
|
|
|
my @comment;
|
2005-08-08 02:23:12 +08:00
|
|
|
|
gitweb: Use list for of open for running git commands, thorougly.
Use list form of open for running git commands and reading their
output through pipe, for example
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash
instead of
open my $fd, "-|", "$GIT rev-list --header --parents $hash"
Single letter options use ' instead of " as quotes, according to style
used in list form of magic "-|" open.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-31 09:28:34 +08:00
|
|
|
open my $fd, "-|", $GIT, "cat-file", "tag", $tag_id or return;
|
2005-08-08 02:28:53 +08:00
|
|
|
$tag{'id'} = $tag_id;
|
2005-08-08 02:23:12 +08:00
|
|
|
while (my $line = <$fd>) {
|
|
|
|
chomp $line;
|
|
|
|
if ($line =~ m/^object ([0-9a-fA-F]{40})$/) {
|
|
|
|
$tag{'object'} = $1;
|
2005-08-08 02:25:54 +08:00
|
|
|
} elsif ($line =~ m/^type (.+)$/) {
|
2005-08-08 02:23:12 +08:00
|
|
|
$tag{'type'} = $1;
|
2005-08-08 02:25:54 +08:00
|
|
|
} elsif ($line =~ m/^tag (.+)$/) {
|
2005-08-08 02:23:12 +08:00
|
|
|
$tag{'name'} = $1;
|
2005-08-08 02:28:53 +08:00
|
|
|
} elsif ($line =~ m/^tagger (.*) ([0-9]+) (.*)$/) {
|
|
|
|
$tag{'author'} = $1;
|
|
|
|
$tag{'epoch'} = $2;
|
|
|
|
$tag{'tz'} = $3;
|
|
|
|
} elsif ($line =~ m/--BEGIN/) {
|
|
|
|
push @comment, $line;
|
|
|
|
last;
|
|
|
|
} elsif ($line eq "") {
|
|
|
|
last;
|
2005-08-08 02:23:12 +08:00
|
|
|
}
|
|
|
|
}
|
2005-08-08 02:28:53 +08:00
|
|
|
push @comment, <$fd>;
|
|
|
|
$tag{'comment'} = \@comment;
|
2005-08-08 02:26:27 +08:00
|
|
|
close $fd or return;
|
2005-08-08 02:23:12 +08:00
|
|
|
if (!defined $tag{'name'}) {
|
|
|
|
return
|
|
|
|
};
|
|
|
|
return %tag
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub parse_commit {
|
2005-08-08 02:26:27 +08:00
|
|
|
my $commit_id = shift;
|
|
|
|
my $commit_text = shift;
|
|
|
|
|
|
|
|
my @commit_lines;
|
2005-08-08 02:03:14 +08:00
|
|
|
my %co;
|
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
if (defined $commit_text) {
|
|
|
|
@commit_lines = @$commit_text;
|
|
|
|
} else {
|
2005-09-13 08:21:59 +08:00
|
|
|
$/ = "\0";
|
2006-08-22 22:52:50 +08:00
|
|
|
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", "--max-count=1", $commit_id
|
|
|
|
or return;
|
2005-09-13 08:21:59 +08:00
|
|
|
@commit_lines = split '\n', <$fd>;
|
2005-08-08 02:26:27 +08:00
|
|
|
close $fd or return;
|
2005-09-13 08:21:59 +08:00
|
|
|
$/ = "\n";
|
|
|
|
pop @commit_lines;
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
2005-09-13 08:21:59 +08:00
|
|
|
my $header = shift @commit_lines;
|
|
|
|
if (!($header =~ m/^[0-9a-fA-F]{40}/)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
($co{'id'}, my @parents) = split ' ', $header;
|
|
|
|
$co{'parents'} = \@parents;
|
|
|
|
$co{'parent'} = $parents[0];
|
2005-08-08 02:26:27 +08:00
|
|
|
while (my $line = shift @commit_lines) {
|
2005-08-08 02:21:04 +08:00
|
|
|
last if $line eq "\n";
|
2005-08-08 02:25:54 +08:00
|
|
|
if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
|
2005-08-08 02:03:14 +08:00
|
|
|
$co{'tree'} = $1;
|
2005-08-08 02:06:09 +08:00
|
|
|
} elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
|
2005-08-08 02:03:52 +08:00
|
|
|
$co{'author'} = $1;
|
2005-08-08 02:13:11 +08:00
|
|
|
$co{'author_epoch'} = $2;
|
|
|
|
$co{'author_tz'} = $3;
|
2005-08-08 02:26:03 +08:00
|
|
|
if ($co{'author'} =~ m/^([^<]+) </) {
|
|
|
|
$co{'author_name'} = $1;
|
|
|
|
} else {
|
|
|
|
$co{'author_name'} = $co{'author'};
|
|
|
|
}
|
2005-08-08 02:08:29 +08:00
|
|
|
} elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
|
|
|
|
$co{'committer'} = $1;
|
2005-08-08 02:13:11 +08:00
|
|
|
$co{'committer_epoch'} = $2;
|
|
|
|
$co{'committer_tz'} = $3;
|
2005-08-08 02:09:33 +08:00
|
|
|
$co{'committer_name'} = $co{'committer'};
|
|
|
|
$co{'committer_name'} =~ s/ <.*//;
|
2005-08-08 02:03:14 +08:00
|
|
|
}
|
|
|
|
}
|
2005-08-08 02:23:12 +08:00
|
|
|
if (!defined $co{'tree'}) {
|
2005-09-13 08:21:59 +08:00
|
|
|
return;
|
2005-08-08 02:23:12 +08:00
|
|
|
};
|
2005-09-13 08:21:59 +08:00
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
foreach my $title (@commit_lines) {
|
2005-12-07 23:32:51 +08:00
|
|
|
$title =~ s/^ //;
|
2005-08-08 02:26:27 +08:00
|
|
|
if ($title ne "") {
|
2005-08-31 09:54:45 +08:00
|
|
|
$co{'title'} = chop_str($title, 80, 5);
|
2005-08-08 02:26:27 +08:00
|
|
|
# remove leading stuff of merges to make the interesting part visible
|
|
|
|
if (length($title) > 50) {
|
|
|
|
$title =~ s/^Automatic //;
|
|
|
|
$title =~ s/^merge (of|with) /Merge ... /i;
|
|
|
|
if (length($title) > 50) {
|
|
|
|
$title =~ s/(http|rsync):\/\///;
|
|
|
|
}
|
|
|
|
if (length($title) > 50) {
|
|
|
|
$title =~ s/(master|www|rsync)\.//;
|
|
|
|
}
|
|
|
|
if (length($title) > 50) {
|
|
|
|
$title =~ s/kernel.org:?//;
|
|
|
|
}
|
|
|
|
if (length($title) > 50) {
|
|
|
|
$title =~ s/\/pub\/scm//;
|
|
|
|
}
|
|
|
|
}
|
2005-08-31 09:54:45 +08:00
|
|
|
$co{'title_short'} = chop_str($title, 50, 5);
|
2005-08-08 02:26:27 +08:00
|
|
|
last;
|
|
|
|
}
|
|
|
|
}
|
2005-09-13 08:21:59 +08:00
|
|
|
# remove added spaces
|
|
|
|
foreach my $line (@commit_lines) {
|
|
|
|
$line =~ s/^ //;
|
|
|
|
}
|
|
|
|
$co{'comment'} = \@commit_lines;
|
2005-08-08 02:17:00 +08:00
|
|
|
|
|
|
|
my $age = time - $co{'committer_epoch'};
|
|
|
|
$co{'age'} = $age;
|
2005-08-08 02:29:03 +08:00
|
|
|
$co{'age_string'} = age_string($age);
|
2005-08-08 02:27:27 +08:00
|
|
|
my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($co{'committer_epoch'});
|
|
|
|
if ($age > 60*60*24*7*2) {
|
2005-08-08 02:28:01 +08:00
|
|
|
$co{'age_string_date'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday;
|
2005-08-08 02:27:27 +08:00
|
|
|
$co{'age_string_age'} = $co{'age_string'};
|
|
|
|
} else {
|
|
|
|
$co{'age_string_date'} = $co{'age_string'};
|
2005-08-08 02:28:01 +08:00
|
|
|
$co{'age_string_age'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday;
|
2005-08-08 02:27:27 +08:00
|
|
|
}
|
2005-08-08 02:03:14 +08:00
|
|
|
return %co;
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:07:00 +08:00
|
|
|
# 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;
|
|
|
|
}
|
|
|
|
|
2006-08-22 05:08:52 +08:00
|
|
|
# parse line of git-diff-tree "raw" output
|
2006-08-22 05:07:00 +08:00
|
|
|
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
|
2006-08-22 05:08:52 +08:00
|
|
|
($res{'from_file'}, $res{'to_file'}) = map { unquote($_) } split("\t", $7);
|
2006-08-22 05:07:00 +08:00
|
|
|
} else {
|
|
|
|
$res{'file'} = unquote($7);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# 'c512b523472485aef4fff9e57b229d9d243c967f'
|
|
|
|
#elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
|
|
|
|
# $res{'commit'} = $1;
|
|
|
|
#}
|
|
|
|
|
|
|
|
return wantarray ? %res : \%res;
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ......................................................................
|
|
|
|
## parse to array of hashes functions
|
2005-08-08 01:52:52 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_get_refs_list {
|
2006-08-01 03:22:15 +08:00
|
|
|
my $ref_dir = shift;
|
|
|
|
my @reflist;
|
2005-08-08 01:52:52 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
my @refs;
|
2006-08-01 10:18:34 +08:00
|
|
|
my $pfxlen = length("$projectroot/$project/$ref_dir");
|
|
|
|
File::Find::find(sub {
|
|
|
|
return if (/^\./);
|
|
|
|
if (-f $_) {
|
|
|
|
push @refs, substr($File::Find::name, $pfxlen + 1);
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
2006-08-01 10:18:34 +08:00
|
|
|
}, "$projectroot/$project/$ref_dir");
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
foreach my $ref_file (@refs) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $ref_id = git_get_hash_by_ref("$project/$ref_dir/$ref_file");
|
2006-08-01 03:22:15 +08:00
|
|
|
my $type = git_get_type($ref_id) || next;
|
2006-08-14 08:07:00 +08:00
|
|
|
my %ref_item = parse_ref($ref_file, $ref_id, $type);
|
2005-08-08 02:09:33 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
push @reflist, \%ref_item;
|
|
|
|
}
|
2006-08-14 08:07:00 +08:00
|
|
|
# sort refs by age
|
2006-08-01 03:22:15 +08:00
|
|
|
@reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
|
|
|
|
return \@reflist;
|
2005-08-08 02:08:29 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ----------------------------------------------------------------------
|
|
|
|
## filesystem-related functions
|
2005-08-08 02:06:09 +08:00
|
|
|
|
2005-08-08 02:22:44 +08:00
|
|
|
sub get_file_owner {
|
|
|
|
my $path = shift;
|
|
|
|
|
|
|
|
my ($dev, $ino, $mode, $nlink, $st_uid, $st_gid, $rdev, $size) = stat($path);
|
|
|
|
my ($name, $passwd, $uid, $gid, $quota, $comment, $gcos, $dir, $shell) = getpwuid($st_uid);
|
|
|
|
if (!defined $gcos) {
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
my $owner = $gcos;
|
|
|
|
$owner =~ s/[,;].*$//;
|
2006-05-01 09:40:22 +08:00
|
|
|
return decode("utf8", $owner, Encode::FB_DEFAULT);
|
2005-08-08 02:22:44 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ......................................................................
|
|
|
|
## mimetype related functions
|
2005-08-08 02:21:23 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
sub mimetype_guess_file {
|
|
|
|
my $filename = shift;
|
|
|
|
my $mimemap = shift;
|
|
|
|
-r $mimemap or return undef;
|
|
|
|
|
|
|
|
my %mimemap;
|
|
|
|
open(MIME, $mimemap) or return undef;
|
|
|
|
while (<MIME>) {
|
2006-08-14 08:15:22 +08:00
|
|
|
next if m/^#/; # skip comments
|
2006-08-01 03:22:15 +08:00
|
|
|
my ($mime, $exts) = split(/\t+/);
|
2006-08-01 10:24:37 +08:00
|
|
|
if (defined $exts) {
|
|
|
|
my @exts = split(/\s+/, $exts);
|
|
|
|
foreach my $ext (@exts) {
|
|
|
|
$mimemap{$ext} = $mime;
|
|
|
|
}
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
close(MIME);
|
2005-08-08 02:21:23 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
$filename =~ /\.(.*?)$/;
|
|
|
|
return $mimemap{$1};
|
|
|
|
}
|
2006-06-12 16:31:57 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
sub mimetype_guess {
|
|
|
|
my $filename = shift;
|
|
|
|
my $mime;
|
|
|
|
$filename =~ /\./ or return undef;
|
2006-06-12 16:31:57 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
if ($mimetypes_file) {
|
|
|
|
my $file = $mimetypes_file;
|
2006-08-14 08:16:33 +08:00
|
|
|
if ($file !~ m!^/!) { # if it is relative path
|
|
|
|
# it is relative to project
|
|
|
|
$file = "$projectroot/$project/$file";
|
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
$mime = mimetype_guess_file($filename, $file);
|
|
|
|
}
|
|
|
|
$mime ||= mimetype_guess_file($filename, '/etc/mime.types');
|
|
|
|
return $mime;
|
2006-06-12 16:31:57 +08:00
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub blob_mimetype {
|
2006-08-01 03:22:15 +08:00
|
|
|
my $fd = shift;
|
|
|
|
my $filename = shift;
|
2006-06-12 16:31:57 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
if ($filename) {
|
|
|
|
my $mime = mimetype_guess($filename);
|
|
|
|
$mime and return $mime;
|
2005-08-13 03:43:32 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
# just in case
|
|
|
|
return $default_blob_plain_mimetype unless $fd;
|
|
|
|
|
|
|
|
if (-T $fd) {
|
|
|
|
return 'text/plain' .
|
|
|
|
($default_text_plain_charset ? '; charset='.$default_text_plain_charset : '');
|
|
|
|
} elsif (! $filename) {
|
|
|
|
return 'application/octet-stream';
|
|
|
|
} elsif ($filename =~ m/\.png$/i) {
|
|
|
|
return 'image/png';
|
|
|
|
} elsif ($filename =~ m/\.gif$/i) {
|
|
|
|
return 'image/gif';
|
|
|
|
} elsif ($filename =~ m/\.jpe?g$/i) {
|
|
|
|
return 'image/jpeg';
|
2005-08-13 03:43:32 +08:00
|
|
|
} else {
|
2006-08-01 03:22:15 +08:00
|
|
|
return 'application/octet-stream';
|
2005-08-10 09:53:09 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
## ======================================================================
|
|
|
|
## functions printing HTML: header, footer, error page
|
|
|
|
|
|
|
|
sub git_header_html {
|
|
|
|
my $status = shift || "200 OK";
|
|
|
|
my $expires = shift;
|
|
|
|
|
|
|
|
my $title = "$site_name git";
|
|
|
|
if (defined $project) {
|
|
|
|
$title .= " - $project";
|
|
|
|
if (defined $action) {
|
|
|
|
$title .= "/$action";
|
|
|
|
if (defined $file_name) {
|
|
|
|
$title .= " - $file_name";
|
|
|
|
if ($action eq "tree" && $file_name !~ m|/$|) {
|
|
|
|
$title .= "/";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2005-08-10 09:53:09 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
my $content_type;
|
|
|
|
# require explicit support from the UA if we are to send the page as
|
|
|
|
# '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.
|
2006-08-22 22:52:50 +08:00
|
|
|
if (defined $cgi->http('HTTP_ACCEPT') &&
|
|
|
|
$cgi->http('HTTP_ACCEPT') =~ m/(,|;|\s|^)application\/xhtml\+xml(,|;|\s|$)/ &&
|
|
|
|
$cgi->Accept('application/xhtml+xml') != 0) {
|
2006-08-01 03:22:15 +08:00
|
|
|
$content_type = 'application/xhtml+xml';
|
2005-08-10 09:53:09 +08:00
|
|
|
} else {
|
2006-08-01 03:22:15 +08:00
|
|
|
$content_type = 'text/html';
|
2005-08-10 09:53:09 +08:00
|
|
|
}
|
2006-08-22 22:52:50 +08:00
|
|
|
print $cgi->header(-type=>$content_type, -charset => 'utf-8',
|
|
|
|
-status=> $status, -expires => $expires);
|
2006-08-01 03:22:15 +08:00
|
|
|
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">
|
2006-08-17 17:21:28 +08:00
|
|
|
<!-- git web interface version $version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
|
2006-08-01 03:22:15 +08:00
|
|
|
<!-- git core binaries version $git_version -->
|
|
|
|
<head>
|
|
|
|
<meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
|
2006-08-17 17:21:28 +08:00
|
|
|
<meta name="generator" content="gitweb/$version git/$git_version"/>
|
2006-08-01 03:22:15 +08:00
|
|
|
<meta name="robots" content="index, nofollow"/>
|
|
|
|
<title>$title</title>
|
|
|
|
<link rel="stylesheet" type="text/css" href="$stylesheet"/>
|
|
|
|
EOF
|
2006-08-06 19:25:41 +08:00
|
|
|
if (defined $project) {
|
|
|
|
printf('<link rel="alternate" title="%s log" '.
|
|
|
|
'href="%s" type="application/rss+xml"/>'."\n",
|
2006-08-16 06:24:30 +08:00
|
|
|
esc_param($project), href(action=>"rss"));
|
2006-08-06 19:25:41 +08:00
|
|
|
}
|
2006-08-05 19:18:58 +08:00
|
|
|
|
2006-08-06 19:25:41 +08:00
|
|
|
print "</head>\n" .
|
|
|
|
"<body>\n" .
|
2006-08-05 19:18:58 +08:00
|
|
|
"<div class=\"page_header\">\n" .
|
2006-08-01 03:22:15 +08:00
|
|
|
"<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
|
2006-07-31 06:38:39 +08:00
|
|
|
"<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
|
2006-08-01 03:22:15 +08:00
|
|
|
"</a>\n";
|
2006-08-15 06:50:49 +08:00
|
|
|
print $cgi->a({-href => esc_param($home_link)}, $home_link_str) . " / ";
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined $project) {
|
2006-08-16 06:24:30 +08:00
|
|
|
print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined $action) {
|
|
|
|
print " / $action";
|
|
|
|
}
|
|
|
|
print "\n";
|
|
|
|
if (!defined $searchtext) {
|
|
|
|
$searchtext = "";
|
|
|
|
}
|
|
|
|
my $search_hash;
|
|
|
|
if (defined $hash_base) {
|
|
|
|
$search_hash = $hash_base;
|
|
|
|
} elsif (defined $hash) {
|
|
|
|
$search_hash = $hash;
|
2005-08-08 02:25:42 +08:00
|
|
|
} else {
|
2006-08-01 03:22:15 +08:00
|
|
|
$search_hash = "HEAD";
|
2005-08-08 02:25:42 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
$cgi->param("a", "search");
|
|
|
|
$cgi->param("h", $search_hash);
|
|
|
|
print $cgi->startform(-method => "get", -action => $my_uri) .
|
|
|
|
"<div class=\"search\">\n" .
|
|
|
|
$cgi->hidden(-name => "p") . "\n" .
|
|
|
|
$cgi->hidden(-name => "a") . "\n" .
|
|
|
|
$cgi->hidden(-name => "h") . "\n" .
|
|
|
|
$cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
|
|
|
|
"</div>" .
|
|
|
|
$cgi->end_form() . "\n";
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
print "</div>\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
sub git_footer_html {
|
|
|
|
print "<div class=\"page_footer\">\n";
|
|
|
|
if (defined $project) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $descr = git_get_project_description($project);
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined $descr) {
|
|
|
|
print "<div class=\"page_footer_text\">" . esc_html($descr) . "</div>\n";
|
|
|
|
}
|
2006-08-16 06:24:30 +08:00
|
|
|
print $cgi->a({-href => href(action=>"rss"), -class => "rss_logo"}, "RSS") . "\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
} else {
|
2006-08-17 06:28:36 +08:00
|
|
|
print $cgi->a({-href => href(action=>"opml"), -class => "rss_logo"}, "OPML") . "\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
print "</div>\n" .
|
|
|
|
"</body>\n" .
|
|
|
|
"</html>";
|
|
|
|
}
|
|
|
|
|
|
|
|
sub die_error {
|
|
|
|
my $status = shift || "403 Forbidden";
|
|
|
|
my $error = shift || "Malformed query, file missing or permission denied";
|
|
|
|
|
|
|
|
git_header_html($status);
|
2006-08-23 05:42:53 +08:00
|
|
|
print <<EOF;
|
|
|
|
<div class="page_body">
|
|
|
|
<br /><br />
|
|
|
|
$status - $error
|
|
|
|
<br />
|
|
|
|
</div>
|
|
|
|
EOF
|
2005-08-08 02:21:04 +08:00
|
|
|
git_footer_html();
|
2006-08-01 03:22:15 +08:00
|
|
|
exit;
|
2005-08-08 01:49:46 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ----------------------------------------------------------------------
|
|
|
|
## functions printing or outputting HTML: navigation
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_print_page_nav {
|
2006-08-01 03:22:15 +08:00
|
|
|
my ($current, $suppress, $head, $treehead, $treebase, $extra) = @_;
|
|
|
|
$extra = '' if !defined $extra; # pager or formats
|
|
|
|
|
|
|
|
my @navs = qw(summary shortlog log commit commitdiff tree);
|
|
|
|
if ($suppress) {
|
|
|
|
@navs = grep { $_ ne $suppress } @navs;
|
|
|
|
}
|
|
|
|
|
2006-08-16 06:24:30 +08:00
|
|
|
my %arg = map { $_ => {action=>$_} } @navs;
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined $head) {
|
|
|
|
for (qw(commit commitdiff)) {
|
2006-08-16 06:24:30 +08:00
|
|
|
$arg{$_}{hash} = $head;
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
if ($current =~ m/^(tree | log | shortlog | commit | commitdiff | search)$/x) {
|
|
|
|
for (qw(shortlog log)) {
|
2006-08-16 06:24:30 +08:00
|
|
|
$arg{$_}{hash} = $head;
|
2005-12-07 17:12:55 +08:00
|
|
|
}
|
2005-12-07 16:44:06 +08:00
|
|
|
}
|
|
|
|
}
|
2006-08-16 06:24:30 +08:00
|
|
|
$arg{tree}{hash} = $treehead if defined $treehead;
|
|
|
|
$arg{tree}{hash_base} = $treebase if defined $treebase;
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
print "<div class=\"page_nav\">\n" .
|
|
|
|
(join " | ",
|
2006-08-16 06:24:30 +08:00
|
|
|
map { $_ eq $current ?
|
|
|
|
$_ : $cgi->a({-href => href(%{$arg{$_}})}, "$_")
|
|
|
|
} @navs);
|
2006-08-01 03:22:15 +08:00
|
|
|
print "<br/>\n$extra<br/>\n" .
|
|
|
|
"</div>\n";
|
2005-12-07 16:44:06 +08:00
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub format_paging_nav {
|
2006-08-01 03:22:15 +08:00
|
|
|
my ($action, $hash, $head, $page, $nrevs) = @_;
|
|
|
|
my $paging_nav;
|
2006-07-31 08:21:52 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
if ($hash ne $head || $page) {
|
2006-08-16 06:24:30 +08:00
|
|
|
$paging_nav .= $cgi->a({-href => href(action=>$action)}, "HEAD");
|
2006-07-31 08:21:52 +08:00
|
|
|
} else {
|
2006-08-01 03:22:15 +08:00
|
|
|
$paging_nav .= "HEAD";
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($page > 0) {
|
|
|
|
$paging_nav .= " ⋅ " .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>$action, hash=>$hash, page=>$page-1),
|
2006-08-10 18:38:47 +08:00
|
|
|
-accesskey => "p", -title => "Alt-p"}, "prev");
|
2006-08-01 03:22:15 +08:00
|
|
|
} else {
|
|
|
|
$paging_nav .= " ⋅ prev";
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($nrevs >= (100 * ($page+1)-1)) {
|
|
|
|
$paging_nav .= " ⋅ " .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>$action, hash=>$hash, page=>$page+1),
|
2006-08-10 18:38:47 +08:00
|
|
|
-accesskey => "n", -title => "Alt-n"}, "next");
|
2006-08-01 03:22:15 +08:00
|
|
|
} else {
|
|
|
|
$paging_nav .= " ⋅ next";
|
2006-07-31 08:21:52 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
return $paging_nav;
|
2006-07-31 08:21:52 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ......................................................................
|
|
|
|
## functions printing or outputting HTML: div
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
sub git_print_header_div {
|
2006-08-01 03:22:15 +08:00
|
|
|
my ($action, $title, $hash, $hash_base) = @_;
|
2006-08-16 06:24:30 +08:00
|
|
|
my %args = ();
|
2006-08-01 03:22:15 +08:00
|
|
|
|
2006-08-16 06:24:30 +08:00
|
|
|
$args{action} = $action;
|
|
|
|
$args{hash} = $hash if $hash;
|
|
|
|
$args{hash_base} = $hash_base if $hash_base;
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
print "<div class=\"header\">\n" .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(%args), -class => "title"},
|
|
|
|
$title ? $title : $action) .
|
|
|
|
"\n</div>\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
2005-08-08 02:23:12 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
sub git_print_page_path {
|
|
|
|
my $name = shift;
|
|
|
|
my $type = shift;
|
2006-08-18 01:39:29 +08:00
|
|
|
my $hb = shift;
|
2005-08-08 02:23:12 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
if (!defined $name) {
|
2006-08-22 18:38:59 +08:00
|
|
|
print "<div class=\"page_path\">/</div>\n";
|
2006-08-01 12:00:16 +08:00
|
|
|
} elsif (defined $type && $type eq 'blob') {
|
2006-08-22 18:38:59 +08:00
|
|
|
print "<div class=\"page_path\">";
|
2006-08-18 01:39:29 +08:00
|
|
|
if (defined $hb) {
|
2006-08-22 22:52:50 +08:00
|
|
|
print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
|
|
|
|
hash_base=>$hb)},
|
|
|
|
esc_html($name));
|
2006-08-18 01:39:29 +08:00
|
|
|
} else {
|
2006-08-22 22:52:50 +08:00
|
|
|
print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name)},
|
|
|
|
esc_html($name));
|
2006-08-18 01:39:29 +08:00
|
|
|
}
|
2006-08-22 18:38:59 +08:00
|
|
|
print "<br/></div>\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
} else {
|
2006-08-22 18:38:59 +08:00
|
|
|
print "<div class=\"page_path\">" . esc_html($name) . "<br/></div>\n";
|
2005-08-08 02:23:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-17 17:21:23 +08:00
|
|
|
sub git_print_log {
|
|
|
|
my $log = shift;
|
|
|
|
|
|
|
|
# remove leading empty lines
|
|
|
|
while (defined $log->[0] && $log->[0] eq "") {
|
|
|
|
shift @$log;
|
|
|
|
}
|
|
|
|
|
|
|
|
# print log
|
|
|
|
my $signoff = 0;
|
|
|
|
my $empty = 0;
|
|
|
|
foreach my $line (@$log) {
|
|
|
|
# print only one empty line
|
|
|
|
# do not print empty line after signoff
|
|
|
|
if ($line eq "") {
|
|
|
|
next if ($empty || $signoff);
|
|
|
|
$empty = 1;
|
|
|
|
} else {
|
|
|
|
$empty = 0;
|
|
|
|
}
|
|
|
|
if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
|
|
|
|
$signoff = 1;
|
|
|
|
print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
|
|
|
|
} else {
|
|
|
|
$signoff = 0;
|
|
|
|
print format_log_line_html($line) . "<br/>\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sub git_print_simplified_log {
|
|
|
|
my $log = shift;
|
|
|
|
my $remove_title = shift;
|
|
|
|
|
|
|
|
shift @$log if $remove_title;
|
|
|
|
# remove leading empty lines
|
|
|
|
while (defined $log->[0] && $log->[0] eq "") {
|
|
|
|
shift @$log;
|
|
|
|
}
|
|
|
|
|
|
|
|
# simplify and print log
|
|
|
|
my $empty = 0;
|
|
|
|
foreach my $line (@$log) {
|
|
|
|
# remove signoff lines
|
|
|
|
if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
# print only one empty line
|
|
|
|
if ($line eq "") {
|
|
|
|
next if $empty;
|
|
|
|
$empty = 1;
|
|
|
|
} else {
|
|
|
|
$empty = 0;
|
|
|
|
}
|
|
|
|
print format_log_line_html($line) . "<br/>\n";
|
|
|
|
}
|
|
|
|
# end with single empty line
|
|
|
|
print "<br/>\n" unless $empty;
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
## ......................................................................
|
|
|
|
## functions printing large fragments of HTML
|
|
|
|
|
2006-08-14 08:18:33 +08:00
|
|
|
sub git_difftree_body {
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
my ($difftree, $hash, $parent) = @_;
|
2006-08-14 08:18:33 +08:00
|
|
|
|
|
|
|
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}) {
|
2006-08-22 05:08:52 +08:00
|
|
|
my %diff = parse_difftree_raw_line($line);
|
2006-08-14 08:18:33 +08:00
|
|
|
|
|
|
|
if ($alternate) {
|
|
|
|
print "<tr class=\"dark\">\n";
|
|
|
|
} else {
|
|
|
|
print "<tr class=\"light\">\n";
|
|
|
|
}
|
|
|
|
$alternate ^= 1;
|
|
|
|
|
2006-08-22 05:08:52 +08:00
|
|
|
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'});
|
|
|
|
}
|
|
|
|
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
|
2006-08-14 08:18:33 +08:00
|
|
|
}
|
2006-08-22 05:08:52 +08:00
|
|
|
$from_file_type = file_type($diff{'from_mode'});
|
|
|
|
}
|
|
|
|
|
|
|
|
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>";
|
2006-08-14 08:18:33 +08:00
|
|
|
print "<td>" .
|
2006-08-22 05:08:52 +08:00
|
|
|
$cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
|
|
|
|
hash_base=>$hash, file_name=>$diff{'file'}),
|
|
|
|
-class => "list"}, esc_html($diff{'file'})) .
|
2006-08-14 08:18:33 +08:00
|
|
|
"</td>\n" .
|
2006-08-22 05:08:52 +08:00
|
|
|
"<td>$mode_chng</td>\n" .
|
2006-08-14 08:18:33 +08:00
|
|
|
"<td class=\"link\">" .
|
2006-08-22 05:08:52 +08:00
|
|
|
$cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
|
|
|
|
hash_base=>$hash, file_name=>$diff{'file'})},
|
|
|
|
"blob") .
|
2006-08-14 08:18:33 +08:00
|
|
|
"</td>\n";
|
|
|
|
|
2006-08-22 05:08:52 +08:00
|
|
|
} elsif ($diff{'status'} eq "D") { # deleted
|
|
|
|
my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";
|
2006-08-14 08:18:33 +08:00
|
|
|
print "<td>" .
|
2006-08-22 05:08:52 +08:00
|
|
|
$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" .
|
2006-08-14 08:18:33 +08:00
|
|
|
"<td class=\"link\">" .
|
2006-08-22 05:08:52 +08:00
|
|
|
$cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
|
|
|
|
hash_base=>$parent, file_name=>$diff{'file'})},
|
|
|
|
"blob") .
|
|
|
|
" | " .
|
|
|
|
$cgi->a({-href => href(action=>"history", hash_base=>$parent,
|
|
|
|
file_name=>$diff{'file'})},\
|
|
|
|
"history") .
|
|
|
|
"</td>\n";
|
2006-08-14 08:18:33 +08:00
|
|
|
|
2006-08-22 05:08:52 +08:00
|
|
|
} elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
|
2006-08-14 08:18:33 +08:00
|
|
|
my $mode_chnge = "";
|
2006-08-22 05:08:52 +08:00
|
|
|
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";
|
2006-08-14 08:18:33 +08:00
|
|
|
}
|
2006-08-22 05:08:52 +08:00
|
|
|
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";
|
2006-08-14 08:18:33 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
$mode_chnge .= "]</span>\n";
|
|
|
|
}
|
|
|
|
print "<td>";
|
2006-08-22 05:08:52 +08:00
|
|
|
if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
|
|
|
|
print $cgi->a({-href => href(action=>"blobdiff", hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
|
|
|
|
hash_base=>$hash, file_name=>$diff{'file'}),
|
|
|
|
-class => "list"}, esc_html($diff{'file'}));
|
|
|
|
} else { # only mode changed
|
|
|
|
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
|
|
|
|
hash_base=>$hash, file_name=>$diff{'file'}),
|
|
|
|
-class => "list"}, esc_html($diff{'file'}));
|
2006-08-14 08:18:33 +08:00
|
|
|
}
|
|
|
|
print "</td>\n" .
|
|
|
|
"<td>$mode_chnge</td>\n" .
|
|
|
|
"<td class=\"link\">" .
|
2006-08-22 05:08:52 +08:00
|
|
|
$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
|
2006-08-14 08:18:33 +08:00
|
|
|
print " | " .
|
2006-08-22 05:08:52 +08:00
|
|
|
$cgi->a({-href => href(action=>"blobdiff", hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
|
|
|
|
hash_base=>$hash, file_name=>$diff{'file'})},
|
|
|
|
"diff");
|
2006-08-14 08:18:33 +08:00
|
|
|
}
|
2006-08-22 05:08:52 +08:00
|
|
|
print " | " .
|
|
|
|
$cgi->a({-href => href(action=>"history",
|
|
|
|
hash_base=>$hash, file_name=>$diff{'file'})},
|
|
|
|
"history");
|
2006-08-14 08:18:33 +08:00
|
|
|
print "</td>\n";
|
|
|
|
|
2006-08-22 05:08:52 +08:00
|
|
|
} 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'}};
|
2006-08-14 08:18:33 +08:00
|
|
|
my $mode_chng = "";
|
2006-08-22 05:08:52 +08:00
|
|
|
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);
|
2006-08-14 08:18:33 +08:00
|
|
|
}
|
|
|
|
print "<td>" .
|
2006-08-22 05:08:52 +08:00
|
|
|
$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" .
|
2006-08-14 08:18:33 +08:00
|
|
|
"<td class=\"link\">" .
|
2006-08-22 05:08:52 +08:00
|
|
|
$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'}) {
|
2006-08-14 08:18:33 +08:00
|
|
|
print " | " .
|
2006-08-22 05:08:52 +08:00
|
|
|
$cgi->a({-href => href(action=>"blobdiff", hash_base=>$hash,
|
|
|
|
hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
|
|
|
|
file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
|
|
|
|
"diff");
|
2006-08-14 08:18:33 +08:00
|
|
|
}
|
|
|
|
print "</td>\n";
|
2006-08-22 05:08:52 +08:00
|
|
|
|
2006-08-14 08:18:33 +08:00
|
|
|
} # we should not encounter Unmerged (U) or Unknown (X) status
|
|
|
|
print "</tr>\n";
|
|
|
|
}
|
|
|
|
print "</table>\n";
|
|
|
|
}
|
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
sub git_patchset_body {
|
|
|
|
my ($patchset, $difftree, $hash, $hash_parent) = @_;
|
|
|
|
|
|
|
|
my $patch_idx = 0;
|
|
|
|
my $in_header = 0;
|
|
|
|
my $patch_found = 0;
|
|
|
|
my %diffinfo;
|
|
|
|
|
|
|
|
print "<div class=\"patchset\">\n";
|
|
|
|
|
|
|
|
LINE: foreach my $patch_line (@$patchset) {
|
|
|
|
|
|
|
|
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\">\n";
|
|
|
|
|
|
|
|
%diffinfo = parse_difftree_raw_line($difftree->[$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
|
|
|
|
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"
|
|
|
|
$in_header = 0;
|
|
|
|
}
|
|
|
|
next LINE if $in_header;
|
|
|
|
|
|
|
|
print format_diff_line($patch_line);
|
|
|
|
}
|
|
|
|
print "</div>\n" if $patch_found; # class="patch"
|
|
|
|
|
|
|
|
print "</div>\n"; # class="patchset"
|
|
|
|
}
|
|
|
|
|
|
|
|
# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
|
|
|
|
|
2006-07-31 17:22:13 +08:00
|
|
|
sub git_shortlog_body {
|
|
|
|
# uses global variable $project
|
|
|
|
my ($revlist, $from, $to, $refs, $extra) = @_;
|
2006-08-20 14:23:04 +08:00
|
|
|
|
|
|
|
my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
|
|
|
|
my $have_snapshot = (defined $ctype && defined $suffix);
|
|
|
|
|
2006-07-31 17:22:13 +08:00
|
|
|
$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];
|
2006-08-14 08:05:47 +08:00
|
|
|
#my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
|
|
|
|
my $ref = format_ref_marker($refs, $commit);
|
|
|
|
my %co = parse_commit($commit);
|
2006-07-31 17:22:13 +08:00
|
|
|
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>";
|
2006-08-22 22:52:50 +08:00
|
|
|
print format_subject_html($co{'title'}, $co{'title_short'},
|
|
|
|
href(action=>"commit", hash=>$commit), $ref);
|
2006-07-31 17:22:13 +08:00
|
|
|
print "</td>\n" .
|
|
|
|
"<td class=\"link\">" .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
|
2006-08-17 23:29:46 +08:00
|
|
|
$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" .
|
2006-07-31 17:22:13 +08:00
|
|
|
"</tr>\n";
|
|
|
|
}
|
|
|
|
if (defined $extra) {
|
|
|
|
print "<tr>\n" .
|
|
|
|
"<td colspan=\"4\">$extra</td>\n" .
|
|
|
|
"</tr>\n";
|
|
|
|
}
|
|
|
|
print "</table>\n";
|
|
|
|
}
|
|
|
|
|
2006-08-14 08:09:08 +08:00
|
|
|
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)
|
2006-08-22 22:52:50 +08:00
|
|
|
print format_subject_html($co{'title'}, $co{'title_short'},
|
|
|
|
href(action=>"commit", hash=>$commit), $ref);
|
2006-08-14 08:09:08 +08:00
|
|
|
print "</td>\n" .
|
|
|
|
"<td class=\"link\">" .
|
2006-08-16 06:24:30 +08:00
|
|
|
$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);
|
2006-08-14 08:09:08 +08:00
|
|
|
|
|
|
|
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 " | " .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"blobdiff", hash=>$blob_current, hash_parent=>$blob_parent,
|
|
|
|
hash_base=>$commit, file_name=>$file_name)},
|
2006-08-14 08:09:08 +08:00
|
|
|
"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";
|
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
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>" .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'}),
|
2006-08-22 18:38:59 +08:00
|
|
|
-class => "list name"}, esc_html($tag{'name'})) .
|
2006-08-01 03:22:15 +08:00
|
|
|
"</td>\n" .
|
|
|
|
"<td>";
|
|
|
|
if (defined $comment) {
|
2006-08-22 22:52:50 +08:00
|
|
|
print format_subject_html($comment, $comment_short,
|
|
|
|
href(action=>"tag", hash=>$tag{'id'}));
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
print "</td>\n" .
|
|
|
|
"<td class=\"selflink\">";
|
|
|
|
if ($tag{'type'} eq "tag") {
|
2006-08-16 06:24:30 +08:00
|
|
|
print $cgi->a({-href => href(action=>"tag", hash=>$tag{'id'})}, "tag");
|
2006-08-01 03:22:15 +08:00
|
|
|
} else {
|
|
|
|
print " ";
|
|
|
|
}
|
|
|
|
print "</td>\n" .
|
|
|
|
"<td class=\"link\">" . " | " .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'})}, $tag{'reftype'});
|
2006-08-01 03:22:15 +08:00
|
|
|
if ($tag{'reftype'} eq "commit") {
|
2006-08-16 06:24:30 +08:00
|
|
|
print " | " . $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") .
|
|
|
|
" | " . $cgi->a({-href => href(action=>"log", hash=>$tag{'refid'})}, "log");
|
2006-08-01 03:22:15 +08:00
|
|
|
} elsif ($tag{'reftype'} eq "blob") {
|
2006-08-16 06:24:30 +08:00
|
|
|
print " | " . $cgi->a({-href => href(action=>"blob_plain", hash=>$tag{'refid'})}, "raw");
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
print "</td>\n" .
|
|
|
|
"</tr>";
|
|
|
|
}
|
|
|
|
if (defined $extra) {
|
|
|
|
print "<tr>\n" .
|
|
|
|
"<td colspan=\"5\">$extra</td>\n" .
|
|
|
|
"</tr>\n";
|
|
|
|
}
|
|
|
|
print "</table>\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
sub git_heads_body {
|
|
|
|
# uses global variable $project
|
|
|
|
my ($taglist, $head, $from, $to, $extra) = @_;
|
|
|
|
$from = 0 unless defined $from;
|
|
|
|
$to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
|
|
|
|
|
|
|
|
print "<table class=\"heads\" cellspacing=\"0\">\n";
|
|
|
|
my $alternate = 0;
|
|
|
|
for (my $i = $from; $i <= $to; $i++) {
|
|
|
|
my $entry = $taglist->[$i];
|
|
|
|
my %tag = %$entry;
|
|
|
|
my $curr = $tag{'id'} eq $head;
|
|
|
|
if ($alternate) {
|
|
|
|
print "<tr class=\"dark\">\n";
|
|
|
|
} else {
|
|
|
|
print "<tr class=\"light\">\n";
|
|
|
|
}
|
|
|
|
$alternate ^= 1;
|
|
|
|
print "<td><i>$tag{'age'}</i></td>\n" .
|
|
|
|
($tag{'id'} eq $head ? "<td class=\"current_head\">" : "<td>") .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'}),
|
2006-08-22 18:38:59 +08:00
|
|
|
-class => "list name"},esc_html($tag{'name'})) .
|
2006-08-01 03:22:15 +08:00
|
|
|
"</td>\n" .
|
|
|
|
"<td class=\"link\">" .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") . " | " .
|
|
|
|
$cgi->a({-href => href(action=>"log", hash=>$tag{'name'})}, "log") .
|
2006-08-01 03:22:15 +08:00
|
|
|
"</td>\n" .
|
|
|
|
"</tr>";
|
|
|
|
}
|
|
|
|
if (defined $extra) {
|
|
|
|
print "<tr>\n" .
|
|
|
|
"<td colspan=\"3\">$extra</td>\n" .
|
|
|
|
"</tr>\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;
|
|
|
|
}
|
2006-08-06 08:08:31 +08:00
|
|
|
$line = untabify($line);
|
2006-08-01 03:22:15 +08:00
|
|
|
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
|
|
|
|
|
|
|
|
sub git_project_list {
|
2006-08-01 08:59:12 +08:00
|
|
|
my $order = $cgi->param('o');
|
|
|
|
if (defined $order && $order !~ m/project|descr|owner|age/) {
|
2006-08-05 19:15:24 +08:00
|
|
|
die_error(undef, "Unknown order parameter");
|
2006-08-01 08:59:12 +08:00
|
|
|
}
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my @list = git_get_projects_list();
|
2006-08-01 03:22:15 +08:00
|
|
|
my @projects;
|
|
|
|
if (!@list) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "No projects found");
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
foreach my $pr (@list) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $head = git_get_head_hash($pr->{'path'});
|
2006-08-01 03:22:15 +08:00
|
|
|
if (!defined $head) {
|
|
|
|
next;
|
2006-07-31 17:22:13 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
$ENV{'GIT_DIR'} = "$projectroot/$pr->{'path'}";
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($head);
|
2006-08-01 03:22:15 +08:00
|
|
|
if (!%co) {
|
|
|
|
next;
|
2006-07-31 17:22:13 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
$pr->{'commit'} = \%co;
|
|
|
|
if (!defined $pr->{'descr'}) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $descr = git_get_project_description($pr->{'path'}) || "";
|
2006-08-01 03:22:15 +08:00
|
|
|
$pr->{'descr'} = chop_str($descr, 25, 5);
|
2006-07-31 17:22:13 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
if (!defined $pr->{'owner'}) {
|
|
|
|
$pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}") || "";
|
2006-07-31 17:22:13 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
push @projects, $pr;
|
2006-07-31 17:22:13 +08:00
|
|
|
}
|
2006-08-01 08:59:12 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
git_header_html();
|
|
|
|
if (-f $home_text) {
|
|
|
|
print "<div class=\"index_include\">\n";
|
|
|
|
open (my $fd, $home_text);
|
|
|
|
print <$fd>;
|
|
|
|
close $fd;
|
|
|
|
print "</div>\n";
|
2006-07-31 17:22:13 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
print "<table class=\"project_list\">\n" .
|
|
|
|
"<tr>\n";
|
2006-08-01 08:59:12 +08:00
|
|
|
$order ||= "project";
|
|
|
|
if ($order eq "project") {
|
2006-08-01 03:22:15 +08:00
|
|
|
@projects = sort {$a->{'path'} cmp $b->{'path'}} @projects;
|
|
|
|
print "<th>Project</th>\n";
|
|
|
|
} else {
|
2006-08-01 08:59:12 +08:00
|
|
|
print "<th>" .
|
|
|
|
$cgi->a({-href => "$my_uri?" . esc_param("o=project"),
|
|
|
|
-class => "header"}, "Project") .
|
|
|
|
"</th>\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
2006-08-01 08:59:12 +08:00
|
|
|
if ($order eq "descr") {
|
2006-08-01 03:22:15 +08:00
|
|
|
@projects = sort {$a->{'descr'} cmp $b->{'descr'}} @projects;
|
|
|
|
print "<th>Description</th>\n";
|
|
|
|
} else {
|
2006-08-01 08:59:12 +08:00
|
|
|
print "<th>" .
|
|
|
|
$cgi->a({-href => "$my_uri?" . esc_param("o=descr"),
|
|
|
|
-class => "header"}, "Description") .
|
|
|
|
"</th>\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
2006-08-01 08:59:12 +08:00
|
|
|
if ($order eq "owner") {
|
2006-08-01 03:22:15 +08:00
|
|
|
@projects = sort {$a->{'owner'} cmp $b->{'owner'}} @projects;
|
|
|
|
print "<th>Owner</th>\n";
|
|
|
|
} else {
|
2006-08-01 08:59:12 +08:00
|
|
|
print "<th>" .
|
|
|
|
$cgi->a({-href => "$my_uri?" . esc_param("o=owner"),
|
|
|
|
-class => "header"}, "Owner") .
|
|
|
|
"</th>\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
2006-08-01 08:59:12 +08:00
|
|
|
if ($order eq "age") {
|
2006-08-01 03:22:15 +08:00
|
|
|
@projects = sort {$a->{'commit'}{'age'} <=> $b->{'commit'}{'age'}} @projects;
|
|
|
|
print "<th>Last Change</th>\n";
|
|
|
|
} else {
|
2006-08-01 08:59:12 +08:00
|
|
|
print "<th>" .
|
|
|
|
$cgi->a({-href => "$my_uri?" . esc_param("o=age"),
|
|
|
|
-class => "header"}, "Last Change") .
|
|
|
|
"</th>\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|
|
|
|
print "<th></th>\n" .
|
|
|
|
"</tr>\n";
|
2006-07-31 17:22:13 +08:00
|
|
|
my $alternate = 0;
|
2006-08-01 03:22:15 +08:00
|
|
|
foreach my $pr (@projects) {
|
2006-07-31 17:22:13 +08:00
|
|
|
if ($alternate) {
|
|
|
|
print "<tr class=\"dark\">\n";
|
|
|
|
} else {
|
|
|
|
print "<tr class=\"light\">\n";
|
|
|
|
}
|
|
|
|
$alternate ^= 1;
|
2006-08-17 06:28:36 +08:00
|
|
|
print "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
|
2006-08-01 08:59:12 +08:00
|
|
|
-class => "list"}, esc_html($pr->{'path'})) . "</td>\n" .
|
2006-08-01 03:22:15 +08:00
|
|
|
"<td>" . esc_html($pr->{'descr'}) . "</td>\n" .
|
|
|
|
"<td><i>" . chop_str($pr->{'owner'}, 15) . "</i></td>\n";
|
2006-08-01 08:59:12 +08:00
|
|
|
print "<td class=\"". age_class($pr->{'commit'}{'age'}) . "\">" .
|
|
|
|
$pr->{'commit'}{'age_string'} . "</td>\n" .
|
2006-07-31 17:22:13 +08:00
|
|
|
"<td class=\"link\">" .
|
2006-08-17 06:28:36 +08:00
|
|
|
$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") .
|
2006-07-31 17:22:13 +08:00
|
|
|
"</td>\n" .
|
|
|
|
"</tr>\n";
|
|
|
|
}
|
|
|
|
print "</table>\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
git_footer_html();
|
2006-07-31 17:22:13 +08:00
|
|
|
}
|
|
|
|
|
2005-08-08 02:23:12 +08:00
|
|
|
sub git_summary {
|
2006-08-14 08:05:47 +08:00
|
|
|
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'});
|
2005-08-08 02:23:12 +08:00
|
|
|
|
2006-08-14 08:10:06 +08:00
|
|
|
my $owner = git_get_project_owner($project);
|
2005-08-08 02:23:12 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $refs = git_get_references();
|
2005-08-08 02:23:12 +08:00
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('summary','', $head);
|
2006-07-31 17:22:13 +08:00
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
print "<div class=\"title\"> </div>\n";
|
2005-08-08 02:25:42 +08:00
|
|
|
print "<table cellspacing=\"0\">\n" .
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
"<tr><td>description</td><td>" . esc_html($descr) . "</td></tr>\n" .
|
2005-08-08 02:23:12 +08:00
|
|
|
"<tr><td>owner</td><td>$owner</td></tr>\n" .
|
2006-08-16 05:03:17 +08:00
|
|
|
"<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n";
|
2006-08-16 20:50:34 +08:00
|
|
|
# use per project git URL list in $projectroot/$project/cloneurl
|
|
|
|
# or make project git URL from git base URL and project name
|
2006-08-16 05:03:17 +08:00
|
|
|
my $url_tag = "URL";
|
2006-08-16 20:50:34 +08:00
|
|
|
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";
|
2006-08-16 05:03:17 +08:00
|
|
|
$url_tag = "";
|
|
|
|
}
|
|
|
|
print "</table>\n";
|
2006-07-31 17:22:13 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_get_head_hash($project)
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-rev-list failed");
|
2006-07-30 20:58:11 +08:00
|
|
|
my @revlist = map { chomp; $_ } <$fd>;
|
2005-08-08 02:23:12 +08:00
|
|
|
close $fd;
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_header_div('shortlog');
|
2006-07-31 17:22:13 +08:00
|
|
|
git_shortlog_body(\@revlist, 0, 15, $refs,
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"shortlog")}, "..."));
|
2005-08-08 02:23:12 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $taglist = git_get_refs_list("refs/tags");
|
2005-08-08 02:23:12 +08:00
|
|
|
if (defined @$taglist) {
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_header_div('tags');
|
2006-07-31 17:22:13 +08:00
|
|
|
git_tags_body($taglist, 0, 15,
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"tags")}, "..."));
|
2005-08-08 02:23:12 +08:00
|
|
|
}
|
2005-08-08 02:24:35 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $headlist = git_get_refs_list("refs/heads");
|
2005-10-04 07:12:47 +08:00
|
|
|
if (defined @$headlist) {
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_header_div('heads');
|
2006-08-01 10:12:18 +08:00
|
|
|
git_heads_body($headlist, $head, 0, 15,
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"heads")}, "..."));
|
2005-08-08 02:24:35 +08:00
|
|
|
}
|
2006-07-31 17:22:13 +08:00
|
|
|
|
2005-08-08 02:23:12 +08:00
|
|
|
git_footer_html();
|
|
|
|
}
|
|
|
|
|
2005-08-08 02:28:53 +08:00
|
|
|
sub git_tag {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $head = git_get_head_hash($project);
|
2005-08-08 02:28:53 +08:00
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $head,undef,$head);
|
|
|
|
my %tag = parse_tag($hash);
|
|
|
|
git_print_header_div('commit', esc_html($tag{'name'}), $hash);
|
2005-08-08 02:28:53 +08:00
|
|
|
print "<div class=\"title_text\">\n" .
|
|
|
|
"<table cellspacing=\"0\">\n" .
|
2005-08-08 06:02:39 +08:00
|
|
|
"<tr>\n" .
|
|
|
|
"<td>object</td>\n" .
|
2006-08-22 22:52:50 +08:00
|
|
|
"<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" .
|
2005-08-08 06:02:39 +08:00
|
|
|
"</tr>\n";
|
2005-08-08 02:28:53 +08:00
|
|
|
if (defined($tag{'author'})) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my %ad = parse_date($tag{'epoch'}, $tag{'tz'});
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
print "<tr><td>author</td><td>" . esc_html($tag{'author'}) . "</td></tr>\n";
|
2006-08-22 22:52:50 +08:00
|
|
|
print "<tr><td></td><td>" . $ad{'rfc2822'} .
|
|
|
|
sprintf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}) .
|
|
|
|
"</td></tr>\n";
|
2005-08-08 02:28:53 +08:00
|
|
|
}
|
|
|
|
print "</table>\n\n" .
|
|
|
|
"</div>\n";
|
|
|
|
print "<div class=\"page_body\">";
|
|
|
|
my $comment = $tag{'comment'};
|
|
|
|
foreach my $line (@$comment) {
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
print esc_html($line) . "<br/>\n";
|
2005-08-08 02:28:53 +08:00
|
|
|
}
|
|
|
|
print "</div>\n";
|
|
|
|
git_footer_html();
|
|
|
|
}
|
|
|
|
|
2006-07-24 04:34:55 +08:00
|
|
|
sub git_blame2 {
|
|
|
|
my $fd;
|
|
|
|
my $ftype;
|
2006-08-20 14:23:04 +08:00
|
|
|
|
|
|
|
if (!gitweb_check_feature('blame')) {
|
|
|
|
die_error('403 Permission denied', "Permission denied");
|
|
|
|
}
|
2006-07-24 04:34:55 +08:00
|
|
|
die_error('404 Not Found', "File name not defined") if (!$file_name);
|
2006-08-14 08:05:47 +08:00
|
|
|
$hash_base ||= git_get_head_hash($project);
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Couldn't find base commit") unless ($hash_base);
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($hash_base)
|
2006-07-24 04:34:55 +08:00
|
|
|
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, "Error looking up file");
|
|
|
|
}
|
|
|
|
$ftype = git_get_type($hash);
|
|
|
|
if ($ftype !~ "blob") {
|
2006-08-05 19:12:51 +08:00
|
|
|
die_error("400 Bad Request", "Object is not a blob");
|
2006-07-24 04:34:55 +08:00
|
|
|
}
|
|
|
|
open ($fd, "-|", $GIT, "blame", '-l', $file_name, $hash_base)
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-blame failed");
|
2006-07-24 04:34:55 +08:00
|
|
|
git_header_html();
|
2006-07-30 21:01:07 +08:00
|
|
|
my $formats_nav =
|
2006-08-22 22:52:50 +08:00
|
|
|
$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");
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
|
2006-08-18 01:39:29 +08:00
|
|
|
git_print_page_path($file_name, $ftype, $hash_base);
|
2006-08-05 06:09:59 +08:00
|
|
|
my @rev_color = (qw(light2 dark2));
|
2006-07-24 04:37:53 +08:00
|
|
|
my $num_colors = scalar(@rev_color);
|
|
|
|
my $current_color = 0;
|
|
|
|
my $last_rev;
|
2006-08-23 05:42:53 +08:00
|
|
|
print <<HTML;
|
|
|
|
<div class="page_body">
|
|
|
|
<table class="blame">
|
|
|
|
<tr><th>Commit</th><th>Line</th><th>Data</th></tr>
|
|
|
|
HTML
|
2006-07-24 05:17:48 +08:00
|
|
|
while (<$fd>) {
|
|
|
|
/^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
|
|
|
|
my $full_rev = $1;
|
2006-07-24 04:34:55 +08:00
|
|
|
my $rev = substr($full_rev, 0, 8);
|
2006-07-24 05:17:48 +08:00
|
|
|
my $lineno = $2;
|
|
|
|
my $data = $3;
|
2006-07-24 04:34:55 +08:00
|
|
|
|
2006-07-24 04:37:53 +08:00
|
|
|
if (!defined $last_rev) {
|
|
|
|
$last_rev = $full_rev;
|
|
|
|
} elsif ($last_rev ne $full_rev) {
|
|
|
|
$last_rev = $full_rev;
|
|
|
|
$current_color = ++$current_color % $num_colors;
|
|
|
|
}
|
|
|
|
print "<tr class=\"$rev_color[$current_color]\">\n";
|
2006-07-24 04:34:55 +08:00
|
|
|
print "<td class=\"sha1\">" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$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";
|
2006-07-24 04:34:55 +08:00
|
|
|
print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
|
|
|
|
print "</tr>\n";
|
|
|
|
}
|
|
|
|
print "</table>\n";
|
|
|
|
print "</div>";
|
2006-08-22 22:52:50 +08:00
|
|
|
close $fd
|
|
|
|
or print "Reading blob failed\n";
|
2006-07-24 04:34:55 +08:00
|
|
|
git_footer_html();
|
|
|
|
}
|
|
|
|
|
2006-06-11 23:45:19 +08:00
|
|
|
sub git_blame {
|
|
|
|
my $fd;
|
2006-08-20 14:23:04 +08:00
|
|
|
|
|
|
|
if (!gitweb_check_feature('blame')) {
|
|
|
|
die_error('403 Permission denied', "Permission denied");
|
|
|
|
}
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error('404 Not Found', "File name not defined") if (!$file_name);
|
2006-08-14 08:05:47 +08:00
|
|
|
$hash_base ||= git_get_head_hash($project);
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Couldn't find base commit") unless ($hash_base);
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($hash_base)
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Reading commit failed");
|
2006-06-11 23:45:19 +08:00
|
|
|
if (!defined $hash) {
|
|
|
|
$hash = git_get_hash_by_path($hash_base, $file_name, "blob")
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Error lookup file");
|
2006-06-11 23:45:19 +08:00
|
|
|
}
|
2006-07-13 06:55:10 +08:00
|
|
|
open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base)
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-annotate failed");
|
2006-06-11 23:45:19 +08:00
|
|
|
git_header_html();
|
2006-07-30 21:01:07 +08:00
|
|
|
my $formats_nav =
|
2006-08-22 22:52:50 +08:00
|
|
|
$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");
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
|
2006-08-18 01:39:29 +08:00
|
|
|
git_print_page_path($file_name, 'blob', $hash_base);
|
2006-06-11 23:45:19 +08:00
|
|
|
print "<div class=\"page_body\">\n";
|
|
|
|
print <<HTML;
|
2006-06-20 22:58:12 +08:00
|
|
|
<table class="blame">
|
2006-06-11 23:45:19 +08:00
|
|
|
<tr>
|
|
|
|
<th>Commit</th>
|
|
|
|
<th>Age</th>
|
|
|
|
<th>Author</th>
|
|
|
|
<th>Line</th>
|
|
|
|
<th>Data</th>
|
|
|
|
</tr>
|
|
|
|
HTML
|
|
|
|
my @line_class = (qw(light dark));
|
|
|
|
my $line_class_len = scalar (@line_class);
|
|
|
|
my $line_class_num = $#line_class;
|
|
|
|
while (my $line = <$fd>) {
|
|
|
|
my $long_rev;
|
|
|
|
my $short_rev;
|
|
|
|
my $author;
|
|
|
|
my $time;
|
|
|
|
my $lineno;
|
|
|
|
my $data;
|
|
|
|
my $age;
|
|
|
|
my $age_str;
|
2006-06-20 22:58:12 +08:00
|
|
|
my $age_class;
|
2006-06-11 23:45:19 +08:00
|
|
|
|
|
|
|
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+)\)(.*)$/) {
|
|
|
|
$long_rev = $1;
|
|
|
|
$author = $2;
|
|
|
|
$time = $3;
|
|
|
|
$lineno = $4;
|
|
|
|
$data = $5;
|
|
|
|
} else {
|
2006-06-20 22:58:12 +08:00
|
|
|
print qq( <tr><td colspan="5" class="error">Unable to parse: $line</td></tr>\n);
|
2006-06-11 23:45:19 +08:00
|
|
|
next;
|
|
|
|
}
|
|
|
|
$short_rev = substr ($long_rev, 0, 8);
|
|
|
|
$age = time () - $time;
|
|
|
|
$age_str = age_string ($age);
|
|
|
|
$age_str =~ s/ / /g;
|
2006-06-20 22:58:12 +08:00
|
|
|
$age_class = age_class($age);
|
2006-06-11 23:45:19 +08:00
|
|
|
$author = esc_html ($author);
|
|
|
|
$author =~ s/ / /g;
|
2006-08-06 08:08:31 +08:00
|
|
|
|
|
|
|
$data = untabify($data);
|
2006-08-01 03:22:15 +08:00
|
|
|
$data = esc_html ($data);
|
2006-06-18 06:01:06 +08:00
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
print <<HTML;
|
|
|
|
<tr class="$line_class[$line_class_num]">
|
2006-08-16 06:24:30 +08:00
|
|
|
<td class="sha1"><a href="${\href (action=>"commit", hash=>$long_rev)}" class="text">$short_rev..</a></td>
|
2006-08-01 03:22:15 +08:00
|
|
|
<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="pre">$data</td>
|
|
|
|
</tr>
|
|
|
|
HTML
|
|
|
|
} # while (my $line = <$fd>)
|
|
|
|
print "</table>\n\n";
|
2006-08-22 22:52:50 +08:00
|
|
|
close $fd
|
|
|
|
or print "Reading blob failed.\n";
|
2006-08-01 03:22:15 +08:00
|
|
|
print "</div>";
|
|
|
|
git_footer_html();
|
2006-06-18 06:01:06 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
sub git_tags {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $head = git_get_head_hash($project);
|
2006-08-01 03:22:15 +08:00
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $head,undef,$head);
|
|
|
|
git_print_header_div('summary', $project);
|
2006-06-18 06:01:06 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $taglist = git_get_refs_list("refs/tags");
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined @$taglist) {
|
|
|
|
git_tags_body($taglist);
|
2006-06-18 06:01:06 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
git_footer_html();
|
2006-06-18 06:01:06 +08:00
|
|
|
}
|
|
|
|
|
2006-08-01 03:22:15 +08:00
|
|
|
sub git_heads {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $head = git_get_head_hash($project);
|
2006-08-01 03:22:15 +08:00
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $head,undef,$head);
|
|
|
|
git_print_header_div('summary', $project);
|
2006-07-10 11:18:57 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $taglist = git_get_refs_list("refs/heads");
|
2006-08-01 03:22:15 +08:00
|
|
|
if (defined @$taglist) {
|
|
|
|
git_heads_body($taglist, $head);
|
2006-06-17 19:32:15 +08:00
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
git_footer_html();
|
2006-06-17 19:32:15 +08:00
|
|
|
}
|
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
sub git_blob_plain {
|
2006-07-24 04:28:55 +08:00
|
|
|
if (!defined $hash) {
|
2006-07-30 04:43:40 +08:00
|
|
|
if (defined $file_name) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $base = $hash_base || git_get_head_hash($project);
|
2006-07-30 04:43:40 +08:00
|
|
|
$hash = git_get_hash_by_path($base, $file_name, "blob")
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Error lookup file");
|
2006-07-30 04:43:40 +08:00
|
|
|
} else {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "No file name defined");
|
2006-07-30 04:43:40 +08:00
|
|
|
}
|
|
|
|
}
|
2006-07-10 11:18:57 +08:00
|
|
|
my $type = shift;
|
2006-07-30 05:01:00 +08:00
|
|
|
open my $fd, "-|", $GIT, "cat-file", "blob", $hash
|
2006-08-05 18:56:04 +08:00
|
|
|
or die_error(undef, "Couldn't cat $file_name, $hash");
|
2006-07-10 11:18:57 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
$type ||= blob_mimetype($fd, $file_name);
|
2006-06-17 19:32:15 +08:00
|
|
|
|
|
|
|
# save as filename, even when no $file_name is given
|
|
|
|
my $save_as = "$hash";
|
2005-10-17 09:27:54 +08:00
|
|
|
if (defined $file_name) {
|
|
|
|
$save_as = $file_name;
|
2006-06-17 19:32:15 +08:00
|
|
|
} elsif ($type =~ m/^text\//) {
|
|
|
|
$save_as .= '.txt';
|
2005-10-17 09:27:54 +08:00
|
|
|
}
|
2006-06-17 19:32:15 +08:00
|
|
|
|
2006-08-22 22:55:34 +08:00
|
|
|
print $cgi->header(-type => "$type",
|
|
|
|
-content_disposition => "inline; filename=\"$save_as\"");
|
2005-08-08 02:26:27 +08:00
|
|
|
undef $/;
|
2006-06-18 00:07:24 +08:00
|
|
|
binmode STDOUT, ':raw';
|
2005-08-08 02:26:27 +08:00
|
|
|
print <$fd>;
|
2006-06-18 00:07:24 +08:00
|
|
|
binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
|
2005-08-08 02:26:27 +08:00
|
|
|
$/ = "\n";
|
|
|
|
close $fd;
|
|
|
|
}
|
|
|
|
|
2006-07-10 11:18:57 +08:00
|
|
|
sub git_blob {
|
2006-07-24 04:28:55 +08:00
|
|
|
if (!defined $hash) {
|
2006-07-30 04:43:40 +08:00
|
|
|
if (defined $file_name) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $base = $hash_base || git_get_head_hash($project);
|
2006-07-30 04:43:40 +08:00
|
|
|
$hash = git_get_hash_by_path($base, $file_name, "blob")
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Error lookup file");
|
2006-07-30 04:43:40 +08:00
|
|
|
} else {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "No file name defined");
|
2006-07-30 04:43:40 +08:00
|
|
|
}
|
|
|
|
}
|
2006-08-20 14:23:04 +08:00
|
|
|
my $have_blame = gitweb_check_feature('blame');
|
2006-07-30 05:01:00 +08:00
|
|
|
open my $fd, "-|", $GIT, "cat-file", "blob", $hash
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Couldn't cat $file_name, $hash");
|
2006-08-14 08:05:47 +08:00
|
|
|
my $mimetype = blob_mimetype($fd, $file_name);
|
2006-07-10 11:18:57 +08:00
|
|
|
if ($mimetype !~ m/^text\//) {
|
|
|
|
close $fd;
|
|
|
|
return git_blob_plain($mimetype);
|
|
|
|
}
|
|
|
|
git_header_html();
|
2006-07-30 21:01:07 +08:00
|
|
|
my $formats_nav = '';
|
2006-08-14 08:05:47 +08:00
|
|
|
if (defined $hash_base && (my %co = parse_commit($hash_base))) {
|
2006-07-10 11:18:57 +08:00
|
|
|
if (defined $file_name) {
|
|
|
|
if ($have_blame) {
|
2006-08-22 22:52:50 +08:00
|
|
|
$formats_nav .=
|
|
|
|
$cgi->a({-href => href(action=>"blame", hash_base=>$hash_base,
|
|
|
|
hash=>$hash, file_name=>$file_name)},
|
|
|
|
"blame") .
|
|
|
|
" | ";
|
2006-07-10 11:18:57 +08:00
|
|
|
}
|
2006-07-30 21:01:07 +08:00
|
|
|
$formats_nav .=
|
2006-08-22 22:52:50 +08:00
|
|
|
$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");
|
2006-07-10 11:18:57 +08:00
|
|
|
} else {
|
2006-08-22 22:52:50 +08:00
|
|
|
$formats_nav .=
|
|
|
|
$cgi->a({-href => href(action=>"blob_plain", hash=>$hash)}, "plain");
|
2006-07-10 11:18:57 +08:00
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
|
2006-07-10 11:18:57 +08:00
|
|
|
} else {
|
|
|
|
print "<div class=\"page_nav\">\n" .
|
|
|
|
"<br/><br/></div>\n" .
|
|
|
|
"<div class=\"title\">$hash</div>\n";
|
|
|
|
}
|
2006-08-18 01:39:29 +08:00
|
|
|
git_print_page_path($file_name, "blob", $hash_base);
|
2006-07-10 11:18:57 +08:00
|
|
|
print "<div class=\"page_body\">\n";
|
|
|
|
my $nr;
|
|
|
|
while (my $line = <$fd>) {
|
|
|
|
chomp $line;
|
|
|
|
$nr++;
|
2006-08-06 08:08:31 +08:00
|
|
|
$line = untabify($line);
|
2006-08-22 22:52:50 +08:00
|
|
|
printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
|
|
|
|
$nr, $nr, $nr, esc_html($line);
|
2006-07-10 11:18:57 +08:00
|
|
|
}
|
2006-08-22 22:52:50 +08:00
|
|
|
close $fd
|
|
|
|
or print "Reading blob failed.\n";
|
2006-07-10 11:18:57 +08:00
|
|
|
print "</div>";
|
|
|
|
git_footer_html();
|
|
|
|
}
|
|
|
|
|
2005-08-08 02:21:23 +08:00
|
|
|
sub git_tree {
|
2005-08-08 02:21:04 +08:00
|
|
|
if (!defined $hash) {
|
2006-08-14 08:05:47 +08:00
|
|
|
$hash = git_get_head_hash($project);
|
2005-08-08 02:21:23 +08:00
|
|
|
if (defined $file_name) {
|
2006-01-09 20:13:39 +08:00
|
|
|
my $base = $hash_base || $hash;
|
2005-08-08 02:21:23 +08:00
|
|
|
$hash = git_get_hash_by_path($base, $file_name, "tree");
|
|
|
|
}
|
2005-08-08 02:25:27 +08:00
|
|
|
if (!defined $hash_base) {
|
2006-01-09 20:13:39 +08:00
|
|
|
$hash_base = $hash;
|
2005-08-08 02:25:27 +08:00
|
|
|
}
|
2005-08-08 02:23:35 +08:00
|
|
|
}
|
2005-11-24 23:56:55 +08:00
|
|
|
$/ = "\0";
|
2006-07-30 05:01:00 +08:00
|
|
|
open my $fd, "-|", $GIT, "ls-tree", '-z', $hash
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-ls-tree failed");
|
2006-07-30 20:58:11 +08:00
|
|
|
my @entries = map { chomp; $_ } <$fd>;
|
2006-08-05 19:13:53 +08:00
|
|
|
close $fd or die_error(undef, "Reading tree failed");
|
2005-11-24 23:56:55 +08:00
|
|
|
$/ = "\n";
|
2005-08-08 02:18:13 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $refs = git_get_references();
|
|
|
|
my $ref = format_ref_marker($refs, $hash_base);
|
2005-08-08 02:02:47 +08:00
|
|
|
git_header_html();
|
2006-08-17 06:28:36 +08:00
|
|
|
my %base_key = ();
|
2005-08-08 02:21:23 +08:00
|
|
|
my $base = "";
|
2006-08-20 14:23:04 +08:00
|
|
|
my $have_blame = gitweb_check_feature('blame');
|
2006-08-14 08:05:47 +08:00
|
|
|
if (defined $hash_base && (my %co = parse_commit($hash_base))) {
|
2006-08-17 06:28:36 +08:00
|
|
|
$base_key{hash_base} = $hash_base;
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('tree','', $hash_base);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
|
2005-08-08 02:18:13 +08:00
|
|
|
} else {
|
|
|
|
print "<div class=\"page_nav\">\n";
|
|
|
|
print "<br/><br/></div>\n";
|
|
|
|
print "<div class=\"title\">$hash</div>\n";
|
|
|
|
}
|
2005-08-08 02:21:23 +08:00
|
|
|
if (defined $file_name) {
|
2005-11-24 23:56:55 +08:00
|
|
|
$base = esc_html("$file_name/");
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
2006-08-18 01:39:29 +08:00
|
|
|
git_print_page_path($file_name, 'tree', $hash_base);
|
2005-08-08 02:12:11 +08:00
|
|
|
print "<div class=\"page_body\">\n";
|
2005-08-08 02:21:46 +08:00
|
|
|
print "<table cellspacing=\"0\">\n";
|
2005-08-08 02:25:42 +08:00
|
|
|
my $alternate = 0;
|
2005-08-08 01:49:46 +08:00
|
|
|
foreach my $line (@entries) {
|
2005-08-08 01:56:10 +08:00
|
|
|
#'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
|
2005-08-08 02:26:27 +08:00
|
|
|
$line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
|
2005-08-08 02:05:55 +08:00
|
|
|
my $t_mode = $1;
|
2005-08-08 01:49:46 +08:00
|
|
|
my $t_type = $2;
|
|
|
|
my $t_hash = $3;
|
2005-11-24 23:56:55 +08:00
|
|
|
my $t_name = validate_input($4);
|
2005-08-08 02:25:42 +08:00
|
|
|
if ($alternate) {
|
2005-08-08 02:27:18 +08:00
|
|
|
print "<tr class=\"dark\">\n";
|
2005-08-08 02:25:42 +08:00
|
|
|
} else {
|
2005-08-08 02:27:18 +08:00
|
|
|
print "<tr class=\"light\">\n";
|
2005-08-08 02:25:42 +08:00
|
|
|
}
|
|
|
|
$alternate ^= 1;
|
2006-06-20 22:58:12 +08:00
|
|
|
print "<td class=\"mode\">" . mode_str($t_mode) . "</td>\n";
|
2005-08-08 01:49:46 +08:00
|
|
|
if ($t_type eq "blob") {
|
2005-08-08 02:25:27 +08:00
|
|
|
print "<td class=\"list\">" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"blob", hash=>$t_hash, file_name=>"$base$t_name", %base_key),
|
|
|
|
-class => "list"}, esc_html($t_name)) .
|
2005-08-08 02:27:18 +08:00
|
|
|
"</td>\n" .
|
|
|
|
"<td class=\"link\">" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"blob", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
|
|
|
|
"blob");
|
2006-08-05 06:14:27 +08:00
|
|
|
if ($have_blame) {
|
2006-08-22 22:52:50 +08:00
|
|
|
print " | " .
|
|
|
|
$cgi->a({-href => href(action=>"blame", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
|
|
|
|
"blame");
|
2006-08-05 06:14:27 +08:00
|
|
|
}
|
2006-08-22 22:52:50 +08:00
|
|
|
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") .
|
2005-08-08 02:21:46 +08:00
|
|
|
"</td>\n";
|
2005-08-08 01:49:46 +08:00
|
|
|
} elsif ($t_type eq "tree") {
|
2005-08-08 02:25:27 +08:00
|
|
|
print "<td class=\"list\">" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"tree", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
|
|
|
|
esc_html($t_name)) .
|
2005-08-08 02:26:27 +08:00
|
|
|
"</td>\n" .
|
2005-08-08 02:27:18 +08:00
|
|
|
"<td class=\"link\">" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$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") .
|
2005-08-08 02:27:18 +08:00
|
|
|
"</td>\n";
|
2005-08-08 01:49:46 +08:00
|
|
|
}
|
2005-08-08 02:21:46 +08:00
|
|
|
print "</tr>\n";
|
2005-08-08 01:49:46 +08:00
|
|
|
}
|
2005-08-08 02:21:46 +08:00
|
|
|
print "</table>\n" .
|
|
|
|
"</div>";
|
2005-08-08 02:02:47 +08:00
|
|
|
git_footer_html();
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
|
|
|
|
2006-08-17 23:29:46 +08:00
|
|
|
sub git_snapshot {
|
|
|
|
|
2006-08-20 14:23:04 +08:00
|
|
|
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");
|
|
|
|
}
|
|
|
|
|
2006-08-17 23:29:46 +08:00
|
|
|
if (!defined $hash) {
|
|
|
|
$hash = git_get_head_hash($project);
|
|
|
|
}
|
|
|
|
|
2006-08-20 14:23:04 +08:00
|
|
|
my $filename = basename($project) . "-$hash.tar.$suffix";
|
2006-08-17 23:29:46 +08:00
|
|
|
|
|
|
|
print $cgi->header(-type => 'application/x-tar',
|
2006-08-22 22:55:34 +08:00
|
|
|
-content_encoding => $ctype,
|
|
|
|
-content_disposition => "inline; filename=\"$filename\"",
|
2006-08-22 22:52:50 +08:00
|
|
|
-status => '200 OK');
|
2006-08-17 23:29:46 +08:00
|
|
|
|
2006-08-20 14:23:04 +08:00
|
|
|
open my $fd, "-|", "$GIT tar-tree $hash \'$project\' | $command" or
|
|
|
|
die_error(undef, "Execute git-tar-tree failed.");
|
2006-08-17 23:29:46 +08:00
|
|
|
binmode STDOUT, ':raw';
|
|
|
|
print <$fd>;
|
|
|
|
binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
|
|
|
|
close $fd;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2005-08-08 02:21:23 +08:00
|
|
|
sub git_log {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $head = git_get_head_hash($project);
|
2005-08-08 02:24:35 +08:00
|
|
|
if (!defined $hash) {
|
2005-08-08 02:26:27 +08:00
|
|
|
$hash = $head;
|
2005-08-08 02:24:35 +08:00
|
|
|
}
|
2005-08-08 02:26:49 +08:00
|
|
|
if (!defined $page) {
|
|
|
|
$page = 0;
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
my $refs = git_get_references();
|
2005-08-08 02:26:49 +08:00
|
|
|
|
|
|
|
my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
|
2006-07-30 05:01:00 +08:00
|
|
|
open my $fd, "-|", $GIT, "rev-list", $limit, $hash
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-rev-list failed");
|
2006-07-30 20:58:11 +08:00
|
|
|
my @revlist = map { chomp; $_ } <$fd>;
|
2005-08-08 02:26:49 +08:00
|
|
|
close $fd;
|
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#revlist);
|
2006-07-30 21:01:07 +08:00
|
|
|
|
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
|
2006-07-30 21:01:07 +08:00
|
|
|
|
2005-08-08 02:21:04 +08:00
|
|
|
if (!@revlist) {
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($hash);
|
2006-07-31 02:32:01 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_header_div('summary', $project);
|
2005-08-08 02:23:35 +08:00
|
|
|
print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
|
2005-08-08 01:49:46 +08:00
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
for (my $i = ($page * 100); $i <= $#revlist; $i++) {
|
|
|
|
my $commit = $revlist[$i];
|
2006-08-14 08:05:47 +08:00
|
|
|
my $ref = format_ref_marker($refs, $commit);
|
|
|
|
my %co = parse_commit($commit);
|
2005-08-08 02:21:04 +08:00
|
|
|
next if !%co;
|
2006-08-14 08:05:47 +08:00
|
|
|
my %ad = parse_date($co{'author_epoch'});
|
|
|
|
git_print_header_div('commit',
|
2006-08-10 18:38:47 +08:00
|
|
|
"<span class=\"age\">$co{'age_string'}</span>" .
|
|
|
|
esc_html($co{'title'}) . $ref,
|
|
|
|
$commit);
|
2005-08-08 02:20:07 +08:00
|
|
|
print "<div class=\"title_text\">\n" .
|
|
|
|
"<div class=\"log_link\">\n" .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") .
|
2006-08-22 22:52:50 +08:00
|
|
|
" | " .
|
|
|
|
$cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") .
|
2005-08-08 02:21:34 +08:00
|
|
|
"<br/>\n" .
|
2005-08-08 02:20:07 +08:00
|
|
|
"</div>\n" .
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
"<i>" . esc_html($co{'author_name'}) . " [$ad{'rfc2822'}]</i><br/>\n" .
|
2006-08-17 17:21:23 +08:00
|
|
|
"</div>\n";
|
|
|
|
|
|
|
|
print "<div class=\"log_body\">\n";
|
|
|
|
git_print_simplified_log($co{'comment'});
|
2005-08-08 02:21:23 +08:00
|
|
|
print "</div>\n";
|
2005-08-08 02:02:33 +08:00
|
|
|
}
|
2005-08-08 02:20:07 +08:00
|
|
|
git_footer_html();
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
sub git_commit {
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($hash);
|
2005-08-08 02:20:07 +08:00
|
|
|
if (!%co) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Unknown commit object");
|
2005-08-08 02:18:13 +08:00
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
|
|
|
|
my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'});
|
2005-08-08 01:49:46 +08:00
|
|
|
|
2005-08-08 02:28:53 +08:00
|
|
|
my $parent = $co{'parent'};
|
|
|
|
if (!defined $parent) {
|
gitweb: Use list for of open for running git commands, thorougly.
Use list form of open for running git commands and reading their
output through pipe, for example
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash
instead of
open my $fd, "-|", "$GIT rev-list --header --parents $hash"
Single letter options use ' instead of " as quotes, according to style
used in list form of magic "-|" open.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-31 09:28:34 +08:00
|
|
|
$parent = "--root";
|
2005-08-08 02:19:56 +08:00
|
|
|
}
|
gitweb: Use list for of open for running git commands, thorougly.
Use list form of open for running git commands and reading their
output through pipe, for example
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash
instead of
open my $fd, "-|", "$GIT rev-list --header --parents $hash"
Single letter options use ' instead of " as quotes, according to style
used in list form of magic "-|" open.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-31 09:28:34 +08:00
|
|
|
open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-diff-tree failed");
|
2006-07-30 20:58:11 +08:00
|
|
|
my @difftree = map { chomp; $_ } <$fd>;
|
2006-08-05 19:13:53 +08:00
|
|
|
close $fd or die_error(undef, "Reading git-diff-tree failed");
|
2005-10-19 09:18:45 +08:00
|
|
|
|
|
|
|
# non-textual hash id's can be cached
|
|
|
|
my $expires;
|
|
|
|
if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
|
|
|
|
$expires = "+1d";
|
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
my $refs = git_get_references();
|
|
|
|
my $ref = format_ref_marker($refs, $co{'id'});
|
2006-08-20 14:23:04 +08:00
|
|
|
|
|
|
|
my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
|
|
|
|
my $have_snapshot = (defined $ctype && defined $suffix);
|
|
|
|
|
2006-07-30 21:01:07 +08:00
|
|
|
my $formats_nav = '';
|
2006-07-24 04:36:32 +08:00
|
|
|
if (defined $file_name && defined $co{'parent'}) {
|
|
|
|
my $parent = $co{'parent'};
|
2006-08-22 22:52:50 +08:00
|
|
|
$formats_nav .=
|
|
|
|
$cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
|
|
|
|
"blame");
|
2006-07-24 04:36:32 +08:00
|
|
|
}
|
2006-07-31 08:21:52 +08:00
|
|
|
git_header_html(undef, $expires);
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
|
2006-08-22 22:52:50 +08:00
|
|
|
$hash, $co{'tree'}, $hash,
|
|
|
|
$formats_nav);
|
2006-07-24 04:36:32 +08:00
|
|
|
|
2005-08-08 02:21:04 +08:00
|
|
|
if (defined $co{'parent'}) {
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
|
2005-08-08 02:21:04 +08:00
|
|
|
} else {
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_header_div('tree', esc_html($co{'title'}) . $ref, $co{'tree'}, $hash);
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
2005-08-08 02:19:56 +08:00
|
|
|
print "<div class=\"title_text\">\n" .
|
2005-08-08 02:21:04 +08:00
|
|
|
"<table cellspacing=\"0\">\n";
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
print "<tr><td>author</td><td>" . esc_html($co{'author'}) . "</td></tr>\n".
|
2005-08-08 02:25:42 +08:00
|
|
|
"<tr>" .
|
|
|
|
"<td></td><td> $ad{'rfc2822'}";
|
2005-08-08 02:18:44 +08:00
|
|
|
if ($ad{'hour_local'} < 6) {
|
2006-08-22 22:52:50 +08:00
|
|
|
printf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
|
|
|
|
$ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
|
2005-08-08 02:21:04 +08:00
|
|
|
} else {
|
2006-08-22 22:52:50 +08:00
|
|
|
printf(" (%02d:%02d %s)",
|
|
|
|
$ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
|
2005-08-08 02:21:04 +08:00
|
|
|
}
|
2005-08-08 02:25:42 +08:00
|
|
|
print "</td>" .
|
|
|
|
"</tr>\n";
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
print "<tr><td>committer</td><td>" . esc_html($co{'committer'}) . "</td></tr>\n";
|
2006-08-22 22:52:50 +08:00
|
|
|
print "<tr><td></td><td> $cd{'rfc2822'}" .
|
|
|
|
sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) .
|
|
|
|
"</td></tr>\n";
|
2006-06-20 22:58:12 +08:00
|
|
|
print "<tr><td>commit</td><td class=\"sha1\">$co{'id'}</td></tr>\n";
|
2005-08-08 02:25:42 +08:00
|
|
|
print "<tr>" .
|
|
|
|
"<td>tree</td>" .
|
2006-06-20 22:58:12 +08:00
|
|
|
"<td class=\"sha1\">" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$hash),
|
|
|
|
class => "list"}, $co{'tree'}) .
|
2005-08-08 02:26:27 +08:00
|
|
|
"</td>" .
|
2006-08-22 22:52:50 +08:00
|
|
|
"<td class=\"link\">" .
|
|
|
|
$cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$hash)},
|
|
|
|
"tree");
|
2006-08-17 23:29:46 +08:00
|
|
|
if ($have_snapshot) {
|
2006-08-22 22:52:50 +08:00
|
|
|
print " | " .
|
|
|
|
$cgi->a({-href => href(action=>"snapshot", hash=>$hash)}, "snapshot");
|
2006-08-17 23:29:46 +08:00
|
|
|
}
|
|
|
|
print "</td>" .
|
2005-08-08 02:25:42 +08:00
|
|
|
"</tr>\n";
|
2006-06-22 14:52:57 +08:00
|
|
|
my $parents = $co{'parents'};
|
2005-08-08 02:05:15 +08:00
|
|
|
foreach my $par (@$parents) {
|
2005-08-08 02:25:42 +08:00
|
|
|
print "<tr>" .
|
|
|
|
"<td>parent</td>" .
|
2006-08-22 22:52:50 +08:00
|
|
|
"<td class=\"sha1\">" .
|
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$par),
|
|
|
|
class => "list"}, $par) .
|
|
|
|
"</td>" .
|
2005-08-08 02:25:42 +08:00
|
|
|
"<td class=\"link\">" .
|
2006-08-16 06:24:30 +08:00
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$par)}, "commit") .
|
2006-08-22 22:52:50 +08:00
|
|
|
" | " .
|
|
|
|
$cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "commitdiff") .
|
2005-08-08 02:25:42 +08:00
|
|
|
"</td>" .
|
|
|
|
"</tr>\n";
|
2005-08-08 02:05:15 +08:00
|
|
|
}
|
2006-06-21 15:48:02 +08:00
|
|
|
print "</table>".
|
2005-08-08 02:21:04 +08:00
|
|
|
"</div>\n";
|
2006-08-17 17:21:23 +08:00
|
|
|
|
2005-08-08 02:12:11 +08:00
|
|
|
print "<div class=\"page_body\">\n";
|
2006-08-17 17:21:23 +08:00
|
|
|
git_print_log($co{'comment'});
|
2005-08-08 02:18:44 +08:00
|
|
|
print "</div>\n";
|
2006-08-14 08:18:33 +08:00
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
git_difftree_body(\@difftree, $hash, $parent);
|
2006-08-14 08:18:33 +08:00
|
|
|
|
2005-08-08 02:02:47 +08:00
|
|
|
git_footer_html();
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
sub git_blobdiff {
|
2005-08-08 02:26:27 +08:00
|
|
|
mkdir($git_temp, 0700);
|
2005-08-08 02:02:47 +08:00
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
if (defined $hash_base && (my %co = parse_commit($hash_base))) {
|
2006-07-30 21:01:07 +08:00
|
|
|
my $formats_nav =
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"blobdiff_plain",
|
|
|
|
hash=>$hash, hash_parent=>$hash_parent)},
|
|
|
|
"plain");
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
|
2005-08-08 02:21:23 +08:00
|
|
|
} else {
|
2006-08-23 05:42:53 +08:00
|
|
|
print <<HTML;
|
|
|
|
<div class="page_nav"><br/><br/></div>
|
|
|
|
<div class="title">$hash vs $hash_parent</div>
|
|
|
|
HTML
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
2006-08-18 01:39:29 +08:00
|
|
|
git_print_page_path($file_name, "blob", $hash_base);
|
2005-08-08 02:17:42 +08:00
|
|
|
print "<div class=\"page_body\">\n" .
|
2005-08-08 02:22:44 +08:00
|
|
|
"<div class=\"diff_info\">blob:" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"blob", hash=>$hash_parent,
|
|
|
|
hash_base=>$hash_base, file_name=>($file_parent || $file_name))},
|
|
|
|
$hash_parent) .
|
2005-08-08 02:20:20 +08:00
|
|
|
" -> blob:" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"blob", hash=>$hash,
|
|
|
|
hash_base=>$hash_base, file_name=>$file_name)},
|
|
|
|
$hash) .
|
2005-08-08 02:22:44 +08:00
|
|
|
"</div>\n";
|
2005-08-08 02:26:27 +08:00
|
|
|
git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash);
|
2006-08-22 22:52:50 +08:00
|
|
|
print "</div>"; # page_body
|
2005-08-08 02:02:47 +08:00
|
|
|
git_footer_html();
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
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");
|
|
|
|
}
|
|
|
|
|
2005-08-08 02:21:23 +08:00
|
|
|
sub git_commitdiff {
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
my $format = shift || 'html';
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($hash);
|
2005-08-08 02:20:07 +08:00
|
|
|
if (!%co) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Unknown commit object");
|
2005-08-08 02:18:13 +08:00
|
|
|
}
|
2005-08-08 02:25:42 +08:00
|
|
|
if (!defined $hash_parent) {
|
2006-08-06 22:14:25 +08:00
|
|
|
$hash_parent = $co{'parent'} || '--root';
|
2005-08-08 02:25:42 +08:00
|
|
|
}
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
|
|
|
|
# read commitdiff
|
|
|
|
my $fd;
|
|
|
|
my @difftree;
|
|
|
|
my @patchset;
|
|
|
|
if ($format eq 'html') {
|
|
|
|
open $fd, "-|", $GIT, "diff-tree", '-r', '-M', '-C',
|
|
|
|
"--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;
|
|
|
|
}
|
|
|
|
@patchset = map { chomp; $_ } <$fd>;
|
|
|
|
|
|
|
|
close $fd
|
|
|
|
or die_error(undef, "Reading git-diff-tree failed");
|
|
|
|
} elsif ($format eq 'plain') {
|
|
|
|
open $fd, "-|", $GIT, "diff-tree", '-r', '-p', '-B', $hash_parent, $hash
|
|
|
|
or die_error(undef, "Open git-diff-tree failed");
|
|
|
|
} else {
|
|
|
|
die_error(undef, "Unknown commitdiff format");
|
|
|
|
}
|
2005-08-08 01:49:46 +08:00
|
|
|
|
2005-10-19 09:18:45 +08:00
|
|
|
# non-textual hash id's can be cached
|
|
|
|
my $expires;
|
|
|
|
if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
|
|
|
|
$expires = "+1d";
|
|
|
|
}
|
2005-08-08 02:21:23 +08:00
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
# 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");
|
2005-08-08 02:28:01 +08:00
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
git_header_html(undef, $expires);
|
|
|
|
git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
|
|
|
|
print "<div class=\"page_body\">\n";
|
|
|
|
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 @tagnames;
|
|
|
|
if (exists $refs->{$hash}) {
|
|
|
|
@tagnames = map { s|^tags/|| } $refs->{$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;
|
2006-08-23 05:42:53 +08:00
|
|
|
From: $co{'author'}
|
|
|
|
Date: $ad{'rfc2822'} ($ad{'tz_local'})
|
|
|
|
Subject: $co{'title'}
|
|
|
|
TEXT
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
foreach my $tag (@tagnames) {
|
|
|
|
print "X-Git-Tag: $tag\n";
|
|
|
|
}
|
|
|
|
print "X-Git-Url: " . $cgi->self_url() . "\n\n";
|
|
|
|
foreach my $line (@{$co{'comment'}}) {
|
|
|
|
print "$line\n";
|
|
|
|
}
|
|
|
|
print "---\n\n";
|
2005-08-08 02:28:01 +08:00
|
|
|
}
|
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
# write patch
|
|
|
|
if ($format eq 'html') {
|
|
|
|
#git_difftree_body(\@difftree, $hash, $hash_parent);
|
|
|
|
#print "<br/>\n";
|
2005-08-08 02:28:01 +08:00
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
git_patchset_body(\@patchset, \@difftree, $hash, $hash_parent);
|
|
|
|
|
|
|
|
print "</div>\n"; # class="page_body"
|
|
|
|
git_footer_html();
|
|
|
|
|
|
|
|
} elsif ($format eq 'plain') {
|
|
|
|
local $/ = undef;
|
|
|
|
print <$fd>;
|
|
|
|
close $fd
|
|
|
|
or print "Reading git-diff-tree failed\n";
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
gitweb: Use git-diff-tree patch output for commitdiff
Get rid of git_diff_print invocation in git_commitdiff and therefore
external diff (/usr/bin/diff) invocation, and use only git-diff-tree
to generate patch.
git_commitdiff and git_commitdiff_plain are collapsed into one
subroutine git_commitdiff, with format (currently 'html' which is
default format corresponding to git_commitdiff, and 'plain'
corresponding to git_commitdiff_plain) specified in argument.
Separate patch (diff) pretty-printing into git_patchset_body.
It is used in git_commitdiff.
Separate patch (diff) line formatting from git_diff_print into
format_diff_line function. It is used in git_patchset_body.
While at it, add $hash parameter to git_difftree_body, according to
rule that inner functions should use parameter passing, and not global
variables.
CHANGES TO OUTPUT:
* "commitdiff" now products patches with renaming and copying
detection (git-diff-tree is invoked with -M and -C options).
Empty patches (mode changes and pure renames and copying)
are not written currently. Former version broke renaming and
copying, and didn't notice mode changes, like this version.
* "commitdiff" output is now divided into several div elements
of class "log", "patchset" and "patch".
* "commitdiff_plain" now only generates X-Git-Tag: line only if there
is tag pointing to the current commit. Former version which wrote
first tag following current commit was broken[*1*]; besides we are
interested rather in tags _preceding_ the commit, and _heads_
following the commit. X-Git-Url: now is current URL; former version
tried[*2*] to output URL to HTML version of commitdiff.
* "commitdiff_plain" is generated by git-diff-tree, and has therefore
has git specific extensions to diff format: "git diff" header and
optional extended header lines.
FOOTNOTES
[*1*] First it generated rev-list starting from HEAD even if hash_base
parameter was set, second it wasn't corrected according to changes
made in git_get_references (formerly read_info_ref) output, third even
for older version of read_info_ref output it didn't work for multiple
tags pointing to the current commit (rare).
[*2*] It wrote URL for commitdiff without hash_parent, which produces
diff to first parent and is not the same as current diff if it is diff
of merge commit to non-first parent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-24 06:15:14 +08:00
|
|
|
sub git_commitdiff_plain {
|
|
|
|
git_commitdiff('plain');
|
|
|
|
}
|
|
|
|
|
2005-08-08 02:21:23 +08:00
|
|
|
sub git_history {
|
2006-07-24 04:26:30 +08:00
|
|
|
if (!defined $hash_base) {
|
2006-08-14 08:05:47 +08:00
|
|
|
$hash_base = git_get_head_hash($project);
|
2005-08-08 02:21:23 +08:00
|
|
|
}
|
2006-07-24 04:31:15 +08:00
|
|
|
my $ftype;
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($hash_base);
|
2005-08-08 02:21:23 +08:00
|
|
|
if (!%co) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Unknown commit object");
|
2005-08-08 02:17:00 +08:00
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
my $refs = git_get_references();
|
2005-08-08 02:16:07 +08:00
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
|
2006-07-24 04:30:08 +08:00
|
|
|
if (!defined $hash && defined $file_name) {
|
|
|
|
$hash = git_get_hash_by_path($hash_base, $file_name);
|
|
|
|
}
|
2006-07-24 04:28:55 +08:00
|
|
|
if (defined $hash) {
|
2006-07-24 04:31:15 +08:00
|
|
|
$ftype = git_get_type($hash);
|
2006-07-24 04:28:55 +08:00
|
|
|
}
|
2006-08-18 01:39:29 +08:00
|
|
|
git_print_page_path($file_name, $ftype, $hash_base);
|
2005-08-08 02:25:27 +08:00
|
|
|
|
2006-07-01 09:54:32 +08:00
|
|
|
open my $fd, "-|",
|
2006-08-01 00:33:37 +08:00
|
|
|
$GIT, "rev-list", "--full-history", $hash_base, "--", $file_name;
|
2006-08-14 08:09:08 +08:00
|
|
|
git_history_body($fd, $refs, $hash_base, $ftype);
|
|
|
|
|
2005-08-08 02:21:04 +08:00
|
|
|
close $fd;
|
2005-08-08 02:16:07 +08:00
|
|
|
git_footer_html();
|
2005-08-08 01:49:46 +08:00
|
|
|
}
|
2005-08-08 02:26:27 +08:00
|
|
|
|
|
|
|
sub git_search {
|
|
|
|
if (!defined $searchtext) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Text field empty");
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
|
|
|
if (!defined $hash) {
|
2006-08-14 08:05:47 +08:00
|
|
|
$hash = git_get_head_hash($project);
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($hash);
|
2005-08-08 02:26:27 +08:00
|
|
|
if (!%co) {
|
2006-08-05 19:13:53 +08:00
|
|
|
die_error(undef, "Unknown commit object");
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
# pickaxe may take all resources of your box and run for several minutes
|
|
|
|
# with every query - so decide by yourself how public you make this feature :)
|
|
|
|
my $commit_search = 1;
|
|
|
|
my $author_search = 0;
|
|
|
|
my $committer_search = 0;
|
|
|
|
my $pickaxe_search = 0;
|
|
|
|
if ($searchtext =~ s/^author\\://i) {
|
|
|
|
$author_search = 1;
|
|
|
|
} elsif ($searchtext =~ s/^committer\\://i) {
|
|
|
|
$committer_search = 1;
|
|
|
|
} elsif ($searchtext =~ s/^pickaxe\\://i) {
|
|
|
|
$commit_search = 0;
|
|
|
|
$pickaxe_search = 1;
|
|
|
|
}
|
2005-08-08 02:26:27 +08:00
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('','', $hash,$co{'tree'},$hash);
|
|
|
|
git_print_header_div('commit', esc_html($co{'title'}), $hash);
|
2005-08-08 02:26:27 +08:00
|
|
|
|
|
|
|
print "<table cellspacing=\"0\">\n";
|
|
|
|
my $alternate = 0;
|
2005-08-08 02:27:18 +08:00
|
|
|
if ($commit_search) {
|
|
|
|
$/ = "\0";
|
gitweb: Use list for of open for running git commands, thorougly.
Use list form of open for running git commands and reading their
output through pipe, for example
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash
instead of
open my $fd, "-|", "$GIT rev-list --header --parents $hash"
Single letter options use ' instead of " as quotes, according to style
used in list form of magic "-|" open.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-31 09:28:34 +08:00
|
|
|
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash or next;
|
2005-08-08 02:27:18 +08:00
|
|
|
while (my $commit_text = <$fd>) {
|
|
|
|
if (!grep m/$searchtext/i, $commit_text) {
|
|
|
|
next;
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
if ($author_search && !grep m/\nauthor .*$searchtext/i, $commit_text) {
|
|
|
|
next;
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
if ($committer_search && !grep m/\ncommitter .*$searchtext/i, $commit_text) {
|
2005-08-08 02:26:27 +08:00
|
|
|
next;
|
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
my @commit_lines = split "\n", $commit_text;
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit(undef, \@commit_lines);
|
2005-08-08 02:27:18 +08:00
|
|
|
if (!%co) {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
if ($alternate) {
|
|
|
|
print "<tr class=\"dark\">\n";
|
|
|
|
} else {
|
|
|
|
print "<tr class=\"light\">\n";
|
|
|
|
}
|
|
|
|
$alternate ^= 1;
|
2005-08-08 02:27:27 +08:00
|
|
|
print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
"<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
|
2005-08-08 02:27:18 +08:00
|
|
|
"<td>" .
|
2006-08-22 18:38:59 +08:00
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), -class => "list subject"},
|
|
|
|
esc_html(chop_str($co{'title'}, 50)) . "<br/>");
|
2005-08-08 02:27:18 +08:00
|
|
|
my $comment = $co{'comment'};
|
|
|
|
foreach my $line (@$comment) {
|
|
|
|
if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
my $lead = esc_html($1) || "";
|
2005-08-08 02:27:18 +08:00
|
|
|
$lead = chop_str($lead, 30, 10);
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
my $match = esc_html($2) || "";
|
|
|
|
my $trail = esc_html($3) || "";
|
2005-08-08 02:27:18 +08:00
|
|
|
$trail = chop_str($trail, 30, 10);
|
2006-06-20 22:58:12 +08:00
|
|
|
my $text = "$lead<span class=\"match\">$match</span>$trail";
|
2005-08-08 02:27:18 +08:00
|
|
|
print chop_str($text, 80, 5) . "<br/>\n";
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
}
|
|
|
|
print "</td>\n" .
|
|
|
|
"<td class=\"link\">" .
|
2006-08-17 06:28:36 +08:00
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
|
2006-08-22 22:52:50 +08:00
|
|
|
" | " .
|
|
|
|
$cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
|
2005-08-08 02:27:18 +08:00
|
|
|
print "</td>\n" .
|
|
|
|
"</tr>\n";
|
|
|
|
}
|
|
|
|
close $fd;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($pickaxe_search) {
|
|
|
|
$/ = "\n";
|
2006-07-13 06:55:10 +08:00
|
|
|
open my $fd, "-|", "$GIT rev-list $hash | $GIT diff-tree -r --stdin -S\'$searchtext\'";
|
2005-08-08 02:27:18 +08:00
|
|
|
undef %co;
|
|
|
|
my @files;
|
|
|
|
while (my $line = <$fd>) {
|
|
|
|
if (%co && $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) {
|
|
|
|
my %set;
|
|
|
|
$set{'file'} = $6;
|
|
|
|
$set{'from_id'} = $3;
|
|
|
|
$set{'to_id'} = $4;
|
|
|
|
$set{'id'} = $set{'to_id'};
|
|
|
|
if ($set{'id'} =~ m/0{40}/) {
|
|
|
|
$set{'id'} = $set{'from_id'};
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
if ($set{'id'} =~ m/0{40}/) {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
push @files, \%set;
|
2005-08-13 04:12:58 +08:00
|
|
|
} elsif ($line =~ m/^([0-9a-fA-F]{40})$/){
|
2005-08-08 02:27:18 +08:00
|
|
|
if (%co) {
|
|
|
|
if ($alternate) {
|
|
|
|
print "<tr class=\"dark\">\n";
|
|
|
|
} else {
|
|
|
|
print "<tr class=\"light\">\n";
|
|
|
|
}
|
|
|
|
$alternate ^= 1;
|
2005-08-08 02:27:27 +08:00
|
|
|
print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
|
replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd)
I still strongly disagree with the git maintainers not to hint people,
to use the only sane default encoding for a distributed project,
which is utf8. I'm tired of hearing filesystem development arguments.
Git is a software offered to merge forth and back across the world
and not to provide a content neutral filesystem.
Btw: I have nothing against the ability to run git in a closed environment,
with a different encoding, that's fine, sure. But that is obviously not
the case for the projects on kernel.org. It's about sane defaults,
nothing else.
You have to make decisions guy, as always in life. The problems to
allow random encoded garbage in commit messages _without_ storing
the encoding, just makes zero sense. Eighter you introduce a per-commit
encoding field, if you insist on this craziness, or you define a default
encoding. Everything else is just lazy and does not solve any problem,
besides that you can claim now, that you are not responsible for the mess
in the repository.
Gitweb shows several commits at once, you allow various encodings committed
to the same repository, without any hint what that garbage from the
individual commits is encoded with. No idea why you don't get
the problem - it's unsolvable. If you merge different peoples work, you
have to speak a common language!
Kay Sievers <kay.sievers@vrfy.org>
2005-11-20 00:41:29 +08:00
|
|
|
"<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
|
2005-08-08 02:27:18 +08:00
|
|
|
"<td>" .
|
2006-08-22 22:52:50 +08:00
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$co{'id'}),
|
|
|
|
-class => "list subject"},
|
2006-08-22 18:38:59 +08:00
|
|
|
esc_html(chop_str($co{'title'}, 50)) . "<br/>");
|
2005-08-08 02:27:18 +08:00
|
|
|
while (my $setref = shift @files) {
|
|
|
|
my %set = %$setref;
|
2006-08-22 22:52:50 +08:00
|
|
|
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>") .
|
2005-08-08 02:27:18 +08:00
|
|
|
"<br/>\n";
|
|
|
|
}
|
|
|
|
print "</td>\n" .
|
|
|
|
"<td class=\"link\">" .
|
2006-08-17 06:28:36 +08:00
|
|
|
$cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
|
2006-08-22 22:52:50 +08:00
|
|
|
" | " .
|
|
|
|
$cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
|
2005-08-08 02:27:18 +08:00
|
|
|
print "</td>\n" .
|
|
|
|
"</tr>\n";
|
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
%co = parse_commit($1);
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
|
|
|
}
|
2005-08-08 02:27:18 +08:00
|
|
|
close $fd;
|
2005-08-08 02:26:27 +08:00
|
|
|
}
|
|
|
|
print "</table>\n";
|
|
|
|
git_footer_html();
|
|
|
|
}
|
|
|
|
|
|
|
|
sub git_shortlog {
|
2006-08-14 08:05:47 +08:00
|
|
|
my $head = git_get_head_hash($project);
|
2005-08-08 02:26:27 +08:00
|
|
|
if (!defined $hash) {
|
|
|
|
$hash = $head;
|
|
|
|
}
|
2005-08-08 02:26:49 +08:00
|
|
|
if (!defined $page) {
|
|
|
|
$page = 0;
|
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
my $refs = git_get_references();
|
2005-08-08 02:26:49 +08:00
|
|
|
|
|
|
|
my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
|
2006-07-30 05:01:00 +08:00
|
|
|
open my $fd, "-|", $GIT, "rev-list", $limit, $hash
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-rev-list failed");
|
2006-07-30 20:58:11 +08:00
|
|
|
my @revlist = map { chomp; $_ } <$fd>;
|
2005-08-08 02:26:27 +08:00
|
|
|
close $fd;
|
2005-08-08 02:26:49 +08:00
|
|
|
|
2006-08-14 08:05:47 +08:00
|
|
|
my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, $#revlist);
|
2006-07-31 17:22:13 +08:00
|
|
|
my $next_link = '';
|
|
|
|
if ($#revlist >= (100 * ($page+1)-1)) {
|
|
|
|
$next_link =
|
2006-08-17 06:28:36 +08:00
|
|
|
$cgi->a({-href => href(action=>"shortlog", hash=>$hash, page=>$page+1),
|
2006-07-31 17:22:13 +08:00
|
|
|
-title => "Alt-n"}, "next");
|
|
|
|
}
|
|
|
|
|
2006-07-30 21:01:07 +08:00
|
|
|
|
|
|
|
git_header_html();
|
2006-08-14 08:05:47 +08:00
|
|
|
git_print_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
|
|
|
|
git_print_header_div('summary', $project);
|
2006-07-30 21:01:07 +08:00
|
|
|
|
2006-07-31 17:22:13 +08:00
|
|
|
git_shortlog_body(\@revlist, ($page * 100), $#revlist, $refs, $next_link);
|
|
|
|
|
2005-08-08 02:26:27 +08:00
|
|
|
git_footer_html();
|
|
|
|
}
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
## ......................................................................
|
|
|
|
## feeds (RSS, OPML)
|
|
|
|
|
|
|
|
sub git_rss {
|
|
|
|
# http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
|
2006-08-14 08:05:47 +08:00
|
|
|
open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_get_head_hash($project)
|
2006-08-05 19:13:53 +08:00
|
|
|
or die_error(undef, "Open git-rev-list failed");
|
2006-08-01 03:22:15 +08:00
|
|
|
my @revlist = map { chomp; $_ } <$fd>;
|
2006-08-05 19:13:53 +08:00
|
|
|
close $fd or die_error(undef, "Reading git-rev-list failed");
|
2006-08-01 03:22:15 +08:00
|
|
|
print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
|
2006-08-23 05:42:53 +08:00
|
|
|
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
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
for (my $i = 0; $i <= $#revlist; $i++) {
|
|
|
|
my $commit = $revlist[$i];
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($commit);
|
2006-08-01 03:22:15 +08:00
|
|
|
# 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;
|
|
|
|
}
|
2006-08-14 08:05:47 +08:00
|
|
|
my %cd = parse_date($co{'committer_epoch'});
|
2006-08-01 03:22:15 +08:00
|
|
|
open $fd, "-|", $GIT, "diff-tree", '-r', $co{'parent'}, $co{'id'} or next;
|
|
|
|
my @difftree = map { chomp; $_ } <$fd>;
|
|
|
|
close $fd or next;
|
|
|
|
print "<item>\n" .
|
|
|
|
"<title>" .
|
|
|
|
sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . esc_html($co{'title'}) .
|
|
|
|
"</title>\n" .
|
|
|
|
"<author>" . esc_html($co{'author'}) . "</author>\n" .
|
|
|
|
"<pubDate>$cd{'rfc2822'}</pubDate>\n" .
|
|
|
|
"<guid isPermaLink=\"true\">" . esc_html("$my_url?p=$project;a=commit;h=$commit") . "</guid>\n" .
|
|
|
|
"<link>" . esc_html("$my_url?p=$project;a=commit;h=$commit") . "</link>\n" .
|
|
|
|
"<description>" . esc_html($co{'title'}) . "</description>\n" .
|
|
|
|
"<content:encoded>" .
|
|
|
|
"<![CDATA[\n";
|
|
|
|
my $comment = $co{'comment'};
|
|
|
|
foreach my $line (@$comment) {
|
|
|
|
$line = decode("utf8", $line, Encode::FB_DEFAULT);
|
|
|
|
print "$line<br/>\n";
|
|
|
|
}
|
|
|
|
print "<br/>\n";
|
|
|
|
foreach my $line (@difftree) {
|
|
|
|
if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
my $file = validate_input(unquote($7));
|
|
|
|
$file = decode("utf8", $file, Encode::FB_DEFAULT);
|
|
|
|
print "$file<br/>\n";
|
|
|
|
}
|
|
|
|
print "]]>\n" .
|
|
|
|
"</content:encoded>\n" .
|
|
|
|
"</item>\n";
|
|
|
|
}
|
|
|
|
print "</channel></rss>";
|
|
|
|
}
|
|
|
|
|
|
|
|
sub git_opml {
|
2006-08-14 08:05:47 +08:00
|
|
|
my @list = git_get_projects_list();
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
|
2006-08-23 05:42:53 +08:00
|
|
|
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
|
2006-08-01 03:22:15 +08:00
|
|
|
|
|
|
|
foreach my $pr (@list) {
|
|
|
|
my %proj = %$pr;
|
2006-08-14 08:05:47 +08:00
|
|
|
my $head = git_get_head_hash($proj{'path'});
|
2006-08-01 03:22:15 +08:00
|
|
|
if (!defined $head) {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
$ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
|
2006-08-14 08:05:47 +08:00
|
|
|
my %co = parse_commit($head);
|
2006-08-01 03:22:15 +08:00
|
|
|
if (!%co) {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
|
|
|
|
my $path = esc_html(chop_str($proj{'path'}, 25, 5));
|
|
|
|
my $rss = "$my_url?p=$proj{'path'};a=rss";
|
|
|
|
my $html = "$my_url?p=$proj{'path'};a=summary";
|
|
|
|
print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
|
|
|
|
}
|
2006-08-23 05:42:53 +08:00
|
|
|
print <<XML;
|
|
|
|
</outline>
|
|
|
|
</body>
|
|
|
|
</opml>
|
|
|
|
XML
|
2006-08-01 03:22:15 +08:00
|
|
|
}
|