2 * Copyright (C) 2005 Junio C Hamano
3 * Copyright (C) 2010 Google Inc.
8 #include "xdiff-interface.h"
11 typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two,
12 struct diff_options *o,
13 regex_t *regexp, kwset_t kws);
20 static void diffgrep_consume(void *priv, char *line, unsigned long len)
22 struct diffgrep_cb *data = priv;
25 if (line[0] != '+' && line[0] != '-')
29 * NEEDSWORK: we should have a way to terminate the
33 data->hit = !regexec_buf(data->regexp, line + 1, len - 1, 1,
37 static int diff_grep(mmfile_t *one, mmfile_t *two,
38 struct diff_options *o,
39 regex_t *regexp, kwset_t kws)
42 struct diffgrep_cb ecbdata;
47 return !regexec_buf(regexp, two->ptr, two->size,
50 return !regexec_buf(regexp, one->ptr, one->size,
54 * We have both sides; need to run textual diff and see if
55 * the pattern appears on added/deleted lines.
57 memset(&xpp, 0, sizeof(xpp));
58 memset(&xecfg, 0, sizeof(xecfg));
59 ecbdata.regexp = regexp;
61 xecfg.ctxlen = o->context;
62 xecfg.interhunkctxlen = o->interhunkcontext;
63 if (xdi_diff_outf(one, two, diffgrep_consume, &ecbdata, &xpp, &xecfg))
68 static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
83 !regexec_buf(regexp, data, sz, 1, ®match, flags)) {
85 data += regmatch.rm_eo;
87 if (sz && *data && regmatch.rm_so == regmatch.rm_eo) {
94 } else { /* Classic exact string match */
97 size_t offset = kwsexec(kws, data, sz, &kwsm);
100 sz -= offset + kwsm.size[0];
101 data += offset + kwsm.size[0];
108 static int has_changes(mmfile_t *one, mmfile_t *two,
109 struct diff_options *o,
110 regex_t *regexp, kwset_t kws)
112 unsigned int one_contains = one ? contains(one, regexp, kws) : 0;
113 unsigned int two_contains = two ? contains(two, regexp, kws) : 0;
114 return one_contains != two_contains;
117 static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
118 regex_t *regexp, kwset_t kws, pickaxe_fn fn)
120 struct userdiff_driver *textconv_one = NULL;
121 struct userdiff_driver *textconv_two = NULL;
128 /* ignore unmerged */
129 if (!DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two))
132 if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
133 textconv_one = get_textconv(p->one);
134 textconv_two = get_textconv(p->two);
138 * If we have an unmodified pair, we know that the count will be the
139 * same and don't even have to load the blobs. Unless textconv is in
140 * play, _and_ we are using two different textconv filters (e.g.,
141 * because a pair is an exact rename with different textconv attributes
142 * for each side, which might generate different content).
144 if (textconv_one == textconv_two && diff_unmodified_pair(p))
147 mf1.size = fill_textconv(textconv_one, p->one, &mf1.ptr);
148 mf2.size = fill_textconv(textconv_two, p->two, &mf2.ptr);
150 ret = fn(DIFF_FILE_VALID(p->one) ? &mf1 : NULL,
151 DIFF_FILE_VALID(p->two) ? &mf2 : NULL,
158 diff_free_filespec_data(p->one);
159 diff_free_filespec_data(p->two);
164 static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,
165 regex_t *regexp, kwset_t kws, pickaxe_fn fn)
168 struct diff_queue_struct outq;
170 DIFF_QUEUE_CLEAR(&outq);
172 if (o->pickaxe_opts & DIFF_PICKAXE_ALL) {
173 /* Showing the whole changeset if needle exists */
174 for (i = 0; i < q->nr; i++) {
175 struct diff_filepair *p = q->queue[i];
176 if (pickaxe_match(p, o, regexp, kws, fn))
177 return; /* do not munge the queue */
181 * Otherwise we will clear the whole queue by copying
182 * the empty outq at the end of this function, but
183 * first clear the current entries in the queue.
185 for (i = 0; i < q->nr; i++)
186 diff_free_filepair(q->queue[i]);
188 /* Showing only the filepairs that has the needle */
189 for (i = 0; i < q->nr; i++) {
190 struct diff_filepair *p = q->queue[i];
191 if (pickaxe_match(p, o, regexp, kws, fn))
194 diff_free_filepair(p);
202 void diffcore_pickaxe(struct diff_options *o)
204 const char *needle = o->pickaxe;
205 int opts = o->pickaxe_opts;
206 regex_t regex, *regexp = NULL;
209 if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) {
211 int cflags = REG_EXTENDED | REG_NEWLINE;
212 if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE))
214 err = regcomp(®ex, needle, cflags);
216 /* The POSIX.2 people are surely sick */
218 regerror(err, ®ex, errbuf, 1024);
220 die("invalid regex: %s", errbuf);
224 kws = kwsalloc(DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE)
225 ? tolower_trans_tbl : NULL);
226 kwsincr(kws, needle, strlen(needle));
230 /* Might want to warn when both S and G are on; I don't care... */
231 pickaxe(&diff_queued_diff, o, regexp, kws,
232 (opts & DIFF_PICKAXE_KIND_G) ? diff_grep : has_changes);