summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-20 12:08:22 (GMT)
committerPaul Mackerras <paulus@samba.org>2005-11-20 12:08:22 (GMT)
commitf6e2869f48f7a9b51a2a867ce955c39a9314ef3b (patch)
tree66cecdbbb1aaa81ec1013a1786944690ee9c0acb
parente3fe532ddce7311cfbbdc98d2e157d33f6275231 (diff)
downloadgit-f6e2869f48f7a9b51a2a867ce955c39a9314ef3b.zip
git-f6e2869f48f7a9b51a2a867ce955c39a9314ef3b.tar.gz
git-f6e2869f48f7a9b51a2a867ce955c39a9314ef3b.tar.bz2
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>
-rwxr-xr-xgitk23
1 files changed, 12 insertions, 11 deletions
diff --git a/gitk b/gitk
index ab2d9b8..58b4abc 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
}
}
}