18
field w_columns ; # list of all column widgets in the viewer
19
field w_line ; # text column: all line numbers
20
field w_amov ; # text column: annotations + move tracking
21
+field w_asim ; # text column: annotations (simple computation)
22
field w_file ; # text column: actual file data
23
field w_cviewer ; # pane showing commit message
24
field status ; # text variable bound to status bar
40
41
field current_fd {} ; # background process running
42
field highlight_line -1 ; # current line selected
43
+field highlight_column {} ; # current commit column selected
44
field highlight_commit {} ; # sha1 of commit selected
45
field old_bgcolor {} ; # background of current selection
46
48
field blame_lines 0 ; # number of lines computed
49
field have_commit ; # array commit -> 1
50
field amov_data ; # list of {commit origfile origline}
51
+field asim_data ; # list of {commit origfile origline}
52
53
field r_commit ; # commit currently being parsed
54
field r_orig_line ; # original line number
145
-state disabled \
146
-wrap none \
147
-height 40 \
145
- -width 4 \
148
+ -width 5 \
149
-font font_diff
150
+ $w_amov tag conf author_abbr -justify right -rmargin 5
151
$w_amov tag conf curr_commit
148
- $w_amov tag conf prior_commit \
149
- -foreground blue \
150
- -underline 1
152
+ $w_amov tag conf prior_commit -foreground blue -underline 1
153
$w_amov tag bind prior_commit \
154
<Button-1> \
153
- "[cb _load_commit @%x,%y];break"
155
+ "[cb _load_commit $w_amov @amov_data @%x,%y];break"
156
+
157
+ set w_asim $w.file_pane.out.asimple_t
158
+ text $w_asim \
159
+ -takefocus 0 \
160
+ -highlightthickness 0 \
161
+ -padx 0 -pady 0 \
162
+ -background white -borderwidth 0 \
163
+ -state disabled \
164
+ -wrap none \
165
+ -height 40 \
166
+ -width 4 \
167
+ -font font_diff
168
+ $w_asim tag conf author_abbr -justify right
169
+ $w_asim tag conf curr_commit
170
+ $w_asim tag conf prior_commit -foreground blue -underline 1
171
+ $w_asim tag bind prior_commit \
172
+ <Button-1> \
173
+ "[cb _load_commit $w_asim @asim_data @%x,%y];break"
174
175
set w_file $w.file_pane.out.file_t
176
text $w_file \
185
-xscrollcommand [list $w.file_pane.out.sbx set] \
186
-font font_diff
187
168
- set w_columns [list $w_amov $w_line $w_file]
188
+ set w_columns [list $w_amov $w_asim $w_line $w_file]
189
190
scrollbar $w.file_pane.out.sbx \
191
-orient h \
332
}
333
334
set highlight_line -1
335
+ set highlight_column {}
336
set highlight_commit {}
337
set total_lines 0
317
- set blame_lines 0
338
array unset have_commit
339
}
340
363
# git-blame output and with Tk's text widget.
364
#
365
set amov_data [list [list]]
366
+ set asim_data [list [list]]
367
368
set status "Loading $commit:[escape_path $path]..."
369
$w_path conf -text [escape_path $path]
431
regsub "\r\$" $line {} line
432
incr total_lines
433
lappend amov_data {}
434
+ lappend asim_data {}
435
436
if {$total_lines > 1} {
437
foreach i $w_columns {$i insert end "\n"}
450
451
if {[eof $fd]} {
452
close $fd
431
-
432
- _status $this
433
- set cmd {nice git blame -M -C --incremental}
434
- if {$commit eq {}} {
435
- lappend cmd --contents $path
436
- } else {
437
- lappend cmd $commit
438
- }
439
- lappend cmd -- $path
440
- set fd [open "| $cmd" r]
441
- fconfigure $fd -blocking 0 -translation lf -encoding binary
442
- fileevent $fd readable [cb _read_blame $fd]
443
- set current_fd $fd
453
+ _exec_blame $this $w_asim @asim_data [list] {}
454
}
455
} ifdeleted { catch {close $fd} }
456
447
-method _read_blame {fd} {
457
+method _exec_blame {cur_w cur_d options cur_s} {
458
+ set cmd [list nice git blame]
459
+ set cmd [concat $cmd $options]
460
+ lappend cmd --incremental
461
+ if {$commit eq {}} {
462
+ lappend cmd --contents $path
463
+ } else {
464
+ lappend cmd $commit
465
+ }
466
+ lappend cmd -- $path
467
+ set fd [open "| $cmd" r]
468
+ fconfigure $fd -blocking 0 -translation lf -encoding binary
469
+ fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d $cur_s]
470
+ set current_fd $fd
471
+ set blame_lines 0
472
+ _status $this $cur_s
473
+}
474
+
475
+method _read_blame {fd cur_w cur_d cur_s} {
476
+ upvar #0 $cur_d line_data
477
+
478
if {$fd ne $current_fd} {
479
catch {close $fd}
480
return
481
}
482
453
- $w_amov conf -state normal
483
+ $cur_w conf -state normal
484
while {[gets $fd line] >= 0} {
485
if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
486
cmit original_line final_line line_count]} {
512
set commit_type curr_commit
513
} else {
514
set commit_type prior_commit
485
- set commit_abbr [string range $cmit 0 4]
515
+ set commit_abbr [string range $cmit 0 3]
516
}
517
518
set author_abbr {}
530
set author_abbr { |}
531
} else {
532
set author_abbr [string range $author_abbr 0 3]
503
- while {[string length $author_abbr] < 4} {
504
- set author_abbr " $author_abbr"
505
- }
533
}
534
unset a_name
535
536
set first_lno $lno
537
while {
538
$first_lno > 1
512
- && $cmit eq [lindex $amov_data [expr {$first_lno - 1}] 0]
513
- && $file eq [lindex $amov_data [expr {$first_lno - 1}] 1]
539
+ && $cmit eq [lindex $line_data [expr {$first_lno - 1}] 0]
540
+ && $file eq [lindex $line_data [expr {$first_lno - 1}] 1]
541
} {
542
incr first_lno -1
543
}
544
545
while {$n > 0} {
546
set lno_e "$lno.0 lineend + 1c"
520
- if {[lindex $amov_data $lno] ne {}} {
521
- set g [lindex $amov_data $lno 0]
547
+ if {[lindex $line_data $lno] ne {}} {
548
+ set g [lindex $line_data $lno 0]
549
foreach i $w_columns {
550
$i tag remove g$g $lno.0 $lno_e
551
}
552
}
526
- lset amov_data $lno [list $cmit $file]
553
+ lset line_data $lno [list $cmit $file]
554
528
- $w_amov delete $lno.0 "$lno.0 lineend"
555
+ $cur_w delete $lno.0 "$lno.0 lineend"
556
if {$lno == $first_lno} {
530
- $w_amov insert $lno.0 $commit_abbr $commit_type
557
+ $cur_w insert $lno.0 $commit_abbr $commit_type
558
} elseif {$lno == [expr {$first_lno + 1}]} {
532
- $w_amov insert $lno.0 $author_abbr
559
+ $cur_w insert $lno.0 $author_abbr author_abbr
560
} else {
534
- $w_amov insert $lno.0 { |}
561
+ $cur_w insert $lno.0 { |}
562
}
563
564
foreach i $w_columns {
565
$i tag add g$cmit $lno.0 $lno_e
566
}
567
541
- if {$highlight_line == -1} {
542
- if {[lindex [$w_file yview] 0] == 0} {
568
+ if {$highlight_column eq $cur_w} {
569
+ if {$highlight_line == -1
570
+ && [lindex [$w_file yview] 0] == 0} {
571
$w_file see $lno.0
544
- _showcommit $this $lno
572
+ set highlight_line $lno
573
+ }
574
+ if {$highlight_line == $lno} {
575
+ _showcommit $this $cur_w $lno
576
}
546
- } elseif {$highlight_line == $lno} {
547
- _showcommit $this $lno
577
}
578
579
incr n -1
582
}
583
584
while {
556
- $cmit eq [lindex $amov_data $lno 0]
557
- && $file eq [lindex $amov_data $lno 1]
585
+ $cmit eq [lindex $line_data $lno 0]
586
+ && $file eq [lindex $line_data $lno 1]
587
} {
559
- $w_amov delete $lno.0 "$lno.0 lineend"
588
+ $cur_w delete $lno.0 "$lno.0 lineend"
589
590
if {$lno == $first_lno} {
562
- $w_amov insert $lno.0 $commit_abbr $commit_type
591
+ $cur_w insert $lno.0 $commit_abbr $commit_type
592
} elseif {$lno == [expr {$first_lno + 1}]} {
564
- $w_amov insert $lno.0 $author_abbr
593
+ $cur_w insert $lno.0 $author_abbr author_abbr
594
} else {
566
- $w_amov insert $lno.0 { |}
595
+ $cur_w insert $lno.0 { |}
596
}
597
incr lno
598
}
601
set header($r_commit,$key) $data
602
}
603
}
575
- $w_amov conf -state disabled
604
+ $cur_w conf -state disabled
605
606
if {[eof $fd]} {
607
close $fd
579
- set current_fd {}
580
- set status {Annotation complete.}
581
- destroy $w.status.c
608
+ if {$cur_w eq $w_asim} {
609
+ _exec_blame $this $w_amov @amov_data \
610
+ [list -M -C -C] \
611
+ { move/copy tracking}
612
+ } else {
613
+ set current_fd {}
614
+ set status {Annotation complete.}
615
+ destroy $w.status.c
616
+ }
617
} else {
583
- _status $this
618
+ _status $this $cur_s
619
}
620
} ifdeleted { catch {close $fd} }
621
587
-method _status {} {
622
+method _status {cur_s} {
623
set have $blame_lines
624
set total $total_lines
625
set pdone 0
626
if {$total} {set pdone [expr {100 * $have / $total}]}
627
628
set status [format \
594
- "Loading annotations... %i of %i lines annotated (%2i%%)" \
595
- $have $total $pdone]
629
+ "Loading%s annotations... %i of %i lines annotated (%2i%%)" \
630
+ $cur_s $have $total $pdone]
631
$w.status.c coords bar 0 0 $pdone 20
632
}
633
634
method _click {cur_w pos} {
635
set lno [lindex [split [$cur_w index $pos] .] 0]
601
- if {$lno eq {}} return
602
- _showcommit $this $lno
636
+ _showcommit $this $cur_w $lno
637
}
638
605
-method _load_commit {pos} {
606
- set lno [lindex [split [$w_amov index $pos] .] 0]
607
- set dat [lindex $amov_data $lno]
639
+method _load_commit {cur_w cur_d pos} {
640
+ upvar #0 $cur_d line_data
641
+ set lno [lindex [split [$cur_w index $pos] .] 0]
642
+ set dat [lindex $line_data $lno]
643
if {$dat ne {}} {
644
set commit [lindex $dat 0]
645
set path [lindex $dat 1]
647
}
648
}
649
615
-method _showcommit {lno} {
650
+method _showcommit {cur_w lno} {
651
global repo_config
652
653
if {$highlight_commit ne {}} {
656
}
657
}
658
659
+ if {$cur_w eq $w_amov} {
660
+ set dat [lindex $amov_data $lno]
661
+ set highlight_column $w_amov
662
+ } else {
663
+ set dat [lindex $asim_data $lno]
664
+ set highlight_column $w_asim
665
+ }
666
+
667
$w_cviewer conf -state normal
668
$w_cviewer delete 0.0 end
669
627
- set dat [lindex $amov_data $lno]
670
if {$dat eq {}} {
671
set cmit {}
672
$w_cviewer insert end "Loading annotation..." still_loading
766
767
method _show_tooltip {cur_w pos} {
768
set lno [lindex [split [$cur_w index $pos] .] 0]
727
- set dat [lindex $amov_data $lno]
769
+ if {$cur_w eq $w_amov} {
770
+ set dat [lindex $amov_data $lno]
771
+ } else {
772
+ set dat [lindex $asim_data $lno]
773
+ }
774
if {$dat eq {}} {
775
_hide_tooltip $this
776
return
804
[expr {$pos_x - [winfo rootx $cur_w]}] \
805
[expr {$pos_y - [winfo rooty $cur_w]}]] ,]
806
set lno [lindex [split [$cur_w index $pos] .] 0]
761
- set dat [lindex $amov_data $lno]
807
+ if {$cur_w eq $w_amov} {
808
+ set dat [lindex $amov_data $lno]
809
+ } else {
810
+ set dat [lindex $asim_data $lno]
811
+ }
812
set cmit [lindex $dat 0]
813
set file [lindex $dat 1]
814