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

gitk: Show notes by default (like git log does)

Browse Source 
Starting from ~ git-1.6.6, log, show & whatchanged show notes by default.

On the other hand, gitk does not show notes by default, because under
the hood it calls 'git log --pretty=raw ...' to get the log, and in
'git log' notes are turned off when user specifies format or pretty
settings.

Yes, it is possible to invoke 'gitk --show-notes' explicitly, but since
from user's perspective, gitk is gui enabled git log, it would be
logical for gitk to show notes by default too for consistency.

In git, --show-notes was introduced in 66b2ed (Fix "log" family not to
be too agressive about showing notes) which predates 1.6.6.2.

Notes can still be supressed with 'gitk --no-notes'.

Cc: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Kirill Smelkov
2010-05-20 13:50:41 +04:00
committed by Paul Mackerras
parent a1d383c5ab
commit 7defefb134
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gitk
View File

@ -313,6 +313,7 @@ proc start_rev_list {view} {
global viewactive viewinstances vmergeonly global viewactive viewinstances vmergeonly
global mainheadid viewmainheadid viewmainheadid_orig global mainheadid viewmainheadid viewmainheadid_orig
global vcanopt vflags vrevs vorigargs global vcanopt vflags vrevs vorigargs
global show_notes
set startmsecs [clock clicks -milliseconds] set startmsecs [clock clicks -milliseconds]
set commitidx($view) 0 set commitidx($view) 0
@ -361,8 +362,8 @@ proc start_rev_list {view} {
} }
if {[catch { if {[catch {
set fd [open [concat | git log --no-color -z --pretty=raw --parents \ set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
--boundary $args "--" $files] r] --parents --boundary $args "--" $files] r]
} err]} { } err]} {
error_popup "[mc "Error executing git log:"] $err" error_popup "[mc "Error executing git log:"] $err"
return 0 return 0
@ -456,6 +457,7 @@ proc updatecommits {} {
global mainheadid viewmainheadid viewmainheadid_orig pending_select global mainheadid viewmainheadid viewmainheadid_orig pending_select
global isworktree global isworktree
global varcid vposids vnegids vflags vrevs global varcid vposids vnegids vflags vrevs
global show_notes
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}] set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
rereadrefs rereadrefs
@ -508,8 +510,8 @@ proc updatecommits {} {
set args $vorigargs($view) set args $vorigargs($view)
} }
if {[catch { if {[catch {
set fd [open [concat | git log --no-color -z --pretty=raw --parents \ set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
--boundary $args "--" $vfilelimit($view)] r] --parents --boundary $args "--" $vfilelimit($view)] r]
} err]} { } err]} {
error_popup "[mc "Error executing git log:"] $err" error_popup "[mc "Error executing git log:"] $err"
return return
@ -11521,6 +11523,11 @@ set NS [expr {$use_ttk ? "ttk" : ""}]
set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .] set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .]
set show_notes {}
if {[package vcompare $git_version "1.6.6.2"] >= 0} {
set show_notes "--show-notes"
}
set runq {} set runq {}
set history {} set history {}
set historyindex 0 set historyindex 0