]>
Commit | Line | Data |
---|---|---|
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 |
13 | typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two, |
14 | struct diff_options *o, | |
15 | regex_t *regexp, kwset_t kws); | |
16 | ||
f506b8e8 JH |
17 | struct diffgrep_cb { |
18 | regex_t *regexp; | |
19 | int hit; | |
20 | }; | |
21 | ||
22 | static 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 | ®match, 0); | |
f506b8e8 JH |
37 | } |
38 | ||
61690bf4 JK |
39 | static 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, ®match, 0); | |
61690bf4 | 51 | if (!two) |
b7d36ffc JS |
52 | return !regexec_buf(regexp, one->ptr, one->size, |
53 | 1, ®match, 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; | |
3b40a090 JK |
65 | if (xdi_diff_outf(one, two, discard_hunk_line, diffgrep_consume, |
66 | &ecbdata, &xpp, &xecfg)) | |
3efb9880 | 67 | return 0; |
61690bf4 | 68 | return ecbdata.hit; |
f506b8e8 JH |
69 | } |
70 | ||
5b0672a2 ÆAB |
71 | static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws, |
72 | unsigned int limit) | |
52e95789 | 73 | { |
102fdd2e ÆAB |
74 | unsigned int cnt = 0; |
75 | unsigned long sz = mf->size; | |
76 | const char *data = mf->ptr; | |
2002eed6 | 77 | |
d01d8c67 PB |
78 | if (regexp) { |
79 | regmatch_t regmatch; | |
80 | int flags = 0; | |
81 | ||
52e011cd | 82 | while (sz && |
b7d36ffc | 83 | !regexec_buf(regexp, data, sz, 1, ®match, flags)) { |
d01d8c67 | 84 | flags |= REG_NOTBOL; |
50fd6997 | 85 | data += regmatch.rm_eo; |
f53c5de2 | 86 | sz -= regmatch.rm_eo; |
52e011cd | 87 | if (sz && regmatch.rm_so == regmatch.rm_eo) { |
50fd6997 | 88 | data++; |
f53c5de2 SG |
89 | sz--; |
90 | } | |
2002eed6 | 91 | cnt++; |
5b0672a2 ÆAB |
92 | |
93 | if (limit && cnt == limit) | |
94 | return cnt; | |
2002eed6 | 95 | } |
d01d8c67 PB |
96 | |
97 | } else { /* Classic exact string match */ | |
ce163c79 | 98 | while (sz) { |
5d176fb6 RS |
99 | struct kwsmatch kwsm; |
100 | size_t offset = kwsexec(kws, data, sz, &kwsm); | |
b95c5ada | 101 | if (offset == -1) |
ce163c79 | 102 | break; |
e4aab504 RS |
103 | sz -= offset + kwsm.size[0]; |
104 | data += offset + kwsm.size[0]; | |
ce163c79 | 105 | cnt++; |
5b0672a2 ÆAB |
106 | |
107 | if (limit && cnt == limit) | |
108 | return cnt; | |
d01d8c67 | 109 | } |
2002eed6 JH |
110 | } |
111 | return cnt; | |
52e95789 JH |
112 | } |
113 | ||
61690bf4 JK |
114 | static int has_changes(mmfile_t *one, mmfile_t *two, |
115 | struct diff_options *o, | |
5d176fb6 | 116 | regex_t *regexp, kwset_t kws) |
61690bf4 | 117 | { |
5b0672a2 ÆAB |
118 | unsigned int c1 = one ? contains(one, regexp, kws, 0) : 0; |
119 | unsigned int c2 = two ? contains(two, regexp, kws, c1 + 1) : 0; | |
5d35a953 | 120 | return c1 != c2; |
61690bf4 JK |
121 | } |
122 | ||
123 | static int pickaxe_match(struct diff_filepair *p, struct diff_options *o, | |
124 | regex_t *regexp, kwset_t kws, pickaxe_fn fn) | |
15dafaf8 | 125 | { |
bc615898 SR |
126 | struct userdiff_driver *textconv_one = NULL; |
127 | struct userdiff_driver *textconv_two = NULL; | |
ef90ab66 JK |
128 | mmfile_t mf1, mf2; |
129 | int ret; | |
130 | ||
61690bf4 JK |
131 | /* ignore unmerged */ |
132 | if (!DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) | |
133 | return 0; | |
134 | ||
15af58c1 SB |
135 | if (o->objfind) { |
136 | return (DIFF_FILE_VALID(p->one) && | |
137 | oidset_contains(o->objfind, &p->one->oid)) || | |
138 | (DIFF_FILE_VALID(p->two) && | |
139 | oidset_contains(o->objfind, &p->two->oid)); | |
140 | } | |
141 | ||
0d1e0e78 | 142 | if (o->flags.allow_textconv) { |
bd7ad45b NTND |
143 | textconv_one = get_textconv(o->repo, p->one); |
144 | textconv_two = get_textconv(o->repo, p->two); | |
a8f61094 | 145 | } |
bc615898 | 146 | |
ef90ab66 JK |
147 | /* |
148 | * If we have an unmodified pair, we know that the count will be the | |
149 | * same and don't even have to load the blobs. Unless textconv is in | |
150 | * play, _and_ we are using two different textconv filters (e.g., | |
151 | * because a pair is an exact rename with different textconv attributes | |
152 | * for each side, which might generate different content). | |
153 | */ | |
154 | if (textconv_one == textconv_two && diff_unmodified_pair(p)) | |
155 | return 0; | |
156 | ||
e0e7cb80 TB |
157 | if ((o->pickaxe_opts & DIFF_PICKAXE_KIND_G) && |
158 | !o->flags.text && | |
159 | ((!textconv_one && diff_filespec_is_binary(o->repo, p->one)) || | |
160 | (!textconv_two && diff_filespec_is_binary(o->repo, p->two)))) | |
161 | return 0; | |
162 | ||
6afaf807 NTND |
163 | mf1.size = fill_textconv(o->repo, textconv_one, p->one, &mf1.ptr); |
164 | mf2.size = fill_textconv(o->repo, textconv_two, p->two, &mf2.ptr); | |
ef90ab66 | 165 | |
61690bf4 JK |
166 | ret = fn(DIFF_FILE_VALID(p->one) ? &mf1 : NULL, |
167 | DIFF_FILE_VALID(p->two) ? &mf2 : NULL, | |
168 | o, regexp, kws); | |
ef90ab66 JK |
169 | |
170 | if (textconv_one) | |
171 | free(mf1.ptr); | |
172 | if (textconv_two) | |
173 | free(mf2.ptr); | |
174 | diff_free_filespec_data(p->one); | |
175 | diff_free_filespec_data(p->two); | |
176 | ||
177 | return ret; | |
15dafaf8 RS |
178 | } |
179 | ||
3753bd1f RS |
180 | static void pickaxe(struct diff_queue_struct *q, struct diff_options *o, |
181 | regex_t *regexp, kwset_t kws, pickaxe_fn fn) | |
182 | { | |
183 | int i; | |
184 | struct diff_queue_struct outq; | |
185 | ||
186 | DIFF_QUEUE_CLEAR(&outq); | |
187 | ||
188 | if (o->pickaxe_opts & DIFF_PICKAXE_ALL) { | |
189 | /* Showing the whole changeset if needle exists */ | |
190 | for (i = 0; i < q->nr; i++) { | |
191 | struct diff_filepair *p = q->queue[i]; | |
192 | if (pickaxe_match(p, o, regexp, kws, fn)) | |
193 | return; /* do not munge the queue */ | |
194 | } | |
195 | ||
196 | /* | |
197 | * Otherwise we will clear the whole queue by copying | |
198 | * the empty outq at the end of this function, but | |
199 | * first clear the current entries in the queue. | |
200 | */ | |
201 | for (i = 0; i < q->nr; i++) | |
202 | diff_free_filepair(q->queue[i]); | |
203 | } else { | |
204 | /* Showing only the filepairs that has the needle */ | |
205 | for (i = 0; i < q->nr; i++) { | |
206 | struct diff_filepair *p = q->queue[i]; | |
207 | if (pickaxe_match(p, o, regexp, kws, fn)) | |
208 | diff_q(&outq, p); | |
209 | else | |
210 | diff_free_filepair(p); | |
211 | } | |
212 | } | |
213 | ||
214 | free(q->queue); | |
215 | *q = outq; | |
216 | } | |
217 | ||
3d5b23a3 NTND |
218 | static void regcomp_or_die(regex_t *regex, const char *needle, int cflags) |
219 | { | |
220 | int err = regcomp(regex, needle, cflags); | |
221 | if (err) { | |
222 | /* The POSIX.2 people are surely sick */ | |
223 | char errbuf[1024]; | |
224 | regerror(err, regex, errbuf, 1024); | |
3d5b23a3 NTND |
225 | die("invalid regex: %s", errbuf); |
226 | } | |
227 | } | |
228 | ||
63b52afa | 229 | void diffcore_pickaxe(struct diff_options *o) |
52e95789 | 230 | { |
382f013b JH |
231 | const char *needle = o->pickaxe; |
232 | int opts = o->pickaxe_opts; | |
d01d8c67 | 233 | regex_t regex, *regexp = NULL; |
b95c5ada | 234 | kwset_t kws = NULL; |
03c1f14a | 235 | pickaxe_fn fn; |
52e95789 | 236 | |
2e197a75 ÆAB |
237 | if (opts & ~DIFF_PICKAXE_KIND_OBJFIND && |
238 | (!needle || !*needle)) | |
239 | BUG("should have needle under -G or -S"); | |
63b52afa | 240 | if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) { |
218c45a4 | 241 | int cflags = REG_EXTENDED | REG_NEWLINE; |
c1ddc461 | 242 | if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE) |
218c45a4 | 243 | cflags |= REG_ICASE; |
3d5b23a3 | 244 | regcomp_or_die(®ex, needle, cflags); |
d01d8c67 | 245 | regexp = ®ex; |
03c1f14a ÆAB |
246 | |
247 | if (opts & DIFF_PICKAXE_KIND_G) | |
248 | fn = diff_grep; | |
249 | else if (opts & DIFF_PICKAXE_REGEX) | |
250 | fn = has_changes; | |
251 | else | |
252 | /* | |
253 | * We don't need to check the combination of | |
254 | * -G and --pickaxe-regex, by the time we get | |
255 | * here diff.c has already died if they're | |
256 | * combined. See the usage tests in | |
257 | * t4209-log-pickaxe.sh. | |
258 | */ | |
259 | BUG("unreachable"); | |
15af58c1 SB |
260 | } else if (opts & DIFF_PICKAXE_KIND_S) { |
261 | if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE && | |
262 | has_non_ascii(needle)) { | |
263 | struct strbuf sb = STRBUF_INIT; | |
264 | int cflags = REG_NEWLINE | REG_ICASE; | |
265 | ||
266 | basic_regex_quote_buf(&sb, needle); | |
267 | regcomp_or_die(®ex, sb.buf, cflags); | |
268 | strbuf_release(&sb); | |
269 | regexp = ®ex; | |
270 | } else { | |
271 | kws = kwsalloc(o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE | |
272 | ? tolower_trans_tbl : NULL); | |
273 | kwsincr(kws, needle, strlen(needle)); | |
274 | kwsprep(kws); | |
275 | } | |
03c1f14a ÆAB |
276 | fn = has_changes; |
277 | } else if (opts & DIFF_PICKAXE_KIND_OBJFIND) { | |
278 | fn = NULL; | |
279 | } else { | |
280 | BUG("unknown pickaxe_opts flag"); | |
d01d8c67 PB |
281 | } |
282 | ||
03c1f14a | 283 | pickaxe(&diff_queued_diff, o, regexp, kws, fn); |
8e854b00 | 284 | |
63b52afa RS |
285 | if (regexp) |
286 | regfree(regexp); | |
15af58c1 | 287 | if (kws) |
b95c5ada | 288 | kwsfree(kws); |
52e95789 JH |
289 | return; |
290 | } |