gitk: Add support for -G'regex' pickaxe variant

git log -G'regex' is a very useful alternative to the classic
pickaxe.  Minimal patch to make it usable from gitk.

[zj: reword message]
[paulus@samba.org: reword droplist item]
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/gitk b/gitk
index 9284c193c7f25191a799351df513198a1d81b938..22a05b0373c027a3ea10fd2d5093e1057464b37b 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -2253,7 +2253,8 @@ proc makewindow {} {
     set gm [makedroplist .tf.lbar.gdttype gdttype \
                [mc "containing:"] \
                [mc "touching paths:"] \
     set gm [makedroplist .tf.lbar.gdttype gdttype \
                [mc "containing:"] \
                [mc "touching paths:"] \

-               [mc "adding/removing string:"]]
+               [mc "adding/removing string:"] \
+               [mc "changing lines matching:"]]

     trace add variable gdttype write gdttype_change
     pack .tf.lbar.gdttype -side left -fill y
 
     trace add variable gdttype write gdttype_change
     pack .tf.lbar.gdttype -side left -fill y
 


@@ -4658,6 +4659,8 @@ proc do_file_hl {serial} {
        set gdtargs [concat -- $relative_paths]
     } elseif {$gdttype eq [mc "adding/removing string:"]} {
        set gdtargs [list "-S$highlight_files"]
        set gdtargs [concat -- $relative_paths]
     } elseif {$gdttype eq [mc "adding/removing string:"]} {
        set gdtargs [list "-S$highlight_files"]

+    } elseif {$gdttype eq [mc "changing lines matching:"]} {
+       set gdtargs [list "-G$highlight_files"]

     } else {
        # must be "containing:", i.e. we're searching commit info
        return
     } else {
        # must be "containing:", i.e. we're searching commit info
        return