git-gui: Display original filename and line number in blame.

diff --git a/git-gui.sh b/git-gui.sh
index fc74d9e6eaf2f624972a543f4edd06e06627d59b..f247d40a797b21a8c2d6e7a5a181f9e731be3968 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3087,7 +3087,8 @@ proc ls_tree {w tree_id name} {
        lappend browser_stack($w) [list $tree_id $name]
        $w conf -state disabled
 
-       set fd [open "| git ls-tree -z $tree_id" r]
+       set cmd [list git ls-tree -z $tree_id]
+       set fd [open "| $cmd" r]
        fconfigure $fd -blocking 0 -translation binary -encoding binary
        fileevent $fd readable [list read_ls_tree $fd $w]
 }
@@ -3189,6 +3190,25 @@ proc show_blame {commit path} {
        $w.out add $w.out.date
        lappend texts $w.out.date
 
+       text $w.out.filename -background white -borderwidth 0 \
+               -state disabled \
+               -wrap none \
+               -height 40 \
+               -width 20 \
+               -font font_diff
+       $w.out add $w.out.filename
+       lappend texts $w.out.filename
+
+       text $w.out.origlinenumber -background white -borderwidth 0 \
+               -state disabled \
+               -wrap none \
+               -height 40 \
+               -width 5 \
+               -font font_diff
+       $w.out.origlinenumber tag conf linenumber -justify right
+       $w.out add $w.out.origlinenumber
+       lappend texts $w.out.origlinenumber
+
        text $w.out.linenumber -background white -borderwidth 0 \
                -state disabled \
                -wrap none \
@@ -3247,7 +3267,8 @@ proc show_blame {commit path} {
        wm title $w "[appname] ([reponame]): File Viewer"
 
        set blame_data($w,total_lines) 0
-       set fd [open "| git cat-file blob $commit:$path" r]
+       set cmd [list git cat-file blob "$commit:$path"]
+       set fd [open "| $cmd" r]
        fconfigure $fd -blocking 0 -translation lf -encoding binary
        fileevent $fd readable [list read_blame_catfile $fd $w $commit $path \
                $texts $w.out.linenumber $w.out.file]
@@ -3276,13 +3297,17 @@ proc read_blame_catfile {fd w commit path texts w_lno w_file} {
        if {[eof $fd]} {
                close $fd
                set blame_status($w) {Loading annotations...}
-               set fd [open "| git blame --incremental $commit -- $path" r]
+               set cmd [list git blame -M -C --incremental]
+               lappend cmd $commit -- $path
+               set fd [open "| $cmd" r]
                fconfigure $fd -blocking 0 -translation lf -encoding binary
                fileevent $fd readable "read_blame_incremental $fd $w $texts"
        }
 }
 
-proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
+proc read_blame_incremental {fd w
+       w_commit w_author w_date w_filename w_olno
+       w_lno w_file} {
        global blame_status blame_data
 
        if {![winfo exists $w_commit]} {
@@ -3293,6 +3318,8 @@ proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
        $w_commit conf -state normal
        $w_author conf -state normal
        $w_date conf -state normal
+       $w_filename conf -state normal
+       $w_olno conf -state normal
 
        while {[gets $fd line] >= 0} {
                if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
@@ -3304,6 +3331,7 @@ proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
                } elseif {[string match {filename *} $line]} {
                        set n $blame_data($w,line_count)
                        set lno $blame_data($w,final_line)
+                       set ol $blame_data($w,original_line)
                        set file [string range $line 9 end]
                        set commit $blame_data($w,commit)
                        set abbrev [string range $commit 0 8]
@@ -3323,14 +3351,20 @@ proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
                                $w_commit delete $lno.0 "$lno.0 lineend"
                                $w_author delete $lno.0 "$lno.0 lineend"
                                $w_date delete $lno.0 "$lno.0 lineend"
+                               $w_filename delete $lno.0 "$lno.0 lineend"
+                               $w_olno delete $lno.0 "$lno.0 lineend"
 
                                $w_commit insert $lno.0 $abbrev
                                $w_author insert $lno.0 $author
                                $w_date insert $lno.0 $atime
+                               $w_filename insert $lno.0 $file
+                               $w_olno insert $lno.0 $ol linenumber
+
                                set blame_data($w,line$lno,commit) $commit
 
                                incr n -1
                                incr lno
+                               incr ol
                        }
                } elseif {[regexp {^([a-z-]+) (.*)$} $line line header data]} {
                        set blame_data($w,$blame_data($w,commit),$header) $data
@@ -3340,6 +3374,8 @@ proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
        $w_commit conf -state disabled
        $w_author conf -state disabled
        $w_date conf -state disabled
+       $w_filename conf -state disabled
+       $w_olno conf -state disabled
 
        if {[eof $fd]} {
                close $fd
@@ -4270,6 +4306,9 @@ proc do_options {} {
 
        set optid 0
        foreach option {
+               {t user.name {User Name}}
+               {t user.email {Email Address}}
+
                {b merge.summary {Summarize Merge Commits}}
                {i-1..5 merge.verbosity {Merge Verbosity}}
 
@@ -4676,6 +4715,9 @@ proc apply_config {} {
 
 set default_config(merge.summary) false
 set default_config(merge.verbosity) 2
+set default_config(user.name) {}
+set default_config(user.email) {}
+
 set default_config(gui.trustmtime) false
 set default_config(gui.diffcontext) 5
 set default_config(gui.newbranchtemplate) {}