X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=gitk;h=3dd97e291ed18d45f998d37ae2f66a0bce3b60a9;hb=302ebfe52192fff9a2c1c612dff22325fd073acc;hp=3ea94349f86dfa5666c6fa9ecb91a15d33ad3847;hpb=36a7cad6e4ae8a331731666d985a7619a76bb4fb;p=git.git

diff --git a/gitk b/gitk
index 3ea94349..3dd97e29 100755
--- a/gitk
+++ b/gitk
@@ -218,6 +218,8 @@ proc parsecommit {id contents listed olds} {
     set i [string first "\n" $comment]
     if {$i >= 0} {
 	set headline [string trim [string range $comment 0 $i]]
+    } else {
+	set headline $comment
     }
     if {!$listed} {
 	# git-rev-list indents the comment by 4 spaces;
@@ -226,6 +228,7 @@ proc parsecommit {id contents listed olds} {
 	foreach line [split $comment "\n"] {
 	    append newcomment "    "
 	    append newcomment $line
+	    append newcomment "\n"
 	}
 	set comment $newcomment
     }
@@ -1503,17 +1506,15 @@ proc drawrest {} {
     global numcommits ncmupdate
     global nextupdate startmsecs revlistorder
 
-    if {!$revlistorder} {
-	set level [decidenext]
-	if {$level >= 0} {
-	    set phase drawgraph
-	    while 1 {
-		lappend displayorder [lindex $todo $level]
-		set hard [updatetodo $level $datemode]
-		if {$hard} {
-		    set level [decidenext]
-		    if {$level < 0} break
-		}
+    set level [decidenext]
+    if {$level >= 0} {
+	set phase drawgraph
+	while 1 {
+	    lappend displayorder [lindex $todo $level]
+	    set hard [updatetodo $level $datemode]
+	    if {$hard} {
+		set level [decidenext]
+		if {$level < 0} break
 	    }
 	}
     }
@@ -2787,8 +2788,7 @@ proc gettreediffs {ids} {
     set treepending $ids
     set treediff {}
     set id [lindex $ids 0]
-    set p [lindex $ids 1]
-    if [catch {set gdtf [open "|git-diff-tree -r $id" r]}] return
+    if [catch {set gdtf [open "|git-diff-tree --no-commit-id -r $id" r]}] return
     fconfigure $gdtf -blocking 0
     fileevent $gdtf readable [list gettreediffline $gdtf $ids]
 }
@@ -2822,9 +2822,8 @@ proc getblobdiffs {ids} {
     global difffilestart nextupdate diffinhdr treediffs
 
     set id [lindex $ids 0]
-    set p [lindex $ids 1]
     set env(GIT_DIFF_OPTS) $diffopts
-    set cmd [list | git-diff-tree -r -p -C $id]
+    set cmd [list | git-diff-tree --no-commit-id -r -p -C $id]
     if {[catch {set bdf [open $cmd r]} err]} {
 	puts "error getting diffs: $err"
 	return
@@ -3125,7 +3124,7 @@ proc linehover {} {
     set t [$canv create rectangle $x0 $y0 $x1 $y1 \
 	       -fill \#ffff80 -outline black -width 1 -tags hover]
     $canv raise $t
-    set t [$canv create text $x $y -anchor nw -text $text -tags hover]
+    set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
     $canv raise $t
 }
 
@@ -3160,7 +3159,7 @@ proc clickisonarrow {id y} {
 }
 
 proc arrowjump {id dirn y} {
-    global mainline sidelines canv
+    global mainline sidelines canv canv2 canv3
 
     set yt {}
     if {$dirn eq "down"} {
@@ -3198,6 +3197,8 @@ proc arrowjump {id dirn y} {
 	set yfrac 0
     }
     $canv yview moveto $yfrac
+    $canv2 yview moveto $yfrac
+    $canv3 yview moveto $yfrac
 }
 
 proc lineclick {x y id isnew} {
@@ -3635,8 +3636,11 @@ proc doquit {} {
 }
 
 proc formatdate {d} {
-    global hours nhours tfd
+    global hours nhours tfd fastdate
 
+    if {!$fastdate} {
+	return [clock format $d -format "%Y-%m-%d %H:%M:%S"]
+    }
     set hr [expr {$d / 3600}]
     set ms [expr {$d % 3600}]
     if {![info exists hours($hr)]} {
@@ -3661,6 +3665,7 @@ set gaudydiff 0
 set maxgraphpct 50
 set maxwidth 16
 set revlistorder 0
+set fastdate 0
 
 set colors {green red blue magenta darkgrey brown orange}