diff options
| -rw-r--r-- | diffcore-pickaxe.c | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index c367d8d17a..4347ec1084 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -190,13 +190,31 @@ static unsigned int contains(struct diff_filespec *one, return cnt; } +static int has_changes(struct diff_filepair *p, const char *needle, + unsigned long len, regex_t *regexp, kwset_t kws) +{ + if (!DIFF_FILE_VALID(p->one)) { + if (!DIFF_FILE_VALID(p->two)) + return 0; /* ignore unmerged */ + /* created */ + return contains(p->two, needle, len, regexp, kws) != 0; + } + if (!DIFF_FILE_VALID(p->two)) + return contains(p->one, needle, len, regexp, kws) != 0; + if (!diff_unmodified_pair(p)) { + return contains(p->one, needle, len, regexp, kws) != + contains(p->two, needle, len, regexp, kws); + } + return 0; +} + static void diffcore_pickaxe_count(struct diff_options *o) { const char *needle = o->pickaxe; int opts = o->pickaxe_opts; struct diff_queue_struct *q = &diff_queued_diff; unsigned long len = strlen(needle); - int i, has_changes; + int i; regex_t regex, *regexp = NULL; kwset_t kws = NULL; struct diff_queue_struct outq; @@ -223,22 +241,7 @@ static void diffcore_pickaxe_count(struct diff_options *o) /* Showing the whole changeset if needle exists */ for (i = 0; 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, kws)) - has_changes++; - } - else if (!DIFF_FILE_VALID(p->two)) { - if (contains(p->one, needle, len, regexp, kws)) - has_changes++; - } - else if (!diff_unmodified_pair(p) && - contains(p->one, needle, len, regexp, kws) != - contains(p->two, needle, len, regexp, kws)) - has_changes++; - if (has_changes) + if (has_changes(p, needle, len, regexp, kws)) goto out; /* do not munge the queue */ } @@ -254,25 +257,7 @@ static void diffcore_pickaxe_count(struct diff_options *o) /* 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, - kws)) - has_changes = 1; - } - else if (!DIFF_FILE_VALID(p->two)) { - if (contains(p->one, needle, len, regexp, kws)) - has_changes = 1; - } - else if (!diff_unmodified_pair(p) && - contains(p->one, needle, len, regexp, kws) != - contains(p->two, needle, len, regexp, kws)) - has_changes = 1; - - if (has_changes) + if (has_changes(p, needle, len, regexp, kws)) diff_q(&outq, p); else diff_free_filepair(p); |