git-svn: Fix time zone in --localtime
Use numerical form of time zone to replace alphabetic time zone abbreviation generated by "%Z". "%Z" is not portable and contain ambiguity for many areas. For example, CST could be "Central Standard Time" (GMT-0600) and "China Standard Time" (GMT+0800). Alphabetic time zone abbreviation is meant for human readability, not for specifying a time zone for machines. Failed case can be illustrated like this in linux shell: > echo $TZ Asia/Taipei > date +%Z CST > env TZ=`date +%Z` date Mon Dec 19 06:03:04 CST 2011 > date Mon Dec 19 14:03:04 CST 2011 [ew: fixed bad package reference inside Git::SVN::Log] Signed-off-by: Wei-Yin Chen (陳威尹) <chen.weiyin@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Wei-Yin Chen (陳威尹) committed
Dec 19, 2011 at 16:11 UTC
6aa17fc69bce19bcd412cf4b950e797767c87012
1 file changed
+11
-7
git-svn.perl
+11
-7
@@ -2028,6 +2028,7 @@ use Carp qw/croak/;
2028
use File::Path qw/mkpath/;
2029
use File::Copy qw/copy/;
2030
use IPC::Open3;
2031
+use Time::Local;
2032
use Memoize; # core since 5.8.0, Jul 2002
2033
use Memoize::Storable;
2034
@@ -3286,6 +3287,14 @@ sub get_untracked {
3287
\@out;
3288
}
3289
3290
+sub get_tz {
3291
+ # some systmes don't handle or mishandle %z, so be creative.
3292
+ my $t = shift || time;
3293
+ my $gm = timelocal(gmtime($t));
3294
+ my $sign = qw( + + - )[ $t <=> $gm ];
3295
+ return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
3296
+}
3297
+
3298
# parse_svn_date(DATE)
3299
# --------------------
3300
# Given a date (in UTC) from Subversion, return a string in the format
@@ -3318,8 +3327,7 @@ sub parse_svn_date {
3327
delete $ENV{TZ};
3328
}
3329
3321
- my $our_TZ =
3322
- POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
3330
+ my $our_TZ = get_tz();
3331
3332
# This converts $epoch_in_UTC into our local timezone.
3333
my ($sec, $min, $hour, $mday, $mon, $year,
@@ -5993,7 +6001,6 @@ package Git::SVN::Log;
6001
use strict;
6002
use warnings;
6003
use POSIX qw/strftime/;
5996
-use Time::Local;
6004
use constant commit_log_separator => ('-' x 72) . "\n";
6005
use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
6006
%rusers $show_commit $incremental/;
@@ -6103,11 +6110,8 @@ sub run_pager {
6110
}
6111
6112
sub format_svn_date {
6106
- # some systmes don't handle or mishandle %z, so be creative.
6113
my $t = shift || time;
6108
- my $gm = timelocal(gmtime($t));
6109
- my $sign = qw( + + - )[ $t <=> $gm ];
6110
- my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
6114
+ my $gmoff = Git::SVN::get_tz($t);
6115
return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
6116
}
6117