grep: refactor next_match() and match_one_pattern() for external use
These changes are made in preparation of, the colorization support for the "git log" subcommands that, rely on regex functionality (i.e. "--author", "--committer" and "--grep"). These changes are necessary primarily because match_one_pattern() expects header lines to be prefixed, however, in pretty, the prefixes are stripped from the lines because the name-email pairs need to go through additional parsing, before they can be printed and because next_match() doesn't handle the case of "ctx == GREP_CONTEXT_HEAD" at all. So, teach next_match() how to handle the new case and move match_one_pattern()'s core logic to headerless_match_one_pattern() while preserving match_one_pattern()'s uses that depend on the additional processing. Signed-off-by: Hamza Mahfooz <someguy@effective-light.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
28ecef4c84
commit
3f566c4e69
9
grep.h
9
grep.h
@ -191,6 +191,15 @@ void compile_grep_patterns(struct grep_opt *opt);
|
||||
void free_grep_patterns(struct grep_opt *opt);
|
||||
int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size);
|
||||
|
||||
/* The field parameter is only used to filter header patterns
|
||||
* (where appropriate). If filtering isn't desirable
|
||||
* GREP_HEADER_FIELD_MAX should be supplied.
|
||||
*/
|
||||
int grep_next_match(struct grep_opt *opt,
|
||||
const char *bol, const char *eol,
|
||||
enum grep_context ctx, regmatch_t *pmatch,
|
||||
enum grep_header_field field, int eflags);
|
||||
|
||||
struct grep_source {
|
||||
char *name;
|
||||
|
||||
|
Reference in New Issue
Block a user