From 949da61b9b84bfb48ed2ff2dea068a1d19fb847b Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 6 Jun 2007 03:03:16 -0400 Subject: 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 --- lib/blame.tcl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/blame.tcl b/lib/blame.tcl index 5ea7bfea90..0400d6effe 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -477,7 +477,9 @@ method _read_file {fd jump} { $w_file yview moveto [lindex $jump 3] } - _exec_blame $this $w_asim @asim_data [list] {} + _exec_blame $this $w_asim @asim_data \ + [list] \ + { copy/move tracking} } } ifdeleted { catch {close $fd} } @@ -672,7 +674,7 @@ method _read_blame {fd cur_w cur_d cur_s} { if {$cur_w eq $w_asim} { _exec_blame $this $w_amov @amov_data \ [list -M -C -C] \ - { move/copy tracking} + { original location} } else { set current_fd {} set status {Annotation complete.} @@ -906,7 +908,7 @@ method _open_tooltip {cur_w} { $tooltip_t insert end "$summary" if {$org ne {} && [lindex $org 0] ne $cmit} { - $tooltip_t insert 0.0 "Moved Here By:\n" section_header + $tooltip_t insert 0.0 "Copied/Moved Here By:\n" section_header set cmit [lindex $org 0] set file [lindex $org 1] lappend tooltip_commit $cmit @@ -929,7 +931,7 @@ method _open_tooltip {cur_w} { if {$file ne $path} { $tooltip_t insert end "\n" - $tooltip_t insert end "File: " section_header + $tooltip_t insert end "In File: " section_header $tooltip_t insert end $file } } -- cgit v1.2.3