Skip to content

Commit 949da61

Browse files
committed
git-gui: Improve our labeling of blame annotation types
It feels wrong to call the -M -C -C annotations "move/copy tracking" as they are actually the original locations. So I'm relabeling the status bar to show "copy/move tracking annotations" for the current file (no -M -C -C) as that set of annotations tells us who put the hunk here (who moved/copied it). I'm now calling the -M -C -C pass "original location annotations" as that's what we're really digging for. I also tried to clarify some of the text in the hover tooltip. Signed-off-by: Shawn O. Pearce <[email protected]>
1 parent 5d198d6 commit 949da61

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

lib/blame.tcl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,9 @@ method _read_file {fd jump} {
477477
$w_file yview moveto [lindex $jump 3]
478478
}
479479

480-
_exec_blame $this $w_asim @asim_data [list] {}
480+
_exec_blame $this $w_asim @asim_data \
481+
[list] \
482+
{ copy/move tracking}
481483
}
482484
} ifdeleted { catch {close $fd} }
483485

@@ -672,7 +674,7 @@ method _read_blame {fd cur_w cur_d cur_s} {
672674
if {$cur_w eq $w_asim} {
673675
_exec_blame $this $w_amov @amov_data \
674676
[list -M -C -C] \
675-
{ move/copy tracking}
677+
{ original location}
676678
} else {
677679
set current_fd {}
678680
set status {Annotation complete.}
@@ -906,7 +908,7 @@ method _open_tooltip {cur_w} {
906908
$tooltip_t insert end "$summary"
907909

908910
if {$org ne {} && [lindex $org 0] ne $cmit} {
909-
$tooltip_t insert 0.0 "Moved Here By:\n" section_header
911+
$tooltip_t insert 0.0 "Copied/Moved Here By:\n" section_header
910912
set cmit [lindex $org 0]
911913
set file [lindex $org 1]
912914
lappend tooltip_commit $cmit
@@ -929,7 +931,7 @@ method _open_tooltip {cur_w} {
929931

930932
if {$file ne $path} {
931933
$tooltip_t insert end "\n"
932-
$tooltip_t insert end "File: " section_header
934+
$tooltip_t insert end "In File: " section_header
933935
$tooltip_t insert end $file
934936
}
935937
}

0 commit comments

Comments
 (0)