format_timestamp_html loses its "-localtime => 1" option, and now
always print the local time (in author/comitter/tagger local
timezone), with "atnight" warning if needed.
This means that both 'summary' and 'log' views now display localtime.
In the case of 'log' view this can be thought as an improvement, as
now one can easily see which commits in a series are made "atnight"
and should be examined closer.
Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
---
This patch is unchanged from first version of this series.
It is not really necessary (at least not as part of this series),
though dropping it from series would probably require resolving
trivial spurious textual conflicts. On the other hand it is natural
enhancement to previous patch, and could have been squashed with it,
if I didn't want the previous patch to be pure refactoring, without
changing gitweb output.
It was marked as an RFC in first version of this series, because I was
not quite satisfied with the way 'log' view looks like after this
change, but it grew up on me (well, I have a few doubts about new look
of 'summary' page).
This patch has of course no equivalent in original J.H. patch.
gitweb/gitweb.perl | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7329db2..67bcfe8 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3939,11 +3939,9 @@ sub git_print_section {
}
sub format_timestamp_html {
- my ($date, %opts) = @_;
+ my $date = shift;
my $strtime = $date->{'rfc2822'};
- return $strtime unless $opts{'-localtime'};
-
my $localtime_format = '(%02d:%02d %s)';
if ($date->{'hour_local'} < 6) {
$localtime_format = '(<span class="atnight">%02d:%02d</span> %s)';
@@ -3965,7 +3963,7 @@ sub git_print_authorship {
my %ad = parse_date($co->{'author_epoch'}, $co->{'author_tz'});
print "<$tag class=\"author_date\">" .
format_search_author($author, "author", esc_html($author)) .
- " [".format_timestamp_html(\%ad, %opts)."]".
+ " [".format_timestamp_html(\%ad)."]".
git_get_avatar($co->{'author_email'}, -pad_before => 1) .
"</$tag>\n";
}
@@ -3992,7 +3990,7 @@ sub git_print_authorship_rows {
"</td></tr>\n" .
"<tr>" .
"<td></td><td>" .
- format_timestamp_html(\%wd, -localtime=>1) .
+ format_timestamp_html(\%wd) .
"</td>" .
"</tr>\n";
}
--
1.7.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html