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

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

[Jonathan Nieder]

From: Frédéric Brière <fbriere@fbriere.net>
Date: Sun, 14 Mar 2010 18:59:09 -0400

This prevents a search for a number like "105" on "All Fields" from
matching against the raw author and commit timestamps.  These
timestamps were already not searchable by themselves, and the
displayed format does not match the query string anyway.

Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Last seen at [1].  Since then, the commit message was tweaked for
clarity but not other changes.

[1] http://thread.gmane.org/gmane.comp.version-control.git/142160

 gitk-git/gitk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 6981cb20..17ba10a8 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -4630,8 +4630,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"]} {
@@ -6492,7 +6493,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} {
@@ -6553,6 +6554,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.9.2

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

[Paul Mackerras]

On Thu, Mar 08, 2012 at 06:35:50AM -0600, Jonathan Nieder wrote:
> From: Frédéric Brière <fbriere@fbriere.net>
> Date: Sun, 14 Mar 2010 18:59:09 -0400
> 
> This prevents a search for a number like "105" on "All Fields" from
> matching against the raw author and commit timestamps.  These
> timestamps were already not searchable by themselves, and the
> displayed format does not match the query string anyway.
> 
> Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Thanks, applied.

Paul.