X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=lib%2Fblame.tcl;h=92fac1bad402a0d7772af0b8817217555b61b6c7;hb=0c87a951c2970ec5fe204c3743b467819ee42a64;hp=1223c567ab526347cb3b4b58955d8328cb678bed;hpb=982cf98fa47b8db890b84febda325e461f8a407d;p=git.git

diff --git a/lib/blame.tcl b/lib/blame.tcl
index 1223c567a..92fac1bad 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -3,63 +3,123 @@
 
 class blame {
 
-field commit  ; # input commit to blame
-field path    ; # input filename to view in $commit
+image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
+
+# Persistant data (survives loads)
+#
+field history {}; # viewer history: {commit path}
+field header    ; # array commit,key -> header field
+
+# Tk UI control paths
+#
+field w          ; # top window in this viewer
+field w_back     ; # our back button
+field w_path     ; # label showing the current file path
+field w_columns  ; # list of all column widgets in the viewer
+field w_line     ; # text column: all line numbers
+field w_amov     ; # text column: annotations + move tracking
+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     ; # status mega-widget instance
+field old_height ; # last known height of $w.file_pane
+
+# Tk UI colors
+#
+variable active_color #c0edc5
+variable group_colors {
+	#d6d6d6
+	#e1e1e1
+	#ececec
+}
 
-field w
-field w_line
-field w_cgrp
-field w_load
-field w_file
-field w_cmit
-field status
-field old_height
+# 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 path                 ; # input filename to view in $commit
 
-field highlight_line   -1 ; # current line selected
-field highlight_commit {} ; # sha1 of commit selected
+field current_fd        {} ; # background process running
+field highlight_line    -1 ; # current line selected
+field highlight_column  {} ; # current commit column selected
+field highlight_commit  {} ; # sha1 of commit selected
 
 field total_lines       0  ; # total length of file
 field blame_lines       0  ; # number of lines computed
-field commit_count      0  ; # number of commits in $commit_list
-field commit_list      {}  ; # list of commit sha1 in receipt order
-field order                ; # array commit -> receipt order
-field header               ; # array commit,key -> header field
-field line_commit          ; # array line -> sha1 commit
-field line_file            ; # array line -> file name
-
-field r_commit      ; # commit currently being parsed
-field r_orig_line   ; # original line number
-field r_final_line  ; # final line number
-field r_line_count  ; # lines in this region
-
-field tooltip_wm     {} ; # Current tooltip toplevel, if open
-field tooltip_timer  {} ; # Current timer event for our tooltip
-field tooltip_commit {} ; # Commit in tooltip
-field tooltip_text   {} ; # Text in current tooltip
-
-variable active_color #98e1a0
-variable group_colors {
-	#cbcbcb
-	#e1e1e1
-}
+field amov_data            ; # list of {commit origfile origline}
+field asim_data            ; # list of {commit origfile origline}
+
+field r_commit             ; # commit currently being parsed
+field r_orig_line          ; # original line number
+field r_final_line         ; # final line number
+field r_line_count         ; # lines in this region
+
+field tooltip_wm        {} ; # Current tooltip toplevel, if open
+field tooltip_t         {} ; # Text widget in $tooltip_wm
+field tooltip_timer     {} ; # Current timer event for our tooltip
+field tooltip_commit    {} ; # Commit(s) in tooltip
 
 constructor new {i_commit i_path} {
-	variable active_color
 	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"
-	set status "Loading $commit:$path..."
+	wm title $top [append "[appname] ([reponame]): " [mc "File Viewer"]]
 
-	label $w.path -text "$commit:$path" \
+	frame $w.header -background gold
+	label $w.header.commit_l \
+		-text [mc "Commit:"] \
+		-background gold \
+		-foreground black \
 		-anchor w \
-		-justify left \
-		-borderwidth 1 \
-		-relief sunken \
-		-font font_uibold
+		-justify left
+	set w_back $w.header.commit_b
+	label $w_back \
+		-image ::blame::img_back_arrow \
+		-borderwidth 0 \
+		-relief flat \
+		-state disabled \
+		-background gold \
+		-foreground black \
+		-activebackground gold
+	bind $w_back <Button-1> "
+		if {\[$w_back cget -state\] eq {normal}} {
+			[cb _history_menu]
+		}
+		"
+	label $w.header.commit \
+		-textvariable @commit \
+		-background gold \
+		-foreground black \
+		-anchor w \
+		-justify left
+	label $w.header.path_l \
+		-text [mc "File:"] \
+		-background gold \
+		-foreground black \
+		-anchor w \
+		-justify left
+	set w_path $w.header.path
+	label $w_path \
+		-background gold \
+		-foreground black \
+		-anchor w \
+		-justify left
+	pack $w.header.commit_l -side left
+	pack $w_back -side left
+	pack $w.header.commit -side left
+	pack $w_path -fill x -side right
+	pack $w.header.path_l -side right
 
 	panedwindow $w.file_pane -orient vertical
 	frame $w.file_pane.out
@@ -75,38 +135,69 @@ constructor new {i_commit i_path} {
 		-height 25 \
 		-width 100
 
-	set w_load $w.file_pane.out.loaded_t
-	text $w_load \
-		-background white -borderwidth 0 \
+	set w_line $w.file_pane.out.linenumber_t
+	text $w_line \
+		-takefocus 0 \
+		-highlightthickness 0 \
+		-padx 0 -pady 0 \
+		-background white \
+		-foreground black \
+		-borderwidth 0 \
 		-state disabled \
 		-wrap none \
 		-height 40 \
-		-width 1 \
+		-width 6 \
 		-font font_diff
-	$w_load tag conf annotated -background grey
-
-	set w_line $w.file_pane.out.linenumber_t
-	text $w_line \
-		-background white -borderwidth 0 \
+	$w_line tag conf linenumber -justify right -rmargin 5
+
+	set w_amov $w.file_pane.out.amove_t
+	text $w_amov \
+		-takefocus 0 \
+		-highlightthickness 0 \
+		-padx 0 -pady 0 \
+		-background white \
+		-foreground black \
+		-borderwidth 0 \
 		-state disabled \
 		-wrap none \
 		-height 40 \
 		-width 5 \
 		-font font_diff
-	$w_line tag conf linenumber -justify right
-
-	set w_cgrp $w.file_pane.out.commit_t
-	text $w_cgrp \
-		-background white -borderwidth 0 \
+	$w_amov tag conf author_abbr -justify right -rmargin 5
+	$w_amov tag conf curr_commit
+	$w_amov tag conf prior_commit -foreground blue -underline 1
+	$w_amov tag bind prior_commit \
+		<Button-1> \
+		"[cb _load_commit $w_amov @amov_data @%x,%y];break"
+
+	set w_asim $w.file_pane.out.asimple_t
+	text $w_asim \
+		-takefocus 0 \
+		-highlightthickness 0 \
+		-padx 0 -pady 0 \
+		-background white \
+		-foreground black \
+		-borderwidth 0 \
 		-state disabled \
 		-wrap none \
 		-height 40 \
 		-width 4 \
 		-font font_diff
+	$w_asim tag conf author_abbr -justify right
+	$w_asim tag conf curr_commit
+	$w_asim tag conf prior_commit -foreground blue -underline 1
+	$w_asim tag bind prior_commit \
+		<Button-1> \
+		"[cb _load_commit $w_asim @asim_data @%x,%y];break"
 
 	set w_file $w.file_pane.out.file_t
 	text $w_file \
-		-background white -borderwidth 0 \
+		-takefocus 0 \
+		-highlightthickness 0 \
+		-padx 0 -pady 0 \
+		-background white \
+		-foreground black \
+		-borderwidth 0 \
 		-state disabled \
 		-wrap none \
 		-height 40 \
@@ -114,31 +205,30 @@ constructor new {i_commit i_path} {
 		-xscrollcommand [list $w.file_pane.out.sbx set] \
 		-font font_diff
 
+	set w_columns [list $w_amov $w_asim $w_line $w_file]
+
 	scrollbar $w.file_pane.out.sbx \
 		-orient h \
 		-command [list $w_file xview]
 	scrollbar $w.file_pane.out.sby \
 		-orient v \
-		-command [list scrollbar2many [list \
-		$w_load \
-		$w_line \
-		$w_cgrp \
-		$w_file \
-		] yview]
-	grid \
-		$w_cgrp \
-		$w_line \
-		$w_load \
-		$w_file \
-		$w.file_pane.out.sby \
-		-sticky nsew
-	grid conf $w.file_pane.out.sbx -column 3 -sticky we
-	grid columnconfigure $w.file_pane.out 3 -weight 1
+		-command [list scrollbar2many $w_columns yview]
+	eval grid $w_columns $w.file_pane.out.sby -sticky nsew
+	grid conf \
+		$w.file_pane.out.sbx \
+		-column [expr {[llength $w_columns] - 1}] \
+		-sticky we
+	grid columnconfigure \
+		$w.file_pane.out \
+		[expr {[llength $w_columns] - 1}] \
+		-weight 1
 	grid rowconfigure $w.file_pane.out 0 -weight 1
 
-	set w_cmit $w.file_pane.cm.t
-	text $w_cmit \
-		-background white -borderwidth 0 \
+	set w_cviewer $w.file_pane.cm.t
+	text $w_cviewer \
+		-background white \
+		-foreground black \
+		-borderwidth 0 \
 		-state disabled \
 		-wrap none \
 		-height 10 \
@@ -146,59 +236,42 @@ constructor new {i_commit i_path} {
 		-xscrollcommand [list $w.file_pane.cm.sbx set] \
 		-yscrollcommand [list $w.file_pane.cm.sby set] \
 		-font font_diff
-	$w_cmit tag conf header_key \
+	$w_cviewer tag conf still_loading \
+		-font font_uiitalic \
+		-justify center
+	$w_cviewer tag conf header_key \
 		-tabs {3c} \
 		-background $active_color \
 		-font font_uibold
-	$w_cmit tag conf header_val \
+	$w_cviewer tag conf header_val \
 		-background $active_color \
 		-font font_ui
-	$w_cmit tag raise sel
+	$w_cviewer tag raise sel
 	scrollbar $w.file_pane.cm.sbx \
 		-orient h \
-		-command [list $w_cmit xview]
+		-command [list $w_cviewer xview]
 	scrollbar $w.file_pane.cm.sby \
 		-orient v \
-		-command [list $w_cmit yview]
+		-command [list $w_cviewer yview]
 	pack $w.file_pane.cm.sby -side right -fill y
 	pack $w.file_pane.cm.sbx -side bottom -fill x
-	pack $w_cmit -expand 1 -fill both
+	pack $w_cviewer -expand 1 -fill both
 
-	frame $w.status \
-		-borderwidth 1 \
-		-relief sunken
-	label $w.status.l \
-		-textvariable @status \
-		-anchor w \
-		-justify left
-	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.l -side left
-	pack $w.status.c -side right
+	set status [::status_bar::new $w.status]
 
 	menu $w.ctxm -tearoff 0
 	$w.ctxm add command \
-		-label "Copy Commit" \
+		-label [mc "Copy Commit"] \
 		-command [cb _copycommit]
 
-	foreach i [list \
-		$w_cgrp \
-		$w_load \
-		$w_line \
-		$w_file] {
+	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 [list \
-			$w_cgrp \
-			$w_load \
-			$w_line \
-			$w_file \
-			] yview $w.file_pane.out.sby]
+		$i conf -yscrollcommand [list many2scrollbar \
+			$w_columns yview $w.file_pane.out.sby]
 		bind $i <Button-1> "
 			[cb _hide_tooltip]
 			[cb _click $i @%x,%y]
@@ -214,14 +287,11 @@ constructor new {i_commit i_path} {
 			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 [list \
-		$w_cgrp \
-		$w_load \
-		$w_line \
-		$w_file \
-		$w_cmit] {
+	foreach i [concat $w_columns $w_cviewer] {
 		bind $i <Key-Up>        {catch {%W yview scroll -1 units};break}
 		bind $i <Key-Down>      {catch {%W yview scroll  1 units};break}
 		bind $i <Key-Left>      {catch {%W xview scroll -1 units};break}
@@ -234,11 +304,12 @@ constructor new {i_commit i_path} {
 		bind $i <Control-Key-f> {catch {%W yview scroll  1 pages};break}
 	}
 
-	bind $w_cmit <Button-1> [list focus $w_cmit]
-	bind $top <Visibility> [list focus $top]
-	bind $w_file <Destroy> [list delete_this $this]
+	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 $w_file    <Visibility> [list focus $w_file]
 
-	grid configure $w.path -sticky ew
+	grid configure $w.header -sticky ew
 	grid configure $w.file_pane -sticky nsew
 	grid configure $w.status -sticky ew
 	grid columnconfigure $top 0 -weight 1
@@ -248,8 +319,9 @@ constructor new {i_commit i_path} {
 
 	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
@@ -261,60 +333,192 @@ constructor new {i_commit i_path} {
 	bind $w.file_pane <Configure> \
 	"if {{$w.file_pane} eq {%W}} {[cb _resize %h]}"
 
+	_load $this {}
+}
+
+method _load {jump} {
+	variable group_colors
+
+	_hide_tooltip $this
+
+	if {$total_lines != 0 || $current_fd ne {}} {
+		if {$current_fd ne {}} {
+			catch {close $current_fd}
+			set current_fd {}
+		}
+
+		foreach i $w_columns {
+			$i conf -state normal
+			$i delete 0.0 end
+			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
+	}
+
+	if {$history eq {}} {
+		$w_back conf -state disabled
+	} else {
+		$w_back conf -state normal
+	}
+
+	# Index 0 is always empty.  There is never line 0 as
+	# we use only 1 based lines, as that matches both with
+	# git-blame output and with Tk's text widget.
+	#
+	set amov_data [list [list]]
+	set asim_data [list [list]]
+
+	$status show [mc "Reading %s..." "$commit:[escape_path $path]"]
+	$w_path conf -text [escape_path $path]
 	if {$commit eq {}} {
 		set fd [open $path r]
+		fconfigure $fd -eofchar {}
 	} else {
-		set cmd [list git cat-file blob "$commit:$path"]
-		set fd [open "| $cmd" r]
+		set fd [git_read cat-file blob "$commit:$path"]
 	}
 	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
+}
+
+method _history_menu {} {
+	set m $w.backmenu
+	if {[winfo exists $m]} {
+		$m delete 0 end
+	} else {
+		menu $m -tearoff 0
+	}
+
+	for {set i [expr {[llength $history] - 1}]
+		} {$i >= 0} {incr i -1} {
+		set e [lindex $history $i]
+		set c [lindex $e 0]
+		set f [lindex $e 1]
+
+		if {[regexp {^[0-9a-f]{40}$} $c]} {
+			set t [string range $c 0 8]...
+		} elseif {$c eq {}} {
+			set t {Working Directory}
+		} else {
+			set t $c
+		}
+		if {![catch {set summary $header($c,summary)}]} {
+			append t " $summary"
+			if {[string length $t] > 70} {
+				set t [string range $t 0 66]...
+			}
+		}
+
+		$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} {
+	set dat [lindex $history $i]
+	set history [lrange $history 0 [expr {$i - 1}]]
+	set commit [lindex $dat 0]
+	set path [lindex $dat 1]
+	_load $this [lrange $dat 2 5]
 }
 
-method _read_file {fd} {
-	$w_load conf -state normal
-	$w_cgrp conf -state normal
-	$w_line conf -state normal
-	$w_file conf -state normal
+method _read_file {fd jump} {
+	if {$fd ne $current_fd} {
+		catch {close $fd}
+		return
+	}
+
+	foreach i $w_columns {$i conf -state normal}
 	while {[gets $fd line] >= 0} {
 		regsub "\r\$" $line {} line
 		incr total_lines
+		lappend amov_data {}
+		lappend asim_data {}
 
 		if {$total_lines > 1} {
-			$w_load insert end "\n"
-			$w_cgrp insert end "\n"
-			$w_line insert end "\n"
-			$w_file insert end "\n"
+			foreach i $w_columns {$i insert end "\n"}
 		}
 
 		$w_line insert end "$total_lines" linenumber
 		$w_file insert end "$line"
 	}
-	$w_load conf -state disabled
-	$w_cgrp conf -state disabled
-	$w_line conf -state disabled
-	$w_file conf -state disabled
+
+	set ln_wc [expr {[string length $total_lines] + 2}]
+	if {[$w_line cget -width] < $ln_wc} {
+		$w_line conf -width $ln_wc
+	}
+
+	foreach i $w_columns {$i conf -state disabled}
 
 	if {[eof $fd]} {
 		close $fd
-		_status $this
-		set cmd [list git blame -M -C --incremental]
-		if {$commit eq {}} {
-			lappend cmd --contents $path
-		} else {
-			lappend cmd $commit
+
+		# 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]
 		}
-		lappend cmd -- $path
-		set fd [open "| $cmd" r]
-		fconfigure $fd -blocking 0 -translation lf -encoding binary
-		fileevent $fd readable [cb _read_blame $fd]
+
+		_exec_blame $this $w_asim @asim_data \
+			[list] \
+			[mc "Loading copy/move tracking annotations..."]
 	}
 } ifdeleted { catch {close $fd} }
 
-method _read_blame {fd} {
+method _exec_blame {cur_w cur_d options cur_s} {
+	lappend options --incremental
+	if {$commit eq {}} {
+		lappend options --contents $path
+	} else {
+		lappend options $commit
+	}
+	lappend options -- $path
+	set fd [eval git_read --nice blame $options]
+	fconfigure $fd -blocking 0 -translation lf -encoding binary
+	fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d]
+	set current_fd $fd
+	set blame_lines 0
+
+	$status start \
+		$cur_s \
+		[mc "lines annotated"]
+}
+
+method _read_blame {fd cur_w cur_d} {
+	upvar #0 $cur_d line_data
 	variable group_colors
+	variable original_options
 
-	$w_cgrp conf -state normal
+	if {$fd ne $current_fd} {
+		catch {close $fd}
+		return
+	}
+
+	$cur_w conf -state normal
 	while {[gets $fd line] >= 0} {
 		if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
 			cmit original_line final_line line_count]} {
@@ -322,36 +526,32 @@ method _read_blame {fd} {
 			set r_orig_line  $original_line
 			set r_final_line $final_line
 			set r_line_count $line_count
-
-			if {[catch {set g $order($cmit)}]} {
-				set bg [lindex $group_colors 0]
-				set group_colors [lrange $group_colors 1 end]
-				lappend group_colors $bg
-
-				$w_cgrp tag conf g$cmit -background $bg
-				$w_line tag conf g$cmit -background $bg
-				$w_file tag conf g$cmit -background $bg
-
-				set order($cmit) $commit_count
-				incr commit_count
-				lappend commit_list $cmit
-			}
 		} 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 commit_abbr work
+				set commit_type curr_commit
+			} elseif {$cmit eq $commit} {
+				set commit_abbr this
+				set commit_type curr_commit
 			} else {
-				set commit_abbr [string range $cmit 0 4]
+				set commit_type prior_commit
+				set commit_abbr [string range $cmit 0 3]
 			}
 
 			set author_abbr {}
 			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
@@ -363,79 +563,115 @@ method _read_blame {fd} {
 				set author_abbr { |}
 			} else {
 				set author_abbr [string range $author_abbr 0 3]
-				while {[string length $author_abbr] < 4} {
-					set author_abbr " $author_abbr"
-				}
 			}
 			unset a_name
 
 			set first_lno $lno
 			while {
-			![catch {set ncmit $line_commit([expr {$first_lno - 1}])}]
-			&& $ncmit eq $cmit
+			   $first_lno > 1
+			&& $cmit eq [lindex $line_data [expr {$first_lno - 1}] 0]
+			&& $file eq [lindex $line_data [expr {$first_lno - 1}] 1]
 			} {
 				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 {[catch {set g g$line_commit($lno)}]} {
-					$w_load tag add annotated $lno.0 $lno_e
-				} else {
-					$w_cgrp tag remove g$g $lno.0 $lno_e
-					$w_line tag remove g$g $lno.0 $lno_e
-					$w_file tag remove g$g $lno.0 $lno_e
-
-					$w_cgrp tag remove a$g $lno.0 $lno_e
-					$w_line tag remove a$g $lno.0 $lno_e
-					$w_file tag remove a$g $lno.0 $lno_e
+				if {[lindex $line_data $lno] ne {}} {
+					set g [lindex $line_data $lno 0]
+					foreach i $w_columns {
+						$i tag remove g$g $lno.0 $lno_e
+					}
 				}
+				lset line_data $lno [list $cmit $file $oln]
 
-				set line_commit($lno) $cmit
-				set line_file($lno)   $file
-
-				$w_cgrp delete $lno.0 "$lno.0 lineend"
+				$cur_w delete $lno.0 "$lno.0 lineend"
 				if {$lno == $first_lno} {
-					$w_cgrp insert $lno.0 $commit_abbr
+					$cur_w insert $lno.0 $commit_abbr $commit_type
 				} elseif {$lno == [expr {$first_lno + 1}]} {
-					$w_cgrp insert $lno.0 $author_abbr
+					$cur_w insert $lno.0 $author_abbr author_abbr
 				} else {
-					$w_cgrp insert $lno.0 { |}
+					$cur_w insert $lno.0 { |}
 				}
 
-				$w_cgrp tag add g$cmit $lno.0 $lno_e
-				$w_line tag add g$cmit $lno.0 $lno_e
-				$w_file tag add g$cmit $lno.0 $lno_e
-
-				$w_cgrp tag add a$cmit $lno.0 $lno_e
-				$w_line tag add a$cmit $lno.0 $lno_e
-				$w_file tag add a$cmit $lno.0 $lno_e
+				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
+				}
 
-				if {$highlight_line == -1} {
-					if {[lindex [$w_file yview] 0] == 0} {
+				if {$highlight_column eq $cur_w} {
+					if {$highlight_line == -1
+					 && [lindex [$w_file yview] 0] == 0} {
 						$w_file see $lno.0
-						_showcommit $this $lno
+						set highlight_line $lno
+					}
+					if {$highlight_line == $lno} {
+						_showcommit $this $cur_w $lno
 					}
-				} elseif {$highlight_line == $lno} {
-					_showcommit $this $lno
 				}
 
 				incr n -1
 				incr lno
+				incr oln
 				incr blame_lines
 			}
 
-			while {![catch {set ncmit $line_commit($lno)}]
-				&& $ncmit eq $cmit} {
-				$w_cgrp delete $lno.0 "$lno.0 lineend"
+			while {
+			   $cmit eq [lindex $line_data $lno 0]
+			&& $file eq [lindex $line_data $lno 1]
+			} {
+				$cur_w delete $lno.0 "$lno.0 lineend"
 
 				if {$lno == $first_lno} {
-					$w_cgrp insert $lno.0 $commit_abbr
+					$cur_w insert $lno.0 $commit_abbr $commit_type
 				} elseif {$lno == [expr {$first_lno + 1}]} {
-					$w_cgrp insert $lno.0 $author_abbr
+					$cur_w insert $lno.0 $author_abbr author_abbr
 				} else {
-					$w_cgrp insert $lno.0 { |}
+					$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
 			}
 
@@ -443,80 +679,98 @@ method _read_blame {fd} {
 			set header($r_commit,$key) $data
 		}
 	}
-	$w_cgrp conf -state disabled
+	$cur_w conf -state disabled
 
 	if {[eof $fd]} {
 		close $fd
-		set status {Annotation complete.}
-		destroy $w.status.c
+		if {$cur_w eq $w_asim} {
+			_exec_blame $this $w_amov @amov_data \
+				$original_options \
+				[mc "Loading original location annotations..."]
+		} else {
+			set current_fd {}
+			$status stop [mc "Annotation complete."]
+		}
 	} else {
-		_status $this
+		$status update $blame_lines $total_lines
 	}
 } ifdeleted { catch {close $fd} }
 
-method _status {} {
-	set have  $blame_lines
-	set total $total_lines
-	set pdone 0
-	if {$total} {set pdone [expr {100 * $have / $total}]}
-
-	set status [format \
-		"Loading annotations... %i of %i lines annotated (%2i%%)" \
-		$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
 }
 
-method _click {cur_w pos} {
+method _load_commit {cur_w cur_d pos} {
+	upvar #0 $cur_d line_data
 	set lno [lindex [split [$cur_w index $pos] .] 0]
-	if {$lno eq {}} return
-	_showcommit $this $lno
+	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 [list [lindex $dat 2]]
+	}
 }
 
-method _showcommit {lno} {
+method _showcommit {cur_w lno} {
 	global repo_config
 	variable active_color
 
 	if {$highlight_commit ne {}} {
-		set cmit $highlight_commit
-		$w_cgrp tag conf a$cmit -background {}
-		$w_line tag conf a$cmit -background {}
-		$w_file tag conf a$cmit -background {}
+		foreach i $w_columns {
+			$i tag conf g$highlight_commit -background {}
+			$i tag lower g$highlight_commit
+		}
 	}
 
-	$w_cmit conf -state normal
-	$w_cmit delete 0.0 end
-	if {[catch {set cmit $line_commit($lno)}]} {
+	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
+	$w_cviewer delete 0.0 end
+
+	if {$dat eq {}} {
 		set cmit {}
-		$w_cmit insert end "Loading annotation..."
+		$w_cviewer insert end [mc "Loading annotation..."] still_loading
 	} else {
-		$w_cgrp tag conf a$cmit -background $active_color
-		$w_line tag conf a$cmit -background $active_color
-		$w_file tag conf a$cmit -background $active_color
+		set cmit [lindex $dat 0]
+		set file [lindex $dat 1]
+
+		foreach i $w_columns {
+			$i tag conf g$cmit -background $active_color
+			$i tag raise g$cmit
+		}
 
 		set author_name {}
 		set author_email {}
 		set author_time {}
 		catch {set author_name $header($cmit,author)}
 		catch {set author_email $header($cmit,author-mail)}
-		catch {set author_time [clock format \
-			$header($cmit,author-time) \
-			-format {%Y-%m-%d %H:%M:%S}
-		]}
+		catch {set author_time [format_date $header($cmit,author-time)]}
 
 		set committer_name {}
 		set committer_email {}
 		set committer_time {}
 		catch {set committer_name $header($cmit,committer)}
 		catch {set committer_email $header($cmit,committer-mail)}
-		catch {set committer_time [clock format \
-			$header($cmit,committer-time) \
-			-format {%Y-%m-%d %H:%M:%S}
-		]}
+		catch {set committer_time [format_date $header($cmit,committer-time)]}
 
 		if {[catch {set msg $header($cmit,message)}]} {
 			set msg {}
 			catch {
-				set fd [open "| git cat-file commit $cmit" r]
+				set fd [git_read cat-file commit $cmit]
 				fconfigure $fd -encoding binary -translation lf
 				if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
 					set enc utf-8
@@ -526,41 +780,46 @@ method _showcommit {lno} {
 						set enc [string tolower [string range $line 9 end]]
 					}
 				}
-				set msg [encoding convertfrom $enc [read $fd]]
-				set msg [string trim $msg]
+				set msg [read $fd]
 				close $fd
 
-				set author_name [encoding convertfrom $enc $author_name]
-				set committer_name [encoding convertfrom $enc $committer_name]
-
-				set header($cmit,author) $author_name
-				set header($cmit,committer) $committer_name
+				set enc [tcl_encoding $enc]
+				if {$enc ne {}} {
+					set msg [encoding convertfrom $enc $msg]
+					set author_name [encoding convertfrom $enc $author_name]
+					set committer_name [encoding convertfrom $enc $committer_name]
+					set header($cmit,author) $author_name
+					set header($cmit,committer) $committer_name
+					set header($cmit,summary) \
+					[encoding convertfrom $enc $header($cmit,summary)]
+				}
+				set msg [string trim $msg]
 			}
 			set header($cmit,message) $msg
 		}
 
-		$w_cmit insert end "commit $cmit\n" header_key
-		$w_cmit insert end "Author:\t" header_key
-		$w_cmit insert end "$author_name $author_email" header_val
-		$w_cmit insert end "$author_time\n" header_val
+		$w_cviewer insert end "commit $cmit\n" header_key
+		$w_cviewer insert end [strcat [mc "Author:"] "\t"] header_key
+		$w_cviewer insert end "$author_name $author_email" header_val
+		$w_cviewer insert end "  $author_time\n" header_val
 
-		$w_cmit insert end "Committer:\t" header_key
-		$w_cmit insert end "$committer_name $committer_email" header_val
-		$w_cmit insert end "$committer_time\n" header_val
+		$w_cviewer insert end [strcat [mc "Committer:"] "\t"] header_key
+		$w_cviewer insert end "$committer_name $committer_email" header_val
+		$w_cviewer insert end "  $committer_time\n" header_val
 
-		if {$line_file($lno) ne $path} {
-			$w_cmit insert end "Original File:\t" header_key
-			$w_cmit insert end "[escape_path $line_file($lno)]\n" header_val
+		if {$file ne $path} {
+			$w_cviewer insert end [strcat [mc "Original File:"] "\t"] header_key
+			$w_cviewer insert end "[escape_path $file]\n" header_val
 		}
 
-		$w_cmit insert end "\n$msg"
+		$w_cviewer insert end "\n$msg"
 	}
-	$w_cmit conf -state disabled
+	$w_cviewer conf -state disabled
 
 	set highlight_line $lno
 	set highlight_commit $cmit
 
-	if {$highlight_commit eq $tooltip_commit} {
+	if {[lsearch -exact $tooltip_commit $highlight_commit] != -1} {
 		_hide_tooltip $this
 	}
 }
@@ -568,30 +827,18 @@ method _showcommit {lno} {
 method _copycommit {} {
 	set pos @$::cursorX,$::cursorY
 	set lno [lindex [split [$::cursorW index $pos] .] 0]
-	if {![catch {set commit $line_commit($lno)}]} {
+	set dat [lindex $amov_data $lno]
+	if {$dat ne {}} {
 		clipboard clear
 		clipboard append \
 			-format STRING \
 			-type STRING \
-			-- $commit
+			-- [lindex $dat 0]
 	}
 }
 
 method _show_tooltip {cur_w pos} {
-	set lno [lindex [split [$cur_w index $pos] .] 0]
-	if {[catch {set cmit $line_commit($lno)}]} {
-		_hide_tooltip $this
-		return
-	}
-
-	if {$cmit eq $highlight_commit} {
-		_hide_tooltip $this
-		return
-	}
-
-	if {$cmit eq $tooltip_commit} {
-		_position_tooltip $this
-	} elseif {$tooltip_wm ne {}} {
+	if {$tooltip_wm ne {}} {
 		_open_tooltip $this $cur_w
 	} elseif {$tooltip_timer eq {}} {
 		set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]]
@@ -607,58 +854,104 @@ method _open_tooltip {cur_w} {
 		return
 	}
 
+	if {$tooltip_wm ne "$cur_w.tooltip"} {
+		_hide_tooltip $this
+
+		set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
+		wm overrideredirect $tooltip_wm 1
+		wm transient $tooltip_wm [winfo toplevel $cur_w]
+		set tooltip_t $tooltip_wm.label
+		text $tooltip_t \
+			-takefocus 0 \
+			-highlightthickness 0 \
+			-relief flat \
+			-borderwidth 0 \
+			-wrap none \
+			-background lightyellow \
+			-foreground black
+		$tooltip_t tag conf section_header -font font_uibold
+		pack $tooltip_t
+	} else {
+		$tooltip_t conf -state normal
+		$tooltip_t delete 0.0 end
+	}
+
 	set pos @[join [list \
 		[expr {$pos_x - [winfo rootx $cur_w]}] \
 		[expr {$pos_y - [winfo rooty $cur_w]}]] ,]
 	set lno [lindex [split [$cur_w index $pos] .] 0]
-	set cmit $line_commit($lno)
+	if {$cur_w eq $w_amov} {
+		set dat [lindex $amov_data $lno]
+		set org {}
+	} else {
+		set dat [lindex $asim_data $lno]
+		set org [lindex $amov_data $lno]
+	}
+
+	if {$dat eq {}} {
+		_hide_tooltip $this
+		return
+	}
+
+	set cmit [lindex $dat 0]
+	set tooltip_commit [list $cmit]
 
 	set author_name {}
-	set author_email {}
+	set summary     {}
 	set author_time {}
 	catch {set author_name $header($cmit,author)}
-	catch {set author_email $header($cmit,author-mail)}
-	catch {set author_time [clock format \
-		$header($cmit,author-time) \
-		-format {%Y-%m-%d %H:%M:%S}
-	]}
-
-	set committer_name {}
-	set committer_email {}
-	set committer_time {}
-	catch {set committer_name $header($cmit,committer)}
-	catch {set committer_email $header($cmit,committer-mail)}
-	catch {set committer_time [clock format \
-		$header($cmit,committer-time) \
-		-format {%Y-%m-%d %H:%M:%S}
-	]}
-
-	set summary {}
-	catch {set summary $header($cmit,summary)}
-
-	set tooltip_commit $cmit
-	set tooltip_text "commit $cmit
-$author_name $author_email  $author_time
-$summary"
+	catch {set summary     $header($cmit,summary)}
+	catch {set author_time [format_date $header($cmit,author-time)]}
 
-	if {$tooltip_wm ne "$cur_w.tooltip"} {
-		_hide_tooltip $this
+	$tooltip_t insert end "commit $cmit\n"
+	$tooltip_t insert end "$author_name  $author_time\n"
+	$tooltip_t insert end "$summary"
 
-		set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
-		wm overrideredirect $tooltip_wm 1
-		wm transient $tooltip_wm [winfo toplevel $cur_w]
-		pack [label $tooltip_wm.label \
-			-background lightyellow \
-			-foreground black \
-			-textvariable @tooltip_text \
-			-justify left]
+	if {$org ne {} && [lindex $org 0] ne $cmit} {
+		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
+
+		set author_name {}
+		set summary     {}
+		set author_time {}
+		catch {set author_name $header($cmit,author)}
+		catch {set summary     $header($cmit,summary)}
+		catch {set author_time [format_date $header($cmit,author-time)]}
+
+		$tooltip_t insert end [strcat [mc "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\n"
+
+		if {$file ne $path} {
+			$tooltip_t insert end [strcat [mc "In File:"] " "] section_header
+			$tooltip_t insert end "$file\n"
+		}
+
+		$tooltip_t insert end "\n"
+		$tooltip_t insert end [strcat [mc "Copied Or Moved Here By:"] "\n"] section_header
+		$tooltip_t insert end $save
 	}
+
+	$tooltip_t conf -state disabled
 	_position_tooltip $this
 }
 
 method _position_tooltip {} {
-	set req_w [winfo reqwidth  $tooltip_wm.label]
-	set req_h [winfo reqheight $tooltip_wm.label]
+	set max_h [lindex [split [$tooltip_t index end] .] 0]
+	set max_w 0
+	for {set i 1} {$i <= $max_h} {incr i} {
+		set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1]
+		if {$c > $max_w} {set max_w $c}
+	}
+	$tooltip_t conf -width $max_w -height $max_h
+
+	set req_w [winfo reqwidth  $tooltip_t]
+	set req_h [winfo reqheight $tooltip_t]
 	set pos_x [expr {[winfo pointerx .] +  5}]
 	set pos_y [expr {[winfo pointery .] + 10}]