mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-09 10:36:09 +02:00
Code

Merge branch 'lt/gitweb' 

* lt/gitweb:
  gitweb: Declare global variables with "our"
  gitweb: Enable tree (directory) history display
  gitweb: optimize per-file history generation
This commit is contained in:
Junio C Hamano 2006-07-05 16:40:15 -07:00
parent a3d470c2d5 4a87b43e37
commit bc483d0480
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gitweb/gitweb.cgi
View File

@ -16,21 +16,21 @@ use Encode;
use Fcntl ':mode'; use Fcntl ':mode';
binmode STDOUT, ':utf8'; binmode STDOUT, ':utf8';
my $cgi = new CGI; our $cgi = new CGI;
my $version = "267"; our $version = "267";
my $my_url = $cgi->url(); our $my_url = $cgi->url();
my $my_uri = $cgi->url(-absolute => 1); our $my_uri = $cgi->url(-absolute => 1);
my $rss_link = ""; our $rss_link = "";
# location of the git-core binaries # location of the git-core binaries
my $gitbin = "/usr/bin"; our $gitbin = "/usr/bin";
# absolute fs-path which will be prepended to the project path # absolute fs-path which will be prepended to the project path
#my $projectroot = "/pub/scm"; #our $projectroot = "/pub/scm";
my $projectroot = "/home/kay/public_html/pub/scm"; our $projectroot = "/home/kay/public_html/pub/scm";
# version of the git-core binaries # version of the git-core binaries
my $git_version = qx($gitbin/git --version); our $git_version = qx($gitbin/git --version);
if ($git_version =~ m/git version (.*)$/) { if ($git_version =~ m/git version (.*)$/) {
$git_version = $1; $git_version = $1;
} else { } else {
@ -38,32 +38,31 @@ if ($git_version =~ m/git version (.*)$/) {
} }
# location for temporary files needed for diffs # location for temporary files needed for diffs
my $git_temp = "/tmp/gitweb"; our $git_temp = "/tmp/gitweb";
# target of the home link on top of all pages # target of the home link on top of all pages
my $home_link = $my_uri; our $home_link = $my_uri;
# html text to include at home page # html text to include at home page
my $home_text = "indextext.html"; our $home_text = "indextext.html";
# URI of default stylesheet # URI of default stylesheet
my $stylesheet = "gitweb.css"; our $stylesheet = "gitweb.css";
# source of projects list # source of projects list
#my $projects_list = $projectroot; #our $projects_list = $projectroot;
my $projects_list = "index/index.aux"; our $projects_list = "index/index.aux";
# default blob_plain mimetype and default charset for text/plain blob # default blob_plain mimetype and default charset for text/plain blob
my $default_blob_plain_mimetype = 'text/plain'; our $default_blob_plain_mimetype = 'text/plain';
my $default_text_plain_charset = undef; our $default_text_plain_charset = undef;
# file to use for guessing MIME types before trying /etc/mime.types # file to use for guessing MIME types before trying /etc/mime.types
# (relative to the current git repository) # (relative to the current git repository)
my $mimetypes_file = undef; our $mimetypes_file = undef;
# input validation and dispatch # input validation and dispatch
my $action = $cgi->param('a'); our $action = $cgi->param('a');
if (defined $action) { if (defined $action) {
if ($action =~ m/[^0-9a-zA-Z\.\-_]/) { if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
undef $action; undef $action;
@ -78,7 +77,7 @@ if (defined $action) {
} }
} }
my $order = $cgi->param('o'); our $order = $cgi->param('o');
if (defined $order) { if (defined $order) {
if ($order =~ m/[^0-9a-zA-Z_]/) { if ($order =~ m/[^0-9a-zA-Z_]/) {
undef $order; undef $order;
@ -86,7 +85,7 @@ if (defined $order) {
} }
} }
my $project = ($cgi->param('p') || $ENV{'PATH_INFO'}); our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
if (defined $project) { if (defined $project) {
$project =~ s|^/||; $project =~ s|/$||; $project =~ s|^/||; $project =~ s|/$||;
$project = validate_input($project); $project = validate_input($project);
@ -109,7 +108,7 @@ if (defined $project) {
exit; exit;
} }
my $file_name = $cgi->param('f'); our $file_name = $cgi->param('f');
if (defined $file_name) { if (defined $file_name) {
$file_name = validate_input($file_name); $file_name = validate_input($file_name);
if (!defined($file_name)) { if (!defined($file_name)) {
@ -117,7 +116,7 @@ if (defined $file_name) {
} }
} }
my $hash = $cgi->param('h'); our $hash = $cgi->param('h');
if (defined $hash) { if (defined $hash) {
$hash = validate_input($hash); $hash = validate_input($hash);
if (!defined($hash)) { if (!defined($hash)) {
@ -125,7 +124,7 @@ if (defined $hash) {
} }
} }
my $hash_parent = $cgi->param('hp'); our $hash_parent = $cgi->param('hp');
if (defined $hash_parent) { if (defined $hash_parent) {
$hash_parent = validate_input($hash_parent); $hash_parent = validate_input($hash_parent);
if (!defined($hash_parent)) { if (!defined($hash_parent)) {
@ -133,7 +132,7 @@ if (defined $hash_parent) {
} }
} }
my $hash_base = $cgi->param('hb'); our $hash_base = $cgi->param('hb');
if (defined $hash_base) { if (defined $hash_base) {
$hash_base = validate_input($hash_base); $hash_base = validate_input($hash_base);
if (!defined($hash_base)) { if (!defined($hash_base)) {
@ -141,7 +140,7 @@ if (defined $hash_base) {
} }
} }
my $page = $cgi->param('pg'); our $page = $cgi->param('pg');
if (defined $page) { if (defined $page) {
if ($page =~ m/[^0-9]$/) { if ($page =~ m/[^0-9]$/) {
undef $page; undef $page;
@ -149,7 +148,7 @@ if (defined $page) {
} }
} }
my $searchtext = $cgi->param('s'); our $searchtext = $cgi->param('s');
if (defined $searchtext) { if (defined $searchtext) {
if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) { if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
undef $searchtext; undef $searchtext;
@ -1676,6 +1675,7 @@ sub git_tree {
"</td>\n" . "</td>\n" .
"<td class=\"link\">" . "<td class=\"link\">" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$t_hash$base_key;f=$base$t_name")}, "tree") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$t_hash$base_key;f=$base$t_name")}, "tree") .
" | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;h=$hash_base;f=$base$t_name")}, "history") .
"</td>\n"; "</td>\n";
} }
print "</tr>\n"; print "</tr>\n";
@ -2295,16 +2295,13 @@ sub git_history {
"</div>\n"; "</div>\n";
print "<div class=\"page_path\"><b>/" . esc_html($file_name) . "</b><br/></div>\n"; print "<div class=\"page_path\"><b>/" . esc_html($file_name) . "</b><br/></div>\n";
open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -- \'$file_name\'"; open my $fd, "-|",
my $commit; "$gitbin/git-rev-list --full-history $hash -- \'$file_name\'";
print "<table cellspacing=\"0\">\n"; print "<table cellspacing=\"0\">\n";
my $alternate = 0; my $alternate = 0;
while (my $line = <$fd>) { while (my $line = <$fd>) {
if ($line =~ m/^([0-9a-fA-F]{40})/){ if ($line =~ m/^([0-9a-fA-F]{40})/){
$commit = $1; my $commit = $1;
next;
}
if ($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/ && (defined $commit)) {
my %co = git_read_commit($commit); my %co = git_read_commit($commit);
if (!%co) { if (!%co) {
next; next;
@ -2336,7 +2333,6 @@ sub git_history {
} }
print "</td>\n" . print "</td>\n" .
"</tr>\n"; "</tr>\n";
undef $commit;
} }
} }
print "</table>\n"; print "</table>\n";