revert: allow cherry-picking more than one commit

diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl
index 765d08c004b68254713e2524b53d6df0bdc0c007..786b50b8c2b6f877d1d1a3a86d27368281ec2ae8 100644 (file)
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
@@ -61,7 +61,7 @@ field tooltip_timer     {} ; # Current timer event for our tooltip
 field tooltip_commit    {} ; # Commit(s) in tooltip
 
 constructor new {i_commit i_path i_jump} {
-       global cursor_ptr M1B M1T have_tk85
+       global cursor_ptr M1B M1T have_tk85 use_ttk NS
        variable active_color
        variable group_colors
 
@@ -73,15 +73,15 @@ constructor new {i_commit i_path i_jump} {
 
        set font_w [font measure font_diff "0"]
 
-       frame $w.header -background gold
-       label $w.header.commit_l \
+       gold_frame $w.header
+       tlabel $w.header.commit_l \
                -text [mc "Commit:"] \
                -background gold \
                -foreground black \
                -anchor w \
                -justify left
        set w_back $w.header.commit_b
-       label $w_back \
+       tlabel $w_back \
                -image ::blame::img_back_arrow \
                -borderwidth 0 \
                -relief flat \
@@ -94,20 +94,20 @@ constructor new {i_commit i_path i_jump} {
                        [cb _history_menu]
                }
                "
-       label $w.header.commit \
+       tlabel $w.header.commit \
                -textvariable @commit \
                -background gold \
                -foreground black \
                -anchor w \
                -justify left
-       label $w.header.path_l \
+       tlabel $w.header.path_l \
                -text [mc "File:"] \
                -background gold \
                -foreground black \
                -anchor w \
                -justify left
        set w_path $w.header.path
-       label $w_path \
+       tlabel $w_path \
                -background gold \
                -foreground black \
                -anchor w \
@@ -209,10 +209,10 @@ constructor new {i_commit i_path i_jump} {
 
        set w_columns [list $w_amov $w_asim $w_line $w_file]
 
-       scrollbar $w.file_pane.out.sbx \
+       ${NS}::scrollbar $w.file_pane.out.sbx \
                -orient h \
                -command [list $w_file xview]
-       scrollbar $w.file_pane.out.sby \
+       ${NS}::scrollbar $w.file_pane.out.sby \
                -orient v \
                -command [list scrollbar2many $w_columns yview]
        eval grid $w_columns $w.file_pane.out.sby -sticky nsew
@@ -254,10 +254,10 @@ constructor new {i_commit i_path i_jump} {
                -background $active_color \
                -font font_ui
        $w_cviewer tag raise sel
-       scrollbar $w.file_pane.cm.sbx \
+       ${NS}::scrollbar $w.file_pane.cm.sbx \
                -orient h \
                -command [list $w_cviewer xview]
-       scrollbar $w.file_pane.cm.sby \
+       ${NS}::scrollbar $w.file_pane.cm.sby \
                -orient v \
                -command [list $w_cviewer yview]
        pack $w.file_pane.cm.sby -side right -fill y
@@ -321,7 +321,7 @@ constructor new {i_commit i_path i_jump} {
                        tk_popup $w.ctxm %X %Y
                "
                bind $i <Shift-Tab> "[list focus $w_cviewer];break"
-               bind $i <Tab>       "[list focus $w_cviewer];break"
+               bind $i <Tab>       "[cb _focus_search $w_cviewer];break"
        }
 
        foreach i [concat $w_columns $w_cviewer] {
@@ -337,10 +337,10 @@ constructor new {i_commit i_path i_jump} {
                bind $i <Control-Key-f> {catch {%W yview scroll  1 pages};break}
        }
 
-       bind $w_cviewer <Shift-Tab> "[list focus $w_file];break"
+       bind $w_cviewer <Shift-Tab> "[cb _focus_search $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]
+       bind $w_cviewer <Button-1>   [list focus $w_cviewer]
+       bind $w_file    <Visibility> [cb _focus_search $w_file]
        bind $top       <F7>         [list searchbar::show $finder]
        bind $top       <Escape>     [list searchbar::hide $finder]
        bind $top       <F3>         [list searchbar::find_next $finder]
@@ -382,6 +382,14 @@ constructor new {i_commit i_path i_jump} {
        _load $this $i_jump
 }
 
+method _focus_search {win} {
+       if {[searchbar::visible $finder]} {
+               focus [searchbar::editor $finder]
+       } else {
+               focus $win
+       }
+}
+
 method _handle_destroy {win} {
        if {$win eq $w} {
                _kill $this
@@ -551,7 +559,7 @@ method _read_file {fd jump} {
 } ifdeleted { catch {close $fd} }
 
 method _exec_blame {cur_w cur_d options cur_s} {
-       lappend options --incremental
+       lappend options --incremental --encoding=utf-8
        if {$commit eq {}} {
                lappend options --contents $path
        } else {
@@ -932,9 +940,8 @@ method _showcommit {cur_w lno} {
                        catch {
                                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
-                               }
+                               # By default commits are assumed to be in utf-8
+                               set enc utf-8
                                while {[gets $fd line] > 0} {
                                        if {[string match {encoding *} $line]} {
                                                set enc [string tolower [string range $line 9 end]]
@@ -1238,6 +1245,18 @@ method _open_tooltip {cur_w} {
 
        $tooltip_t conf -state disabled
        _position_tooltip $this
+
+       # On MacOS raising a window causes it to acquire focus.
+       # Tk 8.5 on MacOS seems to properly support wm transient,
+       # so we can safely counter the effect there.
+       if {$::have_tk85 && [is_MacOSX]} {
+               update
+               if {$w eq {}} {
+                       raise .
+               } else {
+                       raise $w
+               }
+       }
 }
 
 method _position_tooltip {} {
@@ -1261,7 +1280,9 @@ method _position_tooltip {} {
        append g $pos_y
 
        wm geometry $tooltip_wm $g
-       raise $tooltip_wm
+       if {![is_MacOSX]} {
+               raise $tooltip_wm
+       }
 }
 
 method _hide_tooltip {} {