All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Cernekee <cernekee@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH v2 4/3] gitweb: Always call format_date with timezone parameter
Date: Sat, 19 Mar 2011 19:11:16 -0700	[thread overview]
Message-ID: <b599dae39131b90d0970a1ef63e6599b@localhost> (raw)
In-Reply-To: <4f21902cf5f72b30a96465cf911d13aa@localhost>

From: Jakub Narebski <jnareb@gmail.com>

Make the timezone parameter mandatory.  This ensures that the *_local
fields are always populated with accurate information.

Also, delete an unnecessary call to format_date().

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---

v2: Fix typos.  Remove unnecessary call.  Remove default "-0000" tz value.
Rebase on top of my patch 3/3 (as applying -1/3 then 1/3 would create a
merge conflict).

 gitweb/gitweb.perl |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 2d4349f..485ebd0 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2907,8 +2907,7 @@ sub git_get_rev_name_tags {
 ## parse to hash functions
 
 sub format_date {
-	my $epoch = shift;
-	my $tz = shift || "-0000";
+	my ($epoch, $tz) = @_;
 
 	my %date;
 	my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
@@ -4943,7 +4942,6 @@ sub git_log_body {
 		next if !%co;
 		my $commit = $co{'id'};
 		my $ref = format_ref_marker($refs, $commit);
-		my %ad = format_date($co{'author_epoch'});
 		git_print_header_div('commit',
 		               "<span class=\"age\">$co{'age_string'}</span>" .
 		               esc_html($co{'title'}) . $ref,
@@ -7102,7 +7100,8 @@ sub git_feed {
 	if (defined($commitlist[0])) {
 		%latest_commit = %{$commitlist[0]};
 		my $latest_epoch = $latest_commit{'committer_epoch'};
-		%latest_date   = format_date($latest_epoch);
+		%latest_date   = format_date($latest_epoch,
+		                             $latest_commit{'committer_tz'});
 		my $if_modified = $cgi->http('IF_MODIFIED_SINCE');
 		if (defined $if_modified) {
 			my $since;
@@ -7233,7 +7232,7 @@ XML
 		if (($i >= 20) && ((time - $co{'author_epoch'}) > 48*60*60)) {
 			last;
 		}
-		my %cd = format_date($co{'author_epoch'});
+		my %cd = format_date($co{'author_epoch'}, $co{'author_tz'});
 
 		# get list of changed files
 		open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
-- 
1.7.4.1

  parent reply	other threads:[~2011-03-20  2:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-19 20:48 [PATCH v2 1/3] gitweb: rename parse_date() to format_date() Kevin Cernekee
2011-03-19 20:48 ` [PATCH v5 2/3] gitweb: introduce localtime feature Kevin Cernekee
2011-03-19 20:48 ` [PATCH/RFC 3/3] gitweb: change highlighting of "atnight" commits Kevin Cernekee
2011-03-19 22:18 ` [PATCH -1/3] gitweb: Always call parse_date with timezone parameter Jakub Narebski
2011-03-19 22:53   ` [PATCH -1/3 (amend)] " Jakub Narebski
2011-03-19 22:56   ` [PATCH -1/3] " Kevin Cernekee
2011-03-20  0:25     ` Jakub Narebski
2011-03-20  0:27     ` Junio C Hamano
2011-03-20  2:11 ` Kevin Cernekee [this message]
2011-03-20 10:37   ` [PATCH v2 4/3] gitweb: Always call format_date " Jakub Narebski
2011-03-20 11:07     ` Jakub Narebski
2011-03-20 20:47       ` Kevin Cernekee

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=b599dae39131b90d0970a1ef63e6599b@localhost \
    --to=cernekee@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.