threads / patch / 4601
Subject: [PATCH 3/3] Move $gitbin earlier in gitweb.cgi
Jakub Narebski[PATCH 0/3] Minor gitweb modifications and cleanups
This series of patches is based on git.git 'next' branch 69d830d1a3a1236036bd0f84dd9794d7c8d34b3f
My future gitweb-related batches will be based on this series.
---
gitweb/gitweb.cgi | 53 +++++++++++++++++++++++++++++++---------------------- gitweb/gitweb.css | 4 ++-- 2 files changed, 33 insertions(+), 24 deletions(-)
-- Jakub Narebski ShadeHawk on #git (git-send-email 1.4.0 with setlocale patch)
Jakub Narebski[PATCH 1/3] gitweb: whitespace cleanup
Do not use tabs to align variable initialization (actually use tabs only at the beginning of line, for code indent). Remove trailing whitespace. Make whitespace usage more consistent.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
gitweb/gitweb.cgi | 38 +++++++++++++++++++------------------- gitweb/gitweb.css | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-)
691405ab79e0dacbe3b96a404740faf3f10bffd7
gitweb/gitweb.cgi, gitweb/gitweb.css
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi index 44896bb..89224e6 100755 --- a/gitweb/gitweb.cgi +++ b/gitweb/gitweb.cgi @@ -17,33 +17,33 @@ use Fcntl ':mode'; binmode STDOUT, ':utf8'; my $cgi = new CGI; -my $version = "267"; -my $my_url = $cgi->url(); -my $my_uri = $cgi->url(-absolute => 1); -my $rss_link = ""; +my $version = "267"; +my $my_url = $cgi->url(); +my $my_uri = $cgi->url(-absolute => 1); +my $rss_link = ""; # absolute fs-path which will be prepended to the project path -#my $projectroot = "/pub/scm"; -my $projectroot = "/home/kay/public_html/pub/scm"; +#my $projectroot = "/pub/scm"; +my $projectroot = "/home/kay/public_html/pub/scm"; # location of the git-core binaries -my $gitbin = "/usr/bin"; +my $gitbin = "/usr/bin"; # location for temporary files needed for diffs -my $git_temp = "/tmp/gitweb"; +my $git_temp = "/tmp/gitweb"; # target of the home link on top of all pages -my $home_link = $my_uri; +my $home_link = $my_uri; # html text to include at home page -my $home_text = "indextext.html"; +my $home_text = "indextext.html"; # URI of default stylesheet -my $stylesheet = "gitweb.css"; +my $stylesheet = "gitweb.css"; # source of projects list -#my $projects_list = $projectroot; -my $projects_list = "index/index.aux"; +#my $projects_list = $projectroot; +my $projects_list = "index/index.aux"; # default blob_plain mimetype and default charset for text/plain blob my $default_blob_plain_mimetype = 'text/plain'; @@ -51,7 +51,7 @@ my $default_text_plain_charset = undef; # file to use for guessing MIME types before trying /etc/mime.types # (relative to the current git repository) -my $mimetypes_file = undef; +my $mimetypes_file = undef; # input validation and dispatch @@ -349,7 +349,7 @@ sub git_footer_html { sub die_error { my $status = shift || "403 Forbidden"; - my $error = shift || "Malformed query, file missing or permission denied"; + my $error = shift || "Malformed query, file missing or permission denied"; git_header_html($status); print "<div class=\"page_body\">\n" . @@ -1066,7 +1066,7 @@ sub git_summary { "<td>"; if (length($co{'title_short'}) < length($co{'title'})) { print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"}, - "<b>" . esc_html($co{'title_short'}) . "$ref</b>"); + "<b>" . esc_html($co{'title_short'}) . "$ref</b>"); } else { print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"}, "<b>" . esc_html($co{'title'}) . "$ref</b>"); @@ -1124,7 +1124,7 @@ sub git_summary { print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'}); if ($tag{'reftype'} eq "commit") { print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . - " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log"); + " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log"); } print "</td>\n" . "</tr>"; @@ -1362,7 +1362,7 @@ sub git_tags { print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'}); if ($tag{'reftype'} eq "commit") { print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . - " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log"); + " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log"); } print "</td>\n" . "</tr>"; @@ -1942,7 +1942,7 @@ sub git_commit { "</td>" . "</tr>\n"; } - print "</table>". + print "</table>". "</div>\n"; print "<div class=\"page_body\">\n"; my $comment = $co{'comment'}; diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css index ac6a3c7..98410f5 100644 --- a/gitweb/gitweb.css +++ b/gitweb/gitweb.css @@ -1,7 +1,7 @@ body { font-family: sans-serif; font-size: 12px; - border:solid #d9d8d1; + border: solid #d9d8d1; border-width: 1px; margin: 10px; background-color: #ffffff; @@ -33,7 +33,7 @@ div.page_header a:hover { } div.page_nav { - padding:8px; + padding: 8px; } div.page_nav a:visited {
-- 1.3.0
Jakub Narebski[PATCH 2/3] Add git version to gitweb output
Add git-core binaries used version as the comment at the beginning of HTML output, just below the comment with version of git web interface version.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
gitweb/gitweb.cgi | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
4434b02e9a56cf5d1939021b950bbe54240a413d
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi index 89224e6..87ec565 100755 --- a/gitweb/gitweb.cgi +++ b/gitweb/gitweb.cgi @@ -29,6 +29,14 @@ my $projectroot = "/home/kay/public_html # location of the git-core binaries my $gitbin = "/usr/bin"; +# version of the git-core binaries +my $git_version = qx($gitbin/git --version); +if ($git_version =~ m/git version (.*)$/) { + $git_version = $1; +} else { + $git_version = "unknown"; +} + # location for temporary files needed for diffs my $git_temp = "/tmp/gitweb"; @@ -288,11 +296,12 @@ sub git_header_html { <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> <!-- git web interface v$version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke --> +<!-- git core binaries version $git_version --> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8"/> <meta name="robots" content="index, nofollow"/> -<link rel="stylesheet" type="text/css" href="$stylesheet"/> <title>$title</title> +<link rel="stylesheet" type="text/css" href="$stylesheet"/> $rss_link </head> <body> @@ -816,7 +825,7 @@ sub git_get_project_config { $key =~ s/^gitweb\.//; return if ($key =~ m/\W/); - my $val = qx(git-repo-config --get gitweb.$key); + my $val = qx($gitbin/git-repo-config --get gitweb.$key); return ($val); }
-- 1.3.0
Jakub Narebski(cherry picked from 9dca843086356b964f27d8fabe1e3c48074a9f02 commit)
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
--- Cherry picked commit is from feature branch in my repository: http://front.fuw.edu.pl/cgi-bin/jnareb/gitweb.cgi?p=git.git;a=summary http://front.fuw.edu.pl/jnareb/scm/git.git/
gitweb/gitweb.cgi | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
f8bd1032e0d6ec88f540a820b4f5b4789562ee05
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi index 87ec565..ef7fcbd 100755 --- a/gitweb/gitweb.cgi +++ b/gitweb/gitweb.cgi @@ -22,13 +22,13 @@ my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); my $rss_link = ""; +# location of the git-core binaries +my $gitbin = "/usr/bin"; + # absolute fs-path which will be prepended to the project path #my $projectroot = "/pub/scm"; my $projectroot = "/home/kay/public_html/pub/scm"; -# location of the git-core binaries -my $gitbin = "/usr/bin"; - # version of the git-core binaries my $git_version = qx($gitbin/git --version); if ($git_version =~ m/git version (.*)$/) {
-- 1.3.0