Skip to contentSkip to conversation

git-svn: Fix time zone in --localtime

PATCH In review Wei-Yin Chen (陳威尹) 2 participants 3 messages Jun 15, 2016

lore
Share & tools
lore

Wei-Yin Chen (陳威尹)

author
#0 lore raw

PATCH 1/1 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:

Quoted 1 line

echo $TZ

Asia/Taipei

Quoted 1 line

date +%Z

CST

Quoted 1 line

env TZ=date +%Z date

Mon Dec 19 06:03:04 CST 2011

Quoted 1 line

date

Mon Dec 19 14:03:04 CST 2011

Signed-off-by Wei-Yin Chen (陳威尹) <[email protected]>
---
 git-svn.perl |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
git-svn.perl +11 -7
index e30df22..f0b6340 100755
@@ -2029,6 +2029,7 @@ use Carp qw/croak/;
 use File::Path qw/mkpath/;
 use File::Copy qw/copy/;
 use IPC::Open3;
+use Time::Local;
 use Memoize;  # core since 5.8.0, Jul 2002
 use Memoize::Storable;
 

@@ -3287,6 +3288,14 @@ sub get_untracked {
 	\@out;
 }
 
+sub get_tz {
+	# some systmes don't handle or mishandle %z, so be creative.
+	my $t = shift || time;
+	my $gm = timelocal(gmtime($t));
+	my $sign = qw( + + - )[ $t <=> $gm ];
+	return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
+}
+
 # parse_svn_date(DATE)
 # --------------------
 # Given a date (in UTC) from Subversion, return a string in the format

@@ -3319,8 +3328,7 @@ sub parse_svn_date {
 			delete $ENV{TZ};
 		}
 
-		my $our_TZ =
-		    POSIX::strftime('%Z', $S, $M, $H, $d, $m - 1, $Y - 1900);
+		my $our_TZ = get_tz();
 
 		# This converts $epoch_in_UTC into our local timezone.
 		my ($sec, $min, $hour, $mday, $mon, $year,

@@ -5994,7 +6002,6 @@ package Git::SVN::Log;
 use strict;
 use warnings;
 use POSIX qw/strftime/;
-use Time::Local;
 use constant commit_log_separator => ('-' x 72) . "\n";
 use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
             %rusers $show_commit $incremental/;

@@ -6104,11 +6111,8 @@ sub run_pager {
 }
 
 sub format_svn_date {
-	# some systmes don't handle or mishandle %z, so be creative.
 	my $t = shift || time;
-	my $gm = timelocal(gmtime($t));
-	my $sign = qw( + + - )[ $t <=> $gm ];
-	my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
+	my $gmoff = get_tz($t);
 	return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
 }
#1 lore raw
Quoted 11 lines · \"Wei-Yin Chen (陳威尹)\

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:

Quoted 1 line

echo $TZ

Asia/Taipei

Quoted 1 line

date +%Z

Quoted 8 lines

CST

Quoted 1 line

env TZ=date +%Z date

Mon Dec 19 06:03:04 CST 2011

Quoted 1 line

date

Mon Dec 19 14:03:04 CST 2011

Signed-off-by Wei-Yin Chen (陳威尹) <[email protected]>

---

Hi, sorry for the late reply, this got lost in the shuffle.

This issue seems reasonable, but did you test this change at all?

Review

Quoted 9 lines

sub format_svn_date {

(quoted diff) +1 -4
-	# some systmes don't handle or mishandle %z, so be creative.
 	my $t = shift || time;
-	my $gm = timelocal(gmtime($t));
-	my $sign = qw( + + - )[ $t <=> $gm ];
-	my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
+	my $gmoff = get_tz($t);
 	return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
 }

I needed the following additional change to get things working:

git-svn.perl +1 -1
@@ -6111,7 +6111,7 @@ sub run_pager {
 
 sub format_svn_date {
 	my $t = shift || time;
-	my $gmoff = get_tz($t);
+	my $gmoff = Git::SVN::get_tz($t);
 	return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
 }

If there are no objections, I'll squash this and push for Junio tomorrow.

author
#2 lore raw

git-svn.perl sub run_pager { · line 6116

Quoted 12 lines · Eric Wong

I needed the following additional change to get things working:

git-svn.perl +1 -1
@@ -6111,7 +6111,7 @@ sub run_pager {
 
  sub format_svn_date {
  	my $t = shift || time;
-	my $gmoff = get_tz($t);
+	my $gmoff = Git::SVN::get_tz($t);
  	return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
  }

Sorry, my bad. This bug of missing package reference can be triggered by "git svn log", but unfortunately I didn't test this part manually. I'll learn to use the git test suite next time.

Quoted 3 lines

If there are no objections, I'll squash this and push for Junio tomorrow.

Excellent. Thank you for the testing and fixing effort!