git-gui: Allow specifying an initial line for git gui blame.

Add a command-line option to make git gui blame automatically
scroll to a specific line in the file. Useful for integration
with other tools.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index b0207ac36a7c905b909e764df9741b2d12432b96..ec08b5a921ed8ebc17714b5f2e96682b68d0d6bd 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2296,10 +2296,15 @@ proc usage {} {
 switch -- $subcommand {
 browser -
 blame {
 switch -- $subcommand {
 browser -
 blame {

-       set subcommand_args {rev? path}
+       if {$subcommand eq "blame"} {
+               set subcommand_args {[--line=<num>] rev? path}
+       } else {
+               set subcommand_args {rev? path}
+       }

        if {$argv eq {}} usage
        set head {}
        set path {}
        if {$argv eq {}} usage
        set head {}
        set path {}

+       set jump_spec {}

        set is_path 0
        foreach a $argv {
                if {$is_path || [file exists $_prefix$a]} {
        set is_path 0
        foreach a $argv {
                if {$is_path || [file exists $_prefix$a]} {


@@ -2313,6 +2318,9 @@ blame {
                                set path {}
                        }
                        set is_path 1
                                set path {}
                        }
                        set is_path 1

+               } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
+                       if {$jump_spec ne {} || $head ne {}} usage
+                       set jump_spec [list $lnum]

                } elseif {$head eq {}} {
                        if {$head ne {}} usage
                        set head $a
                } elseif {$head eq {}} {
                        if {$head ne {}} usage
                        set head $a


@@ -2344,6 +2352,7 @@ blame {
 
        switch -- $subcommand {
        browser {
 
        switch -- $subcommand {
        browser {

+               if {$jump_spec ne {}} usage

                if {$head eq {}} {
                        if {$path ne {} && [file isdirectory $path]} {
                                set head $current_branch
                if {$head eq {}} {
                        if {$path ne {} && [file isdirectory $path]} {
                                set head $current_branch


@@ -2359,7 +2368,7 @@ blame {
                        puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
                        exit 1
                }
                        puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
                        exit 1
                }

-               blame::new $head $path
+               blame::new $head $path $jump_spec

        }
        }
        return
        }
        }
        return

diff --git a/lib/blame.tcl b/lib/blame.tcl
index 1106975775e86cea028b42977521ea255d698468..827c85d67f0b0f18d22b1399624e6819cf93f23f 100644 (file)
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -58,7 +58,7 @@ field tooltip_t         {} ; # Text widget in $tooltip_wm
 field tooltip_timer     {} ; # Current timer event for our tooltip
 field tooltip_commit    {} ; # Commit(s) in tooltip
 
 field tooltip_timer     {} ; # Current timer event for our tooltip
 field tooltip_commit    {} ; # Commit(s) in tooltip
 

-constructor new {i_commit i_path} {
+constructor new {i_commit i_path i_jump} {

        global cursor_ptr
        variable active_color
        variable group_colors
        global cursor_ptr
        variable active_color
        variable group_colors


@@ -338,7 +338,7 @@ constructor new {i_commit i_path} {
        wm protocol $top WM_DELETE_WINDOW "destroy $top"
        bind $top <Destroy> [cb _kill]
 
        wm protocol $top WM_DELETE_WINDOW "destroy $top"
        bind $top <Destroy> [cb _kill]
 

-       _load $this {}
+       _load $this $i_jump

 }
 
 method _kill {} {
 }
 
 method _kill {} {

diff --git a/lib/browser.tcl b/lib/browser.tcl
index ab470d12648c1dd3560b411e70ea210cc4381e3e..0410cc68df186d6e8e0080058be94126243fd4d3 100644 (file)
--- a/lib/browser.tcl
+++ b/lib/browser.tcl
@@ -151,7 +151,7 @@ method _enter {} {
                                append p [lindex $n 1]
                        }
                        append p $name
                                append p [lindex $n 1]
                        }
                        append p $name

-                       blame::new $browser_commit $p
+                       blame::new $browser_commit $p {}

                }
                }
        }
                }
                }
        }