gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields

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>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Frédéric Brière
2010-03-14 18:59:09 -04:00
committed by Paul Mackerras
parent 6c9e2d1842
commit 585c27cb22

6
gitk
View File

@ -4659,8 +4659,9 @@ proc askfindhighlight {row id} {
} }
set info $commitinfo($id) set info $commitinfo($id)
set isbold 0 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 { foreach f $info ty $fldtypes {
if {$ty eq ""} continue
if {($findloc eq [mc "All fields"] || $findloc eq $ty) && if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
[doesmatch $f]} { [doesmatch $f]} {
if {$ty eq [mc "Author"]} { if {$ty eq [mc "Author"]} {
@ -6521,7 +6522,7 @@ proc findmore {} {
if {![info exists find_dirn]} { if {![info exists find_dirn]} {
return 0 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 l $findcurline
set moretodo 0 set moretodo 0
if {$find_dirn > 0} { if {$find_dirn > 0} {
@ -6582,6 +6583,7 @@ proc findmore {} {
} }
set info $commitinfo($id) set info $commitinfo($id)
foreach f $info ty $fldtypes { foreach f $info ty $fldtypes {
if {$ty eq ""} continue
if {($findloc eq [mc "All fields"] || $findloc eq $ty) && if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
[doesmatch $f]} { [doesmatch $f]} {
set found 1 set found 1