mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Fix some bugs introduced by speedup changes

Browse Source 
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>
This commit is contained in:
Paul Mackerras 2005-11-20 23:08:22 +11:00
parent e3fe532ddc
commit f6e2869f48
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gitk
View File

@ -218,6 +218,8 @@ proc parsecommit {id contents listed olds} {
set i [string first "\n" $comment] set i [string first "\n" $comment]
if {$i >= 0} { if {$i >= 0} {
set headline [string trim [string range $comment 0 $i]] set headline [string trim [string range $comment 0 $i]]
} else {
set headline $comment
} }
if {!$listed} { if {!$listed} {
# git-rev-list indents the comment by 4 spaces; # git-rev-list indents the comment by 4 spaces;
@ -226,6 +228,7 @@ proc parsecommit {id contents listed olds} {
foreach line [split $comment "\n"] { foreach line [split $comment "\n"] {
append newcomment " " append newcomment " "
append newcomment $line append newcomment $line
append newcomment "\n"
} }
set comment $newcomment set comment $newcomment
} }
@ -1503,17 +1506,15 @@ proc drawrest {} {
global numcommits ncmupdate global numcommits ncmupdate
global nextupdate startmsecs revlistorder global nextupdate startmsecs revlistorder
if {!$revlistorder} { set level [decidenext]
set level [decidenext] if {$level >= 0} {
if {$level >= 0} { set phase drawgraph
set phase drawgraph while 1 {
while 1 { lappend displayorder [lindex $todo $level]
lappend displayorder [lindex $todo $level] set hard [updatetodo $level $datemode]
set hard [updatetodo $level $datemode] if {$hard} {
if {$hard} { set level [decidenext]
set level [decidenext] if {$level < 0} break
if {$level < 0} break
}
} }
} }
} }