]> git.ipfire.org Git - thirdparty/git.git/blame - diffcore-pickaxe.c
xdiff-interface: provide a separate consume callback for hunks
[thirdparty/git.git] / diffcore-pickaxe.c
CommitLineData
52e95789
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
f506b8e8 3 * Copyright (C) 2010 Google Inc.
52e95789
JH
4 */
5#include "cache.h"
6#include "diff.h"
7#include "diffcore.h"
f506b8e8 8#include "xdiff-interface.h"
b95c5ada 9#include "kwset.h"
b51a9c14
NTND
10#include "commit.h"
11#include "quote.h"
f506b8e8 12
61690bf4
JK
13typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two,
14 struct diff_options *o,
15 regex_t *regexp, kwset_t kws);
16
f506b8e8
JH
17struct diffgrep_cb {
18 regex_t *regexp;
19 int hit;
20};
21
22static void diffgrep_consume(void *priv, char *line, unsigned long len)
23{
24 struct diffgrep_cb *data = priv;
25 regmatch_t regmatch;
f506b8e8
JH
26
27 if (line[0] != '+' && line[0] != '-')
28 return;
29 if (data->hit)
30 /*
31 * NEEDSWORK: we should have a way to terminate the
32 * caller early.
33 */
34 return;
b7d36ffc
JS
35 data->hit = !regexec_buf(data->regexp, line + 1, len - 1, 1,
36 &regmatch, 0);
f506b8e8
JH
37}
38
61690bf4
JK
39static int diff_grep(mmfile_t *one, mmfile_t *two,
40 struct diff_options *o,
db99cb70 41 regex_t *regexp, kwset_t kws)
f506b8e8
JH
42{
43 regmatch_t regmatch;
61690bf4
JK
44 struct diffgrep_cb ecbdata;
45 xpparam_t xpp;
46 xdemitconf_t xecfg;
bc615898 47
61690bf4 48 if (!one)
b7d36ffc
JS
49 return !regexec_buf(regexp, two->ptr, two->size,
50 1, &regmatch, 0);
61690bf4 51 if (!two)
b7d36ffc
JS
52 return !regexec_buf(regexp, one->ptr, one->size,
53 1, &regmatch, 0);
f506b8e8 54
61690bf4
JK
55 /*
56 * We have both sides; need to run textual diff and see if
57 * the pattern appears on added/deleted lines.
58 */
59 memset(&xpp, 0, sizeof(xpp));
60 memset(&xecfg, 0, sizeof(xecfg));
61 ecbdata.regexp = regexp;
62 ecbdata.hit = 0;
63 xecfg.ctxlen = o->context;
64 xecfg.interhunkctxlen = o->interhunkcontext;
9346d6d1 65 if (xdi_diff_outf(one, two, NULL, diffgrep_consume, &ecbdata, &xpp, &xecfg))
3efb9880 66 return 0;
61690bf4 67 return ecbdata.hit;
f506b8e8
JH
68}
69
3bdb5b9f 70static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
52e95789 71{
2002eed6 72 unsigned int cnt;
ce163c79 73 unsigned long sz;
52e95789 74 const char *data;
2002eed6 75
ef90ab66
JK
76 sz = mf->size;
77 data = mf->ptr;
2002eed6
JH
78 cnt = 0;
79
d01d8c67
PB
80 if (regexp) {
81 regmatch_t regmatch;
82 int flags = 0;
83
f53c5de2 84 while (sz && *data &&
b7d36ffc 85 !regexec_buf(regexp, data, sz, 1, &regmatch, flags)) {
d01d8c67 86 flags |= REG_NOTBOL;
50fd6997 87 data += regmatch.rm_eo;
f53c5de2
SG
88 sz -= regmatch.rm_eo;
89 if (sz && *data && regmatch.rm_so == regmatch.rm_eo) {
50fd6997 90 data++;
f53c5de2
SG
91 sz--;
92 }
2002eed6
JH
93 cnt++;
94 }
d01d8c67
PB
95
96 } else { /* Classic exact string match */
ce163c79 97 while (sz) {
5d176fb6
RS
98 struct kwsmatch kwsm;
99 size_t offset = kwsexec(kws, data, sz, &kwsm);
b95c5ada 100 if (offset == -1)
ce163c79 101 break;
e4aab504
RS
102 sz -= offset + kwsm.size[0];
103 data += offset + kwsm.size[0];
ce163c79 104 cnt++;
d01d8c67 105 }
2002eed6
JH
106 }
107 return cnt;
52e95789
JH
108}
109
61690bf4
JK
110static int has_changes(mmfile_t *one, mmfile_t *two,
111 struct diff_options *o,
5d176fb6 112 regex_t *regexp, kwset_t kws)
61690bf4 113{
3bdb5b9f
RS
114 unsigned int one_contains = one ? contains(one, regexp, kws) : 0;
115 unsigned int two_contains = two ? contains(two, regexp, kws) : 0;
116 return one_contains != two_contains;
61690bf4
JK
117}
118
119static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
120 regex_t *regexp, kwset_t kws, pickaxe_fn fn)
15dafaf8 121{
bc615898
SR
122 struct userdiff_driver *textconv_one = NULL;
123 struct userdiff_driver *textconv_two = NULL;
ef90ab66
JK
124 mmfile_t mf1, mf2;
125 int ret;
126
61690bf4
JK
127 /* ignore unmerged */
128 if (!DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two))
129 return 0;
130
15af58c1
SB
131 if (o->objfind) {
132 return (DIFF_FILE_VALID(p->one) &&
133 oidset_contains(o->objfind, &p->one->oid)) ||
134 (DIFF_FILE_VALID(p->two) &&
135 oidset_contains(o->objfind, &p->two->oid));
136 }
137
138 if (!o->pickaxe[0])
139 return 0;
140
0d1e0e78 141 if (o->flags.allow_textconv) {
a8f61094
SR
142 textconv_one = get_textconv(p->one);
143 textconv_two = get_textconv(p->two);
144 }
bc615898 145
ef90ab66
JK
146 /*
147 * If we have an unmodified pair, we know that the count will be the
148 * same and don't even have to load the blobs. Unless textconv is in
149 * play, _and_ we are using two different textconv filters (e.g.,
150 * because a pair is an exact rename with different textconv attributes
151 * for each side, which might generate different content).
152 */
153 if (textconv_one == textconv_two && diff_unmodified_pair(p))
154 return 0;
155
7cdb9b42
JK
156 mf1.size = fill_textconv(textconv_one, p->one, &mf1.ptr);
157 mf2.size = fill_textconv(textconv_two, p->two, &mf2.ptr);
ef90ab66 158
61690bf4
JK
159 ret = fn(DIFF_FILE_VALID(p->one) ? &mf1 : NULL,
160 DIFF_FILE_VALID(p->two) ? &mf2 : NULL,
161 o, regexp, kws);
ef90ab66
JK
162
163 if (textconv_one)
164 free(mf1.ptr);
165 if (textconv_two)
166 free(mf2.ptr);
167 diff_free_filespec_data(p->one);
168 diff_free_filespec_data(p->two);
169
170 return ret;
15dafaf8
RS
171}
172
3753bd1f
RS
173static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,
174 regex_t *regexp, kwset_t kws, pickaxe_fn fn)
175{
176 int i;
177 struct diff_queue_struct outq;
178
179 DIFF_QUEUE_CLEAR(&outq);
180
181 if (o->pickaxe_opts & DIFF_PICKAXE_ALL) {
182 /* Showing the whole changeset if needle exists */
183 for (i = 0; i < q->nr; i++) {
184 struct diff_filepair *p = q->queue[i];
185 if (pickaxe_match(p, o, regexp, kws, fn))
186 return; /* do not munge the queue */
187 }
188
189 /*
190 * Otherwise we will clear the whole queue by copying
191 * the empty outq at the end of this function, but
192 * first clear the current entries in the queue.
193 */
194 for (i = 0; i < q->nr; i++)
195 diff_free_filepair(q->queue[i]);
196 } else {
197 /* Showing only the filepairs that has the needle */
198 for (i = 0; i < q->nr; i++) {
199 struct diff_filepair *p = q->queue[i];
200 if (pickaxe_match(p, o, regexp, kws, fn))
201 diff_q(&outq, p);
202 else
203 diff_free_filepair(p);
204 }
205 }
206
207 free(q->queue);
208 *q = outq;
209}
210
3d5b23a3
NTND
211static void regcomp_or_die(regex_t *regex, const char *needle, int cflags)
212{
213 int err = regcomp(regex, needle, cflags);
214 if (err) {
215 /* The POSIX.2 people are surely sick */
216 char errbuf[1024];
217 regerror(err, regex, errbuf, 1024);
3d5b23a3
NTND
218 die("invalid regex: %s", errbuf);
219 }
220}
221
63b52afa 222void diffcore_pickaxe(struct diff_options *o)
52e95789 223{
382f013b
JH
224 const char *needle = o->pickaxe;
225 int opts = o->pickaxe_opts;
d01d8c67 226 regex_t regex, *regexp = NULL;
b95c5ada 227 kwset_t kws = NULL;
52e95789 228
63b52afa 229 if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) {
218c45a4 230 int cflags = REG_EXTENDED | REG_NEWLINE;
c1ddc461 231 if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE)
218c45a4 232 cflags |= REG_ICASE;
3d5b23a3 233 regcomp_or_die(&regex, needle, cflags);
d01d8c67 234 regexp = &regex;
15af58c1
SB
235 } else if (opts & DIFF_PICKAXE_KIND_S) {
236 if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE &&
237 has_non_ascii(needle)) {
238 struct strbuf sb = STRBUF_INIT;
239 int cflags = REG_NEWLINE | REG_ICASE;
240
241 basic_regex_quote_buf(&sb, needle);
242 regcomp_or_die(&regex, sb.buf, cflags);
243 strbuf_release(&sb);
244 regexp = &regex;
245 } else {
246 kws = kwsalloc(o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE
247 ? tolower_trans_tbl : NULL);
248 kwsincr(kws, needle, strlen(needle));
249 kwsprep(kws);
250 }
d01d8c67
PB
251 }
252
63b52afa
RS
253 pickaxe(&diff_queued_diff, o, regexp, kws,
254 (opts & DIFF_PICKAXE_KIND_G) ? diff_grep : has_changes);
8e854b00 255
63b52afa
RS
256 if (regexp)
257 regfree(regexp);
15af58c1 258 if (kws)
b95c5ada 259 kwsfree(kws);
52e95789
JH
260 return;
261}