Skip to content

Commit

Permalink
gitk: Remember time zones from author and commit timestamps
Browse files Browse the repository at this point in the history
When resolving a conflicted cherry-pick, this lets us pass
GIT_AUTHOR_DATE to git citool with the correct timezone.
It does this by making elements 2 and 4 of the commitinfo array
entries, which store the author and committer dates of the commit,
be 2-element lists storing the numerical date and timezone offset,
rather than just the numerical date.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Anders Kaseorg authored and Paul Mackerras committed May 29, 2011
1 parent ef73896 commit f5974d9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ proc newvarc {view id} {
if {![info exists commitinfo($id)]} {
parsecommit $id $commitdata($id) 1
}
set cdate [lindex $commitinfo($id) 4]
set cdate [lindex [lindex $commitinfo($id) 4] 0]
if {![string is integer -strict $cdate]} {
set cdate 0
}
Expand Down Expand Up @@ -1641,10 +1641,10 @@ proc parsecommit {id contents listed} {
set line [split $line " "]
set tag [lindex $line 0]
if {$tag == "author"} {
set audate [lindex $line end-1]
set audate [lrange $line end-1 end]
set auname [join [lrange $line 1 end-2] " "]
} elseif {$tag == "committer"} {
set comdate [lindex $line end-1]
set comdate [lrange $line end-1 end]
set comname [join [lrange $line 1 end-2] " "]
}
}
Expand Down Expand Up @@ -11021,7 +11021,7 @@ proc prefsok {} {
proc formatdate {d} {
global datetimeformat
if {$d ne {}} {
set d [clock format $d -format $datetimeformat]
set d [clock format [lindex $d 0] -format $datetimeformat]
}
return $d
}
Expand Down

0 comments on commit f5974d9

Please sign in to comment.