From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 1] gitweb: whitespace cleanup
Date: Sat, 29 Jul 2006 22:43:40 +0200 [thread overview]
Message-ID: <200607292243.41264.jnareb@gmail.com> (raw)
In-Reply-To: <200607292239.11034.jnareb@gmail.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Use tab for indenting commands, spaces for align
(because the fact that some elements are aligned
should not depend on the tab width).
gitweb/gitweb.cgi | 58 +++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index e5fca63..f92eeab 100755
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -36,7 +36,7 @@ our $git_version = qx($GIT --version) =~
# location for temporary files needed for diffs
our $git_temp = "/tmp/gitweb";
if (! -d $git_temp) {
- mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp");
+ mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp");
}
# target of the home link on top of all pages
@@ -104,7 +104,7 @@ if (defined $project) {
die_error(undef, "No such project.");
}
$rss_link = "<link rel=\"alternate\" title=\"" . esc_param($project) . " log\" href=\"" .
- "$my_uri?" . esc_param("p=$project;a=rss") . "\" type=\"application/rss+xml\"/>";
+ "$my_uri?" . esc_param("p=$project;a=rss") . "\" type=\"application/rss+xml\"/>";
$ENV{'GIT_DIR'} = "$projectroot/$project";
} else {
git_project_list();
@@ -303,7 +303,7 @@ sub git_header_html {
} else {
$content_type = 'text/html';
}
- print $cgi->header(-type=>$content_type, -charset => 'utf-8', -status=> $status, -expires => $expires);
+ print $cgi->header(-type=>$content_type, -charset => 'utf-8', -status=> $status, -expires => $expires);
print <<EOF;
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -1138,17 +1138,17 @@ sub git_summary {
"</td>\n" .
"<td>";
if (defined($comment)) {
- print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, esc_html($comment));
+ print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, esc_html($comment));
}
print "</td>\n" .
"<td class=\"link\">";
if ($tag{'type'} eq "tag") {
- print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
+ print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
}
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");
+ print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
}
print "</td>\n" .
"</tr>";
@@ -1457,17 +1457,17 @@ sub git_tags {
"</td>\n" .
"<td>";
if (defined($comment)) {
- print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, $comment);
+ print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, $comment);
}
print "</td>\n" .
"<td class=\"link\">";
if ($tag{'type'} eq "tag") {
- print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
+ print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
}
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");
+ print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
}
print "</td>\n" .
"</tr>";
@@ -1613,13 +1613,14 @@ sub git_blob_plain_mimetype {
sub git_blob_plain {
if (!defined $hash) {
- if (defined $file_name) {
- my $base = $hash_base || git_read_head($project);
- $hash = git_get_hash_by_path($base, $file_name, "blob") || die_error(undef, "Error lookup file.");
- } else {
- die_error(undef, "No file name defined.");
- }
- }
+ if (defined $file_name) {
+ my $base = $hash_base || git_read_head($project);
+ $hash = git_get_hash_by_path($base, $file_name, "blob")
+ or die_error(undef, "Error lookup file.");
+ } else {
+ die_error(undef, "No file name defined.");
+ }
+ }
my $type = shift;
open my $fd, "-|", "$GIT cat-file blob $hash" or die_error("Couldn't cat $file_name, $hash");
@@ -1644,13 +1645,14 @@ sub git_blob_plain {
sub git_blob {
if (!defined $hash) {
- if (defined $file_name) {
- my $base = $hash_base || git_read_head($project);
- $hash = git_get_hash_by_path($base, $file_name, "blob") || die_error(undef, "Error lookup file.");
- } else {
- die_error(undef, "No file name defined.");
- }
- }
+ if (defined $file_name) {
+ my $base = $hash_base || git_read_head($project);
+ $hash = git_get_hash_by_path($base, $file_name, "blob")
+ or die_error(undef, "Error lookup file.");
+ } else {
+ die_error(undef, "No file name defined.");
+ }
+ }
my $have_blame = git_get_project_config_bool ('blame');
open my $fd, "-|", "$GIT cat-file blob $hash" or die_error(undef, "Open failed.");
my $mimetype = git_blob_plain_mimetype($fd, $file_name);
@@ -1677,7 +1679,7 @@ sub git_blob {
print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain") . "<br/>\n";
}
print "</div>\n".
- "<div>" .
+ "<div>" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
"</div>\n";
} else {
@@ -2305,7 +2307,7 @@ sub git_commitdiff {
my $status = $5;
my $file = validate_input(unquote($6));
if ($status eq "A") {
- print "<div class=\"diff_info\">" . file_type($to_mode) . ":" .
+ print "<div class=\"diff_info\">" . file_type($to_mode) . ":" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, $to_id) . "(new)" .
"</div>\n";
git_diff_print(undef, "/dev/null", $to_id, "b/$file");
@@ -2359,7 +2361,7 @@ sub git_commitdiff_plain {
"Date: $ad{'rfc2822'} ($ad{'tz_local'})\n".
"Subject: $co{'title'}\n";
if (defined $tagname) {
- print "X-Git-Tag: $tagname\n";
+ print "X-Git-Tag: $tagname\n";
}
print "X-Git-Url: $my_url?p=$project;a=commitdiff;h=$hash\n" .
"\n";
--
1.4.0
next prev parent reply other threads:[~2006-07-29 20:43 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-29 20:39 [PATCH 0] Some gitweb patches Jakub Narebski
2006-07-29 20:43 ` Jakub Narebski [this message]
2006-07-29 20:51 ` [PATCH 2] gitweb: Use list for of open for running git commands, thorougly Jakub Narebski
2006-07-30 2:12 ` Jakub Narebski
2006-07-31 10:53 ` Junio C Hamano
2006-07-31 11:42 ` Jakub Narebski
2006-07-31 12:10 ` Jakub Narebski
2006-07-31 12:38 ` Jakub Narebski
2006-07-31 12:59 ` Jakub Narebski
2006-07-29 20:55 ` [PATCH 3] gitweb: simplify git_get_hash_by_path Jakub Narebski
2006-07-29 21:01 ` [PATCH 4] gitweb: More explicit error messages for open "-|" Jakub Narebski
2006-07-30 2:08 ` [PATCH 5] gitweb: Cleanup - chomp $line in consistent style Jakub Narebski
2006-07-30 2:11 ` [PATCH 6] gitweb: Correct error from changing "-|" open to list form in git_commit Jakub Narebski
2006-07-30 12:58 ` [PATCH 7] gitweb: Cleanup - chomp @lines in consistent style Jakub Narebski
2006-07-30 12:59 ` [PATCH 8] gitweb: Add git_page_nav for later use Jakub Narebski
2006-07-30 13:01 ` [PATCH 9] gitweb: Navbar refactoring - use git_page_nav to generate navigation bar Jakub Narebski
2006-07-30 13:02 ` [PATCH 10] gitweb: Replace form-feed character by ^L Jakub Narebski
2006-07-30 14:13 ` [PATCH 11] gitweb: Read project description using utf-8 encoding Jakub Narebski
2006-07-30 15:20 ` Jakub Narebski
2006-07-30 15:47 ` [PATCH 11] gitweb: Show project descriptions with utf-8 characters in project list correctly Jakub Narebski
2006-07-30 14:14 ` [PATCH 12] gitweb: Add "\n" after <br/> in git_page_nav Jakub Narebski
2006-07-30 15:49 ` [PATCH 13] gitweb: Pager refactoring - use git_get_paging_nav for pagination Jakub Narebski
2006-07-30 18:31 ` [PATCH 14] gitweb: Remove $project from git_get_paging_nav arguments Jakub Narebski
2006-07-30 18:32 ` [PATCH 15] gitweb: Headers refactoring - use git_header_div for header divs Jakub Narebski
2006-07-30 20:36 ` [PATCH 16] gitweb: Remove characters entities entirely when shortening string Jakub Narebski
2006-07-31 16:59 ` Jakub Narebski
2006-07-31 18:58 ` [PATCH 16b] gitweb: Remove characters entities entirely when shortening string -- correction Jakub Narebski
2006-07-31 0:21 ` [PATCH 17] gitweb: Ref refactoring - use git_get_referencing for marking tagged/head commits Jakub Narebski
2006-07-31 9:22 ` [PATCH 18] gitweb: Refactor generation of shortlog, tags and heads body Jakub Narebski
2006-07-31 16:33 ` [PATCH 19] gitweb: No need to quote path for list version of open "-|" Jakub Narebski
2006-07-31 18:55 ` Junio C Hamano
2006-07-31 19:00 ` Jakub Narebski
2006-08-01 2:17 ` Junio C Hamano
2006-08-01 2:18 ` There can be more than two levels of subdirectories Junio C Hamano
2006-07-31 18:48 ` [PATCH 20] gitweb: Reordering code and dividing it into categories Jakub Narebski
2006-07-31 19:22 ` [PATCH 20 (amend)] " Jakub Narebski
2006-07-31 21:46 ` [PATCH] gitweb: use a hash to lookup the sub for an action Matthias Lederhofer
2006-07-31 22:39 ` Junio C Hamano
2006-07-31 22:55 ` [PATCH 21] " Jakub Narebski
2006-08-01 2:50 ` [PATCH] " Luben Tuikov
2006-08-01 0:59 ` [PATCH 22] Jakub Narebski
2006-08-01 2:12 ` Perhaps an obvious cut and paste error Junio C Hamano
2006-08-01 7:23 ` Jakub Narebski
2006-08-01 4:24 ` A few more fixups to gitweb Junio C Hamano
2006-08-01 7:36 ` Jakub Narebski
2006-08-01 8:04 ` Junio C Hamano
2006-08-01 9:34 ` [PATCH 1/2] Use tabs for indent in shell scripts Jakub Narebski
2006-08-01 9:36 ` [PATCH 2/2] Set User-Agent string in shell scripts used for fetching Jakub Narebski
2006-08-01 9:51 ` Junio C Hamano
2006-08-01 9:50 ` [PATCH 1/2] Use tabs for indent in shell scripts Junio C Hamano
2006-08-01 10:01 ` Jakub Narebski
2006-08-01 20:10 ` A few more fixups to gitweb Luben Tuikov
2006-08-01 12:48 ` [PATCH] gitweb: clean up user configuration part Matthias Lederhofer
2006-08-01 13:53 ` [RFC/PATCH] gitweb: include perl files for configuration Matthias Lederhofer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200607292243.41264.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).