git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
To: Paul Mackerras <paulus@samba.org>
Cc: "Martin Langhoff" <martin@laptop.org>,
	git@vger.kernel.org, gitster@pobox.com,
	"Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
Subject: [PATCH] gitk: add support for -G'regex' pickaxe variant
Date: Thu, 14 Jun 2012 20:34:11 +0200	[thread overview]
Message-ID: <1339698851-15428-1-git-send-email-zbyszek@in.waw.pl> (raw)
In-Reply-To: <7vipezaaig.fsf@alter.siamese.dyndns.org>

From: Martin Langhoff <martin@laptop.org>

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

[zj: reword message]
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
---
Martin's off on holidays, so I'm sending v2 after rewording.

 gitk-git/gitk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 22270ce..24eaead 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2232,7 +2232,8 @@ proc makewindow {} {
     set gm [makedroplist .tf.lbar.gdttype gdttype \
 		[mc "containing:"] \
 		[mc "touching paths:"] \
-		[mc "adding/removing string:"]]
+		[mc "adding/removing string:"] \
+		[mc "with changes matching regex:"]]
     trace add variable gdttype write gdttype_change
     pack .tf.lbar.gdttype -side left -fill y
 
@@ -4595,6 +4596,8 @@ proc do_file_hl {serial} {
 	set gdtargs [concat -- $relative_paths]
     } elseif {$gdttype eq [mc "adding/removing string:"]} {
 	set gdtargs [list "-S$highlight_files"]
+    } elseif {$gdttype eq [mc "with changes matching regex:"]} {
+	set gdtargs [list "-G$highlight_files"]
     } else {
 	# must be "containing:", i.e. we're searching commit info
 	return
-- 
1.7.11.rc3.129.ga90bc7a.dirty

  reply	other threads:[~2012-06-14 18:34 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-08  2:32 [PATCH] gitk: add support for -G'regex' pickaxe variant Martin Langhoff
2012-06-09  9:16 ` Zbigniew Jędrzejewski-Szmek
2012-06-10  6:37   ` Junio C Hamano
2012-06-10  7:24     ` Paul Mackerras
2012-06-10  7:31       ` Junio C Hamano
2012-06-14 18:34         ` Zbigniew Jędrzejewski-Szmek [this message]
2013-05-07 17:17           ` Martin Langhoff
2013-05-07 20:30             ` Felipe Contreras
2013-05-11  5:56             ` Paul Mackerras
2013-05-11  6:13               ` Jonathan Nieder
2013-05-11  9:41                 ` Paul Mackerras
2013-05-13 16:22                   ` Martin Langhoff
2013-05-13 18:55                     ` Jonathan Nieder
2013-05-13 19:19                       ` Martin Langhoff
2013-05-13 19:33                         ` Jonathan Nieder
2013-05-13 20:54                           ` Martin Langhoff
2013-05-13 21:52                             ` Junio C Hamano
2013-05-13 21:04                           ` Ramkumar Ramachandra
2013-05-13 21:38                             ` Jonathan Nieder
2013-05-13 18:52                   ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1339698851-15428-1-git-send-email-zbyszek@in.waw.pl \
    --to=zbyszek@in.waw.pl \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin@laptop.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).