field w_asim ; # text column: annotations (simple computation)
field w_file ; # text column: actual file data
field w_cviewer ; # pane showing commit message
-field status ; # text variable bound to status bar
+field status ; # status mega-widget instance
field old_height ; # last known height of $w.file_pane
# Tk UI colors
#
-field active_color #c0edc5
-field group_colors {
+variable active_color #c0edc5
+variable group_colors {
#d6d6d6
#e1e1e1
#ececec
}
+# Switches for original location detection
+#
+variable original_options [list -C -C]
+if {[git-version >= 1.5.3]} {
+ lappend original_options -w ; # ignore indentation changes
+}
+
# Current blame data; cleared/reset on each load
#
field commit ; # input commit to blame
field highlight_line -1 ; # current line selected
field highlight_column {} ; # current commit column selected
field highlight_commit {} ; # sha1 of commit selected
-field old_bgcolor {} ; # background of current selection
field total_lines 0 ; # total length of file
field blame_lines 0 ; # number of lines computed
-field have_commit ; # array commit -> 1
field amov_data ; # list of {commit origfile origline}
field asim_data ; # list of {commit origfile origline}
constructor new {i_commit i_path} {
global cursor_ptr
+ variable active_color
+ variable group_colors
set commit $i_commit
set path $i_path
make_toplevel top w
wm title $top "[appname] ([reponame]): File Viewer"
- frame $w.header -background orange
+ frame $w.header -background gold
label $w.header.commit_l \
-text {Commit:} \
- -background orange \
+ -background gold \
-anchor w \
-justify left
set w_back $w.header.commit_b
-borderwidth 0 \
-relief flat \
-state disabled \
- -background orange \
- -activebackground orange
+ -background gold \
+ -activebackground gold
bind $w_back <Button-1> "
if {\[$w_back cget -state\] eq {normal}} {
[cb _history_menu]
"
label $w.header.commit \
-textvariable @commit \
- -background orange \
+ -background gold \
-anchor w \
-justify left
label $w.header.path_l \
-text {File:} \
- -background orange \
+ -background gold \
-anchor w \
-justify left
set w_path $w.header.path
label $w_path \
- -background orange \
+ -background gold \
-anchor w \
-justify left
pack $w.header.commit_l -side left
pack $w.file_pane.cm.sbx -side bottom -fill x
pack $w_cviewer -expand 1 -fill both
- frame $w.status \
- -borderwidth 1 \
- -relief sunken
- label $w.status.l \
- -textvariable @status \
- -anchor w \
- -justify left
- pack $w.status.l -side left
+ set status [::status_bar::new $w.status]
menu $w.ctxm -tearoff 0
$w.ctxm add command \
-command [cb _copycommit]
foreach i $w_columns {
+ for {set g 0} {$g < [llength $group_colors]} {incr g} {
+ $i tag conf color$g -background [lindex $group_colors $g]
+ }
+
$i conf -cursor $cursor_ptr
$i conf -yscrollcommand [list many2scrollbar \
$w_columns yview $w.file_pane.out.sby]
set cursorW %W
tk_popup $w.ctxm %X %Y
"
+ bind $i <Shift-Tab> "[list focus $w_cviewer];break"
+ bind $i <Tab> "[list focus $w_cviewer];break"
}
foreach i [concat $w_columns $w_cviewer] {
bind $i <Control-Key-f> {catch {%W yview scroll 1 pages};break}
}
+ bind $w_cviewer <Shift-Tab> "[list focus $w_file];break"
+ bind $w_cviewer <Tab> "[list focus $w_file];break"
bind $w_cviewer <Button-1> [list focus $w_cviewer]
- bind $top <Visibility> [list focus $top]
- bind $w_file <Destroy> [list delete_this $this]
+ bind $w_file <Visibility> [list focus $w_file]
grid configure $w.header -sticky ew
grid configure $w.file_pane -sticky nsew
set req_w [winfo reqwidth $top]
set req_h [winfo reqheight $top]
+ set scr_h [expr {[winfo screenheight $top] - 100}]
if {$req_w < 600} {set req_w 600}
- if {$req_h < 400} {set req_h 400}
+ if {$req_h < $scr_h} {set req_h $scr_h}
set g "${req_w}x${req_h}"
wm geometry $top $g
update
bind $w.file_pane <Configure> \
"if {{$w.file_pane} eq {%W}} {[cb _resize %h]}"
- _load $this
+ _load $this {}
}
-method _load {} {
+method _load {jump} {
+ variable group_colors
+
_hide_tooltip $this
if {$total_lines != 0 || $current_fd ne {}} {
foreach i $w_columns {
$i conf -state normal
$i delete 0.0 end
- foreach cmit [array names have_commit] {
- $i tag delete g$cmit
+ foreach g [$i tag names] {
+ if {[regexp {^g[0-9a-f]{40}$} $g]} {
+ $i tag delete $g
+ }
}
$i conf -state disabled
}
+ $w_cviewer conf -state normal
+ $w_cviewer delete 0.0 end
+ $w_cviewer conf -state disabled
+
set highlight_line -1
set highlight_column {}
set highlight_commit {}
set total_lines 0
- array unset have_commit
- }
-
- if {[winfo exists $w.status.c]} {
- $w.status.c coords bar 0 0 0 20
- } else {
- canvas $w.status.c \
- -width 100 \
- -height [expr {int([winfo reqheight $w.status.l] * 0.6)}] \
- -borderwidth 1 \
- -relief groove \
- -highlightt 0
- $w.status.c create rectangle 0 0 0 20 -tags bar -fill navy
- pack $w.status.c -side right
}
if {$history eq {}} {
} else {
$w_back conf -state normal
}
- lappend history [list $commit $path]
# Index 0 is always empty. There is never line 0 as
# we use only 1 based lines, as that matches both with
set amov_data [list [list]]
set asim_data [list [list]]
- set status "Loading $commit:[escape_path $path]..."
+ $status show "Reading $commit:[escape_path $path]..."
$w_path conf -text [escape_path $path]
if {$commit eq {}} {
set fd [open $path r]
set fd [open "| $cmd" r]
}
fconfigure $fd -blocking 0 -translation lf -encoding binary
- fileevent $fd readable [cb _read_file $fd]
+ fileevent $fd readable [cb _read_file $fd $jump]
set current_fd $fd
}
menu $m -tearoff 0
}
- for {set i [expr {[llength $history] - 2}]
+ for {set i [expr {[llength $history] - 1}]
} {$i >= 0} {incr i -1} {
set e [lindex $history $i]
set c [lindex $e 0]
}
}
- $m add command -label $t -command [cb _goback $i $c $f]
+ $m add command -label $t -command [cb _goback $i]
}
set X [winfo rootx $w_back]
set Y [expr {[winfo rooty $w_back] + [winfo height $w_back]}]
tk_popup $m $X $Y
}
-method _goback {i c f} {
+method _goback {i} {
+ set dat [lindex $history $i]
set history [lrange $history 0 [expr {$i - 1}]]
- set commit $c
- set path $f
- _load $this
+ set commit [lindex $dat 0]
+ set path [lindex $dat 1]
+ _load $this [lrange $dat 2 5]
}
-method _read_file {fd} {
+method _read_file {fd jump} {
if {$fd ne $current_fd} {
catch {close $fd}
return
if {[eof $fd]} {
close $fd
- _exec_blame $this $w_asim @asim_data [list] {}
+
+ # If we don't force Tk to update the widgets *right now*
+ # none of our jump commands will cause a change in the UI.
+ #
+ update
+
+ if {[llength $jump] == 1} {
+ set highlight_line [lindex $jump 0]
+ $w_file see "$highlight_line.0"
+ } elseif {[llength $jump] == 4} {
+ set highlight_column [lindex $jump 0]
+ set highlight_line [lindex $jump 1]
+ $w_file xview moveto [lindex $jump 2]
+ $w_file yview moveto [lindex $jump 3]
+ }
+
+ _exec_blame $this $w_asim @asim_data \
+ [list] \
+ { copy/move tracking}
}
} ifdeleted { catch {close $fd} }
method _exec_blame {cur_w cur_d options cur_s} {
- set cmd [list nice git blame]
+ set cmd [list]
+ if {![is_Windows] || [is_Cygwin]} {
+ lappend cmd nice
+ }
+ lappend cmd git blame
set cmd [concat $cmd $options]
lappend cmd --incremental
if {$commit eq {}} {
lappend cmd -- $path
set fd [open "| $cmd" r]
fconfigure $fd -blocking 0 -translation lf -encoding binary
- fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d $cur_s]
+ fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d]
set current_fd $fd
set blame_lines 0
- _status $this $cur_s
+
+ $status start \
+ "Loading$cur_s annotations..." \
+ {lines annotated}
}
-method _read_blame {fd cur_w cur_d cur_s} {
+method _read_blame {fd cur_w cur_d} {
upvar #0 $cur_d line_data
+ variable group_colors
+ variable original_options
if {$fd ne $current_fd} {
catch {close $fd}
set r_orig_line $original_line
set r_final_line $final_line
set r_line_count $line_count
-
- if {[catch {set g $have_commit($cmit)}]} {
- set bg [lindex $group_colors 0]
- set group_colors [lrange $group_colors 1 end]
- lappend group_colors $bg
- foreach i $w_columns {
- $i tag conf g$cmit -background $bg
- }
- set have_commit($cmit) 1
- }
} elseif {[string match {filename *} $line]} {
set file [string range $line 9 end]
set n $r_line_count
set lno $r_final_line
+ set oln $r_orig_line
set cmit $r_commit
if {[regexp {^0{40}$} $cmit]} {
set a_name {}
catch {set a_name $header($cmit,author)}
while {$a_name ne {}} {
+ if {$author_abbr ne {}
+ && [string index $a_name 0] eq {'}} {
+ regsub {^'[^']+'\s+} $a_name {} a_name
+ }
if {![regexp {^([[:upper:]])} $a_name _a]} break
append author_abbr $_a
unset _a
incr first_lno -1
}
+ set color {}
+ if {$first_lno < $lno} {
+ foreach g [$w_file tag names $first_lno.0] {
+ if {[regexp {^color[0-9]+$} $g]} {
+ set color $g
+ break
+ }
+ }
+ } else {
+ set i [lsort [concat \
+ [$w_file tag names "[expr {$first_lno - 1}].0"] \
+ [$w_file tag names "[expr {$lno + $n}].0"] \
+ ]]
+ for {set g 0} {$g < [llength $group_colors]} {incr g} {
+ if {[lsearch -sorted -exact $i color$g] == -1} {
+ set color color$g
+ break
+ }
+ }
+ }
+ if {$color eq {}} {
+ set color color0
+ }
+
while {$n > 0} {
set lno_e "$lno.0 lineend + 1c"
if {[lindex $line_data $lno] ne {}} {
$i tag remove g$g $lno.0 $lno_e
}
}
- lset line_data $lno [list $cmit $file]
+ lset line_data $lno [list $cmit $file $oln]
$cur_w delete $lno.0 "$lno.0 lineend"
if {$lno == $first_lno} {
}
foreach i $w_columns {
+ if {$cur_w eq $w_amov} {
+ for {set g 0} \
+ {$g < [llength $group_colors]} \
+ {incr g} {
+ $i tag remove color$g $lno.0 $lno_e
+ }
+ $i tag add $color $lno.0 $lno_e
+ }
$i tag add g$cmit $lno.0 $lno_e
}
incr n -1
incr lno
+ incr oln
incr blame_lines
}
} else {
$cur_w insert $lno.0 { |}
}
+
+ if {$cur_w eq $w_amov} {
+ foreach i $w_columns {
+ for {set g 0} \
+ {$g < [llength $group_colors]} \
+ {incr g} {
+ $i tag remove color$g $lno.0 $lno_e
+ }
+ $i tag add $color $lno.0 $lno_e
+ }
+ }
+
incr lno
}
close $fd
if {$cur_w eq $w_asim} {
_exec_blame $this $w_amov @amov_data \
- [list -M -C -C] \
- { move/copy tracking}
+ $original_options \
+ { original location}
} else {
set current_fd {}
- set status {Annotation complete.}
- destroy $w.status.c
+ $status stop {Annotation complete.}
}
} else {
- _status $this $cur_s
+ $status update $blame_lines $total_lines
}
} ifdeleted { catch {close $fd} }
-method _status {cur_s} {
- set have $blame_lines
- set total $total_lines
- set pdone 0
- if {$total} {set pdone [expr {100 * $have / $total}]}
-
- set status [format \
- "Loading%s annotations... %i of %i lines annotated (%2i%%)" \
- $cur_s $have $total $pdone]
- $w.status.c coords bar 0 0 $pdone 20
-}
-
method _click {cur_w pos} {
set lno [lindex [split [$cur_w index $pos] .] 0]
_showcommit $this $cur_w $lno
set lno [lindex [split [$cur_w index $pos] .] 0]
set dat [lindex $line_data $lno]
if {$dat ne {}} {
+ lappend history [list \
+ $commit $path \
+ $highlight_column \
+ $highlight_line \
+ [lindex [$w_file xview] 0] \
+ [lindex [$w_file yview] 0] \
+ ]
set commit [lindex $dat 0]
set path [lindex $dat 1]
- _load $this
+ _load $this [list [lindex $dat 2]]
}
}
method _showcommit {cur_w lno} {
global repo_config
+ variable active_color
if {$highlight_commit ne {}} {
foreach i $w_columns {
- $i tag conf g$highlight_commit -background $old_bgcolor
+ $i tag conf g$highlight_commit -background {}
$i tag lower g$highlight_commit
}
}
- if {$cur_w eq $w_amov} {
- set dat [lindex $amov_data $lno]
- set highlight_column $w_amov
- } else {
+ if {$cur_w eq $w_asim} {
set dat [lindex $asim_data $lno]
set highlight_column $w_asim
+ } else {
+ set dat [lindex $amov_data $lno]
+ set highlight_column $w_amov
}
$w_cviewer conf -state normal
set cmit [lindex $dat 0]
set file [lindex $dat 1]
- set old_bgcolor [$w_file tag cget g$cmit -background]
foreach i $w_columns {
$i tag conf g$cmit -background $active_color
$i tag raise g$cmit
$tooltip_t insert end "$summary"
if {$org ne {} && [lindex $org 0] ne $cmit} {
- $tooltip_t insert 0.0 "Moved Here By:\n" section_header
+ set save [$tooltip_t get 0.0 end]
+ $tooltip_t delete 0.0 end
+
set cmit [lindex $org 0]
set file [lindex $org 1]
lappend tooltip_commit $cmit
-format {%Y-%m-%d %H:%M:%S}
]}
- $tooltip_t insert end "\n\n"
$tooltip_t insert end "Originally By:\n" section_header
$tooltip_t insert end "commit $cmit\n"
$tooltip_t insert end "$author_name $author_time\n"
- $tooltip_t insert end "$summary"
+ $tooltip_t insert end "$summary\n"
if {$file ne $path} {
- $tooltip_t insert end "\n"
- $tooltip_t insert end "File: " section_header
- $tooltip_t insert end $file
+ $tooltip_t insert end "In File: " section_header
+ $tooltip_t insert end "$file\n"
}
+
+ $tooltip_t insert end "\n"
+ $tooltip_t insert end "Copied Or Moved Here By:\n" section_header
+ $tooltip_t insert end $save
}
$tooltip_t conf -state disabled
projects / git.git / blobdiff