[PATCH] gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields

Frédéric Brière· Mar 14, 2010, 22:59 UTC · lore

This prevents searches on "All Fields" from matching against the author/commit timestamps. Not only are these timestamps not searchable by themselves, but the displayed format will not match the query string anyway.

Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
---
 gitk-git/gitk |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Show changes to gitk-git/gitk +4 −2

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 1f36a3e..d7e3c45 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -4591,8 +4591,9 @@ proc askfindhighlight {row id} {
     }
     set info $commitinfo($id)
     set isbold 0
-    set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
+    set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]]
     foreach f $info ty $fldtypes {
+	if {$ty eq ""} continue
 	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
 	    [doesmatch $f]} {
 	    if {$ty eq [mc "Author"]} {
@@ -6438,7 +6439,7 @@ proc findmore {} {
     if {![info exists find_dirn]} {
 	return 0
     }
-    set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
+    set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]]
     set l $findcurline
     set moretodo 0
     if {$find_dirn > 0} {
@@ -6499,6 +6500,7 @@ proc findmore {} {
 	    }
 	    set info $commitinfo($id)
 	    foreach f $info ty $fldtypes {
+		if {$ty eq ""} continue
 		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
 		    [doesmatch $f]} {
 		    set found 1

-- 
1.7.0

Jonathan Nieder· Mar 20, 2010, 06:42 UTC · re: Frédéric Brière · lore

Re: [PATCH] gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields

Frédéric Brière wrote:

Show 6 quoted lines

> This prevents searches on "All Fields" from matching against the
> author/commit timestamps.  Not only are these timestamps not searchable
> by themselves, but the displayed format will not match the query string
> anyway.
> 
> Signed-off-by: Frédéric Brière <fbriere@fbriere.net>

Reviewed-and-tested-by: Jonathan Nieder <jrnieder@gmail.com>

There’s a follow-up patch to remove the duplicated code this touches (no functional changes) at <http://bugs.debian.org/465776>.

Thanks again. Jonathan

patchgitk: Skip over AUTHOR/COMMIT_DATE when searching all fields