Merge with master.

This merges commit
    f10e0e0b18
from master into our head commit
    c3958a7926

Sincerely,
    jit-merge command.
This commit is contained in:
Junio C Hamano 2005-08-09 10:22:23 -07:00
commit edee414c3e
2 changed files with 20 additions and 11 deletions

View File

@ -69,7 +69,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
git-request-pull-script git-bisect-script
SCRIPTS += git-count-objects-script
SCRIPTS += git-send-email-script
# SCRIPTS += git-send-email-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \

29
gitk
View File

@ -387,7 +387,7 @@ proc makewindow {} {
set ctext .ctop.cdet.left.ctext
text $ctext -bg white -state disabled -font $textfont \
-width $geometry(ctextw) -height $geometry(ctexth) \
-yscrollcommand ".ctop.cdet.left.sb set"
-yscrollcommand ".ctop.cdet.left.sb set" -wrap none
scrollbar .ctop.cdet.left.sb -command "$ctext yview"
pack .ctop.cdet.left.sb -side right -fill y
pack $ctext -side left -fill both -expand 1
@ -1704,10 +1704,19 @@ proc selcanvline {w x y} {
selectline $l 1
}
proc commit_descriptor {p} {
global commitinfo
set l "..."
if {[info exists commitinfo($p)]} {
set l [lindex $commitinfo($p) 0]
}
return "$p ($l)"
}
proc selectline {l isnew} {
global canv canv2 canv3 ctext commitinfo selectedline
global lineid linehtag linentag linedtag
global canvy0 linespc parents nparents
global canvy0 linespc parents nparents children nchildren
global cflist currentid sha1entry
global commentend idtags idline
@ -1790,15 +1799,15 @@ proc selectline {l isnew} {
set commentstart [$ctext index "end - 1c"]
set comment {}
foreach p $parents($id) {
set l "..."
if {[info exists commitinfo($p)]} {
set l [lindex $commitinfo($p) 0]
if {[string length $l] > 32} {
set l "[string range $l 0 28] ..."
}
if {[info exists parents($id)]} {
foreach p $parents($id) {
append comment "Parent: [commit_descriptor $p]\n"
}
}
if {[info exists children($id)]} {
foreach c $children($id) {
append comment "Child: [commit_descriptor $c]\n"
}
append comment "Parent: $p ($l)\n"
}
append comment "\n"
append comment [lindex $info 5]