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 <spearce@spearce.org>
Shawn O. Pearce committed
Jun 6, 2007 at 03:03 UTC
949da61b9b84bfb48ed2ff2dea068a1d19fb847b
1 file changed
+6
-4
lib/blame.tcl
+6
-4
@@ -477,7 +477,9 @@ method _read_file {fd jump} {
477
$w_file yview moveto [lindex $jump 3]
478
}
479
480
- _exec_blame $this $w_asim @asim_data [list] {}
480
+ _exec_blame $this $w_asim @asim_data \
481
+ [list] \
482
+ { copy/move tracking}
483
}
484
} ifdeleted { catch {close $fd} }
485
@@ -672,7 +674,7 @@ method _read_blame {fd cur_w cur_d cur_s} {
674
if {$cur_w eq $w_asim} {
675
_exec_blame $this $w_amov @amov_data \
676
[list -M -C -C] \
675
- { move/copy tracking}
677
+ { original location}
678
} else {
679
set current_fd {}
680
set status {Annotation complete.}
@@ -906,7 +908,7 @@ method _open_tooltip {cur_w} {
908
$tooltip_t insert end "$summary"
909
910
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
912
set cmit [lindex $org 0]
913
set file [lindex $org 1]
914
lappend tooltip_commit $cmit
@@ -929,7 +931,7 @@ method _open_tooltip {cur_w} {
931
932
if {$file ne $path} {
933
$tooltip_t insert end "\n"
932
- $tooltip_t insert end "File: " section_header
934
+ $tooltip_t insert end "In File: " section_header
935
$tooltip_t insert end $file
936
}
937
}