Introduce pickaxe_match_one() to remove duplicated code that decides if a
filepair is "interesting enough" for the purpose of pickaxe from the main
loop of the function.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
diffcore-pickaxe.c | 83 ++++++++++++++++++++++++++-------------------------
1 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index af9fffe..d27e725 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -5,9 +5,9 @@
#include "diff.h"
#include "diffcore.h"
-static unsigned int contains(struct diff_filespec *one,
- const char *needle, unsigned long len,
- regex_t *regexp)
+static unsigned int count_match(struct diff_filespec *one,
+ const char *needle, unsigned long len,
+ regex_t *regexp)
{
unsigned int cnt;
unsigned long offset, sz;
@@ -48,6 +48,38 @@ static unsigned int contains(struct diff_filespec *one,
return cnt;
}
+static int has_match(struct diff_filespec *one,
+ const char *needle, unsigned long len,
+ regex_t *regexp)
+{
+ return !!count_match(one, needle, len, regexp);
+}
+
+static int has_different_matches(struct diff_filepair *p,
+ const char *needle, unsigned long len,
+ regex_t *regexp)
+{
+ return (count_match(p->one, needle, len, regexp)
+ != count_match(p->two, needle, len, regexp));
+
+}
+
+static int pickaxe_match_one(struct diff_filepair *p,
+ const char *needle, unsigned long len,
+ regex_t *regexp)
+{
+ if (!DIFF_FILE_VALID(p->one)) {
+ if (!DIFF_FILE_VALID(p->two))
+ return 0;
+ return has_match(p->two, needle, len, regexp);
+ } else if (!DIFF_FILE_VALID(p->two))
+ return has_match(p->one, needle, len, regexp);
+ else if (diff_unmodified_pair(p))
+ return 0;
+ else
+ return has_different_matches(p, needle, len, regexp);
+}
+
void diffcore_pickaxe(const char *needle, int opts)
{
struct diff_queue_struct *q = &diff_queued_diff;
@@ -75,29 +107,14 @@ void diffcore_pickaxe(const char *needle, int opts)
/* Showing the whole changeset if needle exists */
for (i = has_changes = 0; !has_changes && i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
- if (!DIFF_FILE_VALID(p->one)) {
- if (!DIFF_FILE_VALID(p->two))
- continue; /* ignore unmerged */
- /* created */
- if (contains(p->two, needle, len, regexp))
- has_changes++;
- }
- else if (!DIFF_FILE_VALID(p->two)) {
- if (contains(p->one, needle, len, regexp))
- has_changes++;
- }
- else if (!diff_unmodified_pair(p) &&
- contains(p->one, needle, len, regexp) !=
- contains(p->two, needle, len, regexp))
- has_changes++;
+ if (pickaxe_match_one(p, needle, len, regexp))
+ return; /* not munge the queue */
}
- if (has_changes)
- return; /* not munge the queue */
- /* otherwise we will clear the whole queue
- * by copying the empty outq at the end of this
- * function, but first clear the current entries
- * in the queue.
+ /*
+ * otherwise we will clear the whole queue by copying
+ * the empty outq at the end of this function, but
+ * first clear the current entries in the queue.
*/
for (i = 0; i < q->nr; i++)
diff_free_filepair(q->queue[i]);
@@ -106,24 +123,8 @@ void diffcore_pickaxe(const char *needle, int opts)
/* Showing only the filepairs that has the needle */
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
- has_changes = 0;
- if (!DIFF_FILE_VALID(p->one)) {
- if (!DIFF_FILE_VALID(p->two))
- ; /* ignore unmerged */
- /* created */
- else if (contains(p->two, needle, len, regexp))
- has_changes = 1;
- }
- else if (!DIFF_FILE_VALID(p->two)) {
- if (contains(p->one, needle, len, regexp))
- has_changes = 1;
- }
- else if (!diff_unmodified_pair(p) &&
- contains(p->one, needle, len, regexp) !=
- contains(p->two, needle, len, regexp))
- has_changes = 1;
- if (has_changes)
+ if (pickaxe_match_one(p, needle, len, regexp))
diff_q(&outq, p);
else
diff_free_filepair(p);
--
1.6.2.rc2.91.gf9a36
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
