gitk: Fix some bugs introduced by speedup changes
Commits that weren't read from git-rev-list, i.e. the ones displayed with an open circle, were displayed incorrectly: the headline was null if there was only one line, and the commit comment was put all on one line. Also, the terminal commits weren't displayed when -r was used. Signed-off-by: Paul Mackerras <paulus@samba.org>
Paul Mackerras committed
Nov 20, 2005 at 23:08 UTC
f6e2869f48f7a9b51a2a867ce955c39a9314ef3b
1 file changed
+12
-11
gitk
+12
-11
@@ -218,6 +218,8 @@ proc parsecommit {id contents listed olds} {
218
set i [string first "\n" $comment]
219
if {$i >= 0} {
220
set headline [string trim [string range $comment 0 $i]]
221
+ } else {
222
+ set headline $comment
223
}
224
if {!$listed} {
225
# git-rev-list indents the comment by 4 spaces;
@@ -226,6 +228,7 @@ proc parsecommit {id contents listed olds} {
228
foreach line [split $comment "\n"] {
229
append newcomment " "
230
append newcomment $line
231
+ append newcomment "\n"
232
}
233
set comment $newcomment
234
}
@@ -1503,17 +1506,15 @@ proc drawrest {} {
1506
global numcommits ncmupdate
1507
global nextupdate startmsecs revlistorder
1508
1506
- if {!$revlistorder} {
1507
- set level [decidenext]
1508
- if {$level >= 0} {
1509
- set phase drawgraph
1510
- while 1 {
1511
- lappend displayorder [lindex $todo $level]
1512
- set hard [updatetodo $level $datemode]
1513
- if {$hard} {
1514
- set level [decidenext]
1515
- if {$level < 0} break
1516
- }
1509
+ set level [decidenext]
1510
+ if {$level >= 0} {
1511
+ set phase drawgraph
1512
+ while 1 {
1513
+ lappend displayorder [lindex $todo $level]
1514
+ set hard [updatetodo $level $datemode]
1515
+ if {$hard} {
1516
+ set level [decidenext]
1517
+ if {$level < 0} break
1518
}
1519
}
1520
}