2 * Copyright (C) 2005 Junio C Hamano
3 * Copyright (C) 2010 Google Inc.
8 #include "xdiff-interface.h"
16 static void diffgrep_consume(void *priv, char *line, unsigned long len)
18 struct diffgrep_cb *data = priv;
22 if (line[0] != '+' && line[0] != '-')
26 * NEEDSWORK: we should have a way to terminate the
30 /* Yuck -- line ought to be "const char *"! */
33 data->hit = !regexec(data->regexp, line + 1, 1, ®match, 0);
37 static void fill_one(struct diff_filespec *one,
38 mmfile_t *mf, struct userdiff_driver **textconv)
40 if (DIFF_FILE_VALID(one)) {
41 *textconv = get_textconv(one);
42 mf->size = fill_textconv(*textconv, one, &mf->ptr);
44 memset(mf, 0, sizeof(*mf));
48 static int diff_grep(struct diff_filepair *p, regex_t *regexp, struct diff_options *o)
51 struct userdiff_driver *textconv_one = NULL;
52 struct userdiff_driver *textconv_two = NULL;
56 if (diff_unmodified_pair(p))
59 fill_one(p->one, &mf1, &textconv_one);
60 fill_one(p->two, &mf2, &textconv_two);
64 return 0; /* ignore unmerged */
65 /* created "two" -- does it have what we are looking for? */
66 hit = !regexec(regexp, p->two->data, 1, ®match, 0);
67 } else if (!mf2.ptr) {
68 /* removed "one" -- did it have what we are looking for? */
69 hit = !regexec(regexp, p->one->data, 1, ®match, 0);
72 * We have both sides; need to run textual diff and see if
73 * the pattern appears on added/deleted lines.
75 struct diffgrep_cb ecbdata;
79 memset(&xpp, 0, sizeof(xpp));
80 memset(&xecfg, 0, sizeof(xecfg));
81 ecbdata.regexp = regexp;
83 xecfg.ctxlen = o->context;
84 xecfg.interhunkctxlen = o->interhunkcontext;
85 xdi_diff_outf(&mf1, &mf2, diffgrep_consume, &ecbdata,
96 static void diffcore_pickaxe_grep(struct diff_options *o)
98 struct diff_queue_struct *q = &diff_queued_diff;
99 int i, has_changes, err;
101 struct diff_queue_struct outq;
103 outq.nr = outq.alloc = 0;
105 err = regcomp(®ex, o->pickaxe, REG_EXTENDED | REG_NEWLINE);
108 regerror(err, ®ex, errbuf, 1024);
110 die("invalid log-grep regex: %s", errbuf);
113 if (o->pickaxe_opts & DIFF_PICKAXE_ALL) {
114 /* Showing the whole changeset if needle exists */
115 for (i = has_changes = 0; !has_changes && i < q->nr; i++) {
116 struct diff_filepair *p = q->queue[i];
117 if (diff_grep(p, ®ex, o))
121 return; /* do not munge the queue */
124 * Otherwise we will clear the whole queue by copying
125 * the empty outq at the end of this function, but
126 * first clear the current entries in the queue.
128 for (i = 0; i < q->nr; i++)
129 diff_free_filepair(q->queue[i]);
131 /* Showing only the filepairs that has the needle */
132 for (i = 0; i < q->nr; i++) {
133 struct diff_filepair *p = q->queue[i];
134 if (diff_grep(p, ®ex, o))
137 diff_free_filepair(p);
148 static unsigned int contains(struct diff_filespec *one,
149 const char *needle, unsigned long len,
150 regex_t *regexp, kwset_t kws)
155 if (diff_populate_filespec(one, 0))
168 assert(data[sz] == '\0');
169 while (*data && !regexec(regexp, data, 1, ®match, flags)) {
171 data += regmatch.rm_eo;
172 if (*data && regmatch.rm_so == regmatch.rm_eo)
177 } else { /* Classic exact string match */
179 size_t offset = kwsexec(kws, data, sz, NULL);
184 found = data + offset;
185 sz -= found - data + len;
190 diff_free_filespec_data(one);
194 static void diffcore_pickaxe_count(struct diff_options *o)
196 const char *needle = o->pickaxe;
197 int opts = o->pickaxe_opts;
198 struct diff_queue_struct *q = &diff_queued_diff;
199 unsigned long len = strlen(needle);
201 regex_t regex, *regexp = NULL;
203 struct diff_queue_struct outq;
204 DIFF_QUEUE_CLEAR(&outq);
206 if (opts & DIFF_PICKAXE_REGEX) {
208 err = regcomp(®ex, needle, REG_EXTENDED | REG_NEWLINE);
210 /* The POSIX.2 people are surely sick */
212 regerror(err, ®ex, errbuf, 1024);
214 die("invalid pickaxe regex: %s", errbuf);
218 kws = kwsalloc(NULL);
219 kwsincr(kws, needle, len);
223 if (opts & DIFF_PICKAXE_ALL) {
224 /* Showing the whole changeset if needle exists */
225 for (i = has_changes = 0; !has_changes && i < q->nr; i++) {
226 struct diff_filepair *p = q->queue[i];
227 if (!DIFF_FILE_VALID(p->one)) {
228 if (!DIFF_FILE_VALID(p->two))
229 continue; /* ignore unmerged */
231 if (contains(p->two, needle, len, regexp, kws))
234 else if (!DIFF_FILE_VALID(p->two)) {
235 if (contains(p->one, needle, len, regexp, kws))
238 else if (!diff_unmodified_pair(p) &&
239 contains(p->one, needle, len, regexp, kws) !=
240 contains(p->two, needle, len, regexp, kws))
244 return; /* not munge the queue */
246 /* otherwise we will clear the whole queue
247 * by copying the empty outq at the end of this
248 * function, but first clear the current entries
251 for (i = 0; i < q->nr; i++)
252 diff_free_filepair(q->queue[i]);
255 /* Showing only the filepairs that has the needle */
256 for (i = 0; i < q->nr; i++) {
257 struct diff_filepair *p = q->queue[i];
259 if (!DIFF_FILE_VALID(p->one)) {
260 if (!DIFF_FILE_VALID(p->two))
261 ; /* ignore unmerged */
263 else if (contains(p->two, needle, len, regexp,
267 else if (!DIFF_FILE_VALID(p->two)) {
268 if (contains(p->one, needle, len, regexp, kws))
271 else if (!diff_unmodified_pair(p) &&
272 contains(p->one, needle, len, regexp, kws) !=
273 contains(p->two, needle, len, regexp, kws))
279 diff_free_filepair(p);
282 if (opts & DIFF_PICKAXE_REGEX)
292 void diffcore_pickaxe(struct diff_options *o)
294 /* Might want to warn when both S and G are on; I don't care... */
295 if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)
296 diffcore_pickaxe_grep(o);
298 diffcore_pickaxe_count(o);