From: Junio C Hamano <junkio@cox.net>
Date: Sun, 17 Sep 2006 22:43:40 +0000 (-0700)
Subject: revision traversal: prepare for commit log match.
X-Git-Tag: v1.4.3-rc1~43^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ecae9b032cd0427079d557a3bb6c39116420d4b;p=git.git

revision traversal: prepare for commit log match.

This is from a suggestion by Linus, just to mark the locations where we
need to modify to actually implement the filtering.

We do not have any actual filtering code yet.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/revision.c b/revision.c
index 6a2539b62..a14457a12 100644
--- a/revision.c
+++ b/revision.c
@@ -6,6 +6,8 @@
 #include "diff.h"
 #include "refs.h"
 #include "revision.h"
+#include <regex.h>
+#include "grep.h"
 
 static char *path_name(struct name_path *path, const char *name)
 {
@@ -1045,6 +1047,15 @@ static void mark_boundary_to_show(struct commit *commit)
 	}
 }
 
+static int commit_match(struct commit *commit, struct rev_info *opt)
+{
+	if (!opt->header_filter && !opt->message_filter)
+		return 1;
+
+	/* match it here */
+	return 1;
+}
+
 struct commit *get_revision(struct rev_info *revs)
 {
 	struct commit_list *list = revs->commits;
@@ -1105,6 +1116,8 @@ struct commit *get_revision(struct rev_info *revs)
 		if (revs->no_merges &&
 		    commit->parents && commit->parents->next)
 			continue;
+		if (!commit_match(commit, revs))
+			continue;
 		if (revs->prune_fn && revs->dense) {
 			/* Commit without changes? */
 			if (!(commit->object.flags & TREECHANGE)) {
diff --git a/revision.h b/revision.h
index a5c35d05c..60030e53f 100644
--- a/revision.h
+++ b/revision.h
@@ -71,6 +71,10 @@ struct rev_info {
 	const char	*add_signoff;
 	const char	*extra_headers;
 
+	/* Filter by commit log message */
+	struct grep_opt	*header_filter;
+	struct grep_opt	*message_filter;
+
 	/* special limits */
 	int max_count;
 	unsigned long max_age;