]>
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" |
f506b8e8 | 10 | |
8a94151d RS |
11 | typedef int (*pickaxe_fn)(struct diff_filepair *p, struct diff_options *o, regex_t *regexp, kwset_t kws); |
12 | ||
13 | static void pickaxe(struct diff_queue_struct *q, struct diff_options *o, | |
14 | regex_t *regexp, kwset_t kws, pickaxe_fn fn) | |
15 | { | |
16 | int i; | |
17 | struct diff_queue_struct outq; | |
18 | ||
19 | DIFF_QUEUE_CLEAR(&outq); | |
20 | ||
21 | if (o->pickaxe_opts & DIFF_PICKAXE_ALL) { | |
22 | /* Showing the whole changeset if needle exists */ | |
23 | for (i = 0; i < q->nr; i++) { | |
24 | struct diff_filepair *p = q->queue[i]; | |
25 | if (fn(p, o, regexp, kws)) | |
26 | return; /* do not munge the queue */ | |
27 | } | |
28 | ||
29 | /* | |
30 | * Otherwise we will clear the whole queue by copying | |
31 | * the empty outq at the end of this function, but | |
32 | * first clear the current entries in the queue. | |
33 | */ | |
34 | for (i = 0; i < q->nr; i++) | |
35 | diff_free_filepair(q->queue[i]); | |
36 | } else { | |
37 | /* Showing only the filepairs that has the needle */ | |
38 | for (i = 0; i < q->nr; i++) { | |
39 | struct diff_filepair *p = q->queue[i]; | |
40 | if (fn(p, o, regexp, kws)) | |
41 | diff_q(&outq, p); | |
42 | else | |
43 | diff_free_filepair(p); | |
44 | } | |
45 | } | |
46 | ||
47 | free(q->queue); | |
48 | *q = outq; | |
49 | } | |
50 | ||
f506b8e8 JH |
51 | struct diffgrep_cb { |
52 | regex_t *regexp; | |
53 | int hit; | |
54 | }; | |
55 | ||
56 | static void diffgrep_consume(void *priv, char *line, unsigned long len) | |
57 | { | |
58 | struct diffgrep_cb *data = priv; | |
59 | regmatch_t regmatch; | |
60 | int hold; | |
61 | ||
62 | if (line[0] != '+' && line[0] != '-') | |
63 | return; | |
64 | if (data->hit) | |
65 | /* | |
66 | * NEEDSWORK: we should have a way to terminate the | |
67 | * caller early. | |
68 | */ | |
69 | return; | |
70 | /* Yuck -- line ought to be "const char *"! */ | |
71 | hold = line[len]; | |
72 | line[len] = '\0'; | |
73 | data->hit = !regexec(data->regexp, line + 1, 1, ®match, 0); | |
74 | line[len] = hold; | |
75 | } | |
76 | ||
77 | static void fill_one(struct diff_filespec *one, | |
78 | mmfile_t *mf, struct userdiff_driver **textconv) | |
79 | { | |
80 | if (DIFF_FILE_VALID(one)) { | |
81 | *textconv = get_textconv(one); | |
82 | mf->size = fill_textconv(*textconv, one, &mf->ptr); | |
83 | } else { | |
84 | memset(mf, 0, sizeof(*mf)); | |
85 | } | |
86 | } | |
87 | ||
db99cb70 RS |
88 | static int diff_grep(struct diff_filepair *p, struct diff_options *o, |
89 | regex_t *regexp, kwset_t kws) | |
f506b8e8 JH |
90 | { |
91 | regmatch_t regmatch; | |
92 | struct userdiff_driver *textconv_one = NULL; | |
93 | struct userdiff_driver *textconv_two = NULL; | |
94 | mmfile_t mf1, mf2; | |
95 | int hit; | |
96 | ||
97 | if (diff_unmodified_pair(p)) | |
98 | return 0; | |
99 | ||
100 | fill_one(p->one, &mf1, &textconv_one); | |
101 | fill_one(p->two, &mf2, &textconv_two); | |
102 | ||
103 | if (!mf1.ptr) { | |
104 | if (!mf2.ptr) | |
105 | return 0; /* ignore unmerged */ | |
106 | /* created "two" -- does it have what we are looking for? */ | |
107 | hit = !regexec(regexp, p->two->data, 1, ®match, 0); | |
108 | } else if (!mf2.ptr) { | |
109 | /* removed "one" -- did it have what we are looking for? */ | |
110 | hit = !regexec(regexp, p->one->data, 1, ®match, 0); | |
111 | } else { | |
112 | /* | |
113 | * We have both sides; need to run textual diff and see if | |
114 | * the pattern appears on added/deleted lines. | |
115 | */ | |
116 | struct diffgrep_cb ecbdata; | |
117 | xpparam_t xpp; | |
118 | xdemitconf_t xecfg; | |
119 | ||
120 | memset(&xpp, 0, sizeof(xpp)); | |
121 | memset(&xecfg, 0, sizeof(xecfg)); | |
122 | ecbdata.regexp = regexp; | |
123 | ecbdata.hit = 0; | |
124 | xecfg.ctxlen = o->context; | |
125 | xecfg.interhunkctxlen = o->interhunkcontext; | |
126 | xdi_diff_outf(&mf1, &mf2, diffgrep_consume, &ecbdata, | |
127 | &xpp, &xecfg); | |
128 | hit = ecbdata.hit; | |
129 | } | |
130 | if (textconv_one) | |
131 | free(mf1.ptr); | |
132 | if (textconv_two) | |
133 | free(mf2.ptr); | |
134 | return hit; | |
135 | } | |
136 | ||
137 | static void diffcore_pickaxe_grep(struct diff_options *o) | |
138 | { | |
8a94151d | 139 | int err; |
f506b8e8 | 140 | regex_t regex; |
f506b8e8 JH |
141 | |
142 | err = regcomp(®ex, o->pickaxe, REG_EXTENDED | REG_NEWLINE); | |
143 | if (err) { | |
144 | char errbuf[1024]; | |
145 | regerror(err, ®ex, errbuf, 1024); | |
146 | regfree(®ex); | |
147 | die("invalid log-grep regex: %s", errbuf); | |
148 | } | |
149 | ||
8a94151d | 150 | pickaxe(&diff_queued_diff, o, ®ex, NULL, diff_grep); |
f506b8e8 | 151 | |
2b5f07f1 | 152 | regfree(®ex); |
f506b8e8 JH |
153 | return; |
154 | } | |
52e95789 | 155 | |
5d176fb6 | 156 | static unsigned int contains(struct diff_filespec *one, struct diff_options *o, |
b95c5ada | 157 | regex_t *regexp, kwset_t kws) |
52e95789 | 158 | { |
2002eed6 | 159 | unsigned int cnt; |
ce163c79 | 160 | unsigned long sz; |
52e95789 | 161 | const char *data; |
5d176fb6 | 162 | if (!o->pickaxe[0]) |
e1b16116 | 163 | return 0; |
05ac9784 RS |
164 | if (diff_populate_filespec(one, 0)) |
165 | return 0; | |
2002eed6 | 166 | |
52e95789 JH |
167 | sz = one->size; |
168 | data = one->data; | |
2002eed6 JH |
169 | cnt = 0; |
170 | ||
d01d8c67 PB |
171 | if (regexp) { |
172 | regmatch_t regmatch; | |
173 | int flags = 0; | |
174 | ||
50fd6997 | 175 | assert(data[sz] == '\0'); |
d01d8c67 PB |
176 | while (*data && !regexec(regexp, data, 1, ®match, flags)) { |
177 | flags |= REG_NOTBOL; | |
50fd6997 RS |
178 | data += regmatch.rm_eo; |
179 | if (*data && regmatch.rm_so == regmatch.rm_eo) | |
180 | data++; | |
2002eed6 JH |
181 | cnt++; |
182 | } | |
d01d8c67 PB |
183 | |
184 | } else { /* Classic exact string match */ | |
ce163c79 | 185 | while (sz) { |
5d176fb6 RS |
186 | struct kwsmatch kwsm; |
187 | size_t offset = kwsexec(kws, data, sz, &kwsm); | |
b95c5ada FK |
188 | const char *found; |
189 | if (offset == -1) | |
ce163c79 | 190 | break; |
b95c5ada FK |
191 | else |
192 | found = data + offset; | |
5d176fb6 RS |
193 | sz -= found - data + kwsm.size[0]; |
194 | data = found + kwsm.size[0]; | |
ce163c79 | 195 | cnt++; |
d01d8c67 | 196 | } |
2002eed6 | 197 | } |
a0cb9400 | 198 | diff_free_filespec_data(one); |
2002eed6 | 199 | return cnt; |
52e95789 JH |
200 | } |
201 | ||
5d176fb6 RS |
202 | static int has_changes(struct diff_filepair *p, struct diff_options *o, |
203 | regex_t *regexp, kwset_t kws) | |
15dafaf8 RS |
204 | { |
205 | if (!DIFF_FILE_VALID(p->one)) { | |
206 | if (!DIFF_FILE_VALID(p->two)) | |
207 | return 0; /* ignore unmerged */ | |
208 | /* created */ | |
5d176fb6 | 209 | return contains(p->two, o, regexp, kws) != 0; |
15dafaf8 RS |
210 | } |
211 | if (!DIFF_FILE_VALID(p->two)) | |
5d176fb6 | 212 | return contains(p->one, o, regexp, kws) != 0; |
15dafaf8 | 213 | if (!diff_unmodified_pair(p)) { |
5d176fb6 RS |
214 | return contains(p->one, o, regexp, kws) != |
215 | contains(p->two, o, regexp, kws); | |
15dafaf8 RS |
216 | } |
217 | return 0; | |
218 | } | |
219 | ||
f506b8e8 | 220 | static void diffcore_pickaxe_count(struct diff_options *o) |
52e95789 | 221 | { |
382f013b JH |
222 | const char *needle = o->pickaxe; |
223 | int opts = o->pickaxe_opts; | |
52e95789 | 224 | unsigned long len = strlen(needle); |
d01d8c67 | 225 | regex_t regex, *regexp = NULL; |
b95c5ada | 226 | kwset_t kws = NULL; |
52e95789 | 227 | |
d01d8c67 PB |
228 | if (opts & DIFF_PICKAXE_REGEX) { |
229 | int err; | |
230 | err = regcomp(®ex, needle, REG_EXTENDED | REG_NEWLINE); | |
231 | if (err) { | |
232 | /* The POSIX.2 people are surely sick */ | |
233 | char errbuf[1024]; | |
234 | regerror(err, ®ex, errbuf, 1024); | |
235 | regfree(®ex); | |
236 | die("invalid pickaxe regex: %s", errbuf); | |
237 | } | |
238 | regexp = ®ex; | |
b95c5ada FK |
239 | } else { |
240 | kws = kwsalloc(NULL); | |
241 | kwsincr(kws, needle, len); | |
242 | kwsprep(kws); | |
d01d8c67 PB |
243 | } |
244 | ||
8a94151d | 245 | pickaxe(&diff_queued_diff, o, regexp, kws, has_changes); |
8e854b00 | 246 | |
95ae69b9 | 247 | if (opts & DIFF_PICKAXE_REGEX) |
d01d8c67 | 248 | regfree(®ex); |
b95c5ada FK |
249 | else |
250 | kwsfree(kws); | |
52e95789 JH |
251 | return; |
252 | } | |
f506b8e8 JH |
253 | |
254 | void diffcore_pickaxe(struct diff_options *o) | |
255 | { | |
256 | /* Might want to warn when both S and G are on; I don't care... */ | |
257 | if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G) | |
8520913c | 258 | diffcore_pickaxe_grep(o); |
f506b8e8 | 259 | else |
8520913c | 260 | diffcore_pickaxe_count(o); |
f506b8e8 | 261 | } |