2 * Copyright (C) 2005 Junio C Hamano
3 * Copyright (C) 2010 Google Inc.
8 #include "xdiff-interface.h"
11 typedef int (*pickaxe_fn
)(struct diff_filepair
*p
, struct diff_options
*o
, regex_t
*regexp
, kwset_t kws
);
13 static void pickaxe(struct diff_queue_struct
*q
, struct diff_options
*o
,
14 regex_t
*regexp
, kwset_t kws
, pickaxe_fn fn
)
17 struct diff_queue_struct outq
;
19 DIFF_QUEUE_CLEAR(&outq
);
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 */
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.
34 for (i
= 0; i
< q
->nr
; i
++)
35 diff_free_filepair(q
->queue
[i
]);
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
))
43 diff_free_filepair(p
);
56 static void diffgrep_consume(void *priv
, char *line
, unsigned long len
)
58 struct diffgrep_cb
*data
= priv
;
62 if (line
[0] != '+' && line
[0] != '-')
66 * NEEDSWORK: we should have a way to terminate the
70 /* Yuck -- line ought to be "const char *"! */
73 data
->hit
= !regexec(data
->regexp
, line
+ 1, 1, ®match
, 0);
77 static int diff_grep(struct diff_filepair
*p
, struct diff_options
*o
,
78 regex_t
*regexp
, kwset_t kws
)
81 struct userdiff_driver
*textconv_one
= NULL
;
82 struct userdiff_driver
*textconv_two
= NULL
;
86 if (diff_unmodified_pair(p
))
89 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
90 textconv_one
= get_textconv(p
->one
);
91 textconv_two
= get_textconv(p
->two
);
94 mf1
.size
= fill_textconv(textconv_one
, p
->one
, &mf1
.ptr
);
95 mf2
.size
= fill_textconv(textconv_two
, p
->two
, &mf2
.ptr
);
97 if (!DIFF_FILE_VALID(p
->one
)) {
98 if (!DIFF_FILE_VALID(p
->two
))
99 return 0; /* ignore unmerged */
100 /* created "two" -- does it have what we are looking for? */
101 hit
= !regexec(regexp
, mf2
.ptr
, 1, ®match
, 0);
102 } else if (!DIFF_FILE_VALID(p
->two
)) {
103 /* removed "one" -- did it have what we are looking for? */
104 hit
= !regexec(regexp
, mf1
.ptr
, 1, ®match
, 0);
107 * We have both sides; need to run textual diff and see if
108 * the pattern appears on added/deleted lines.
110 struct diffgrep_cb ecbdata
;
114 memset(&xpp
, 0, sizeof(xpp
));
115 memset(&xecfg
, 0, sizeof(xecfg
));
116 ecbdata
.regexp
= regexp
;
118 xecfg
.ctxlen
= o
->context
;
119 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
120 xdi_diff_outf(&mf1
, &mf2
, diffgrep_consume
, &ecbdata
,
131 static void diffcore_pickaxe_grep(struct diff_options
*o
)
135 int cflags
= REG_EXTENDED
| REG_NEWLINE
;
137 if (DIFF_OPT_TST(o
, PICKAXE_IGNORE_CASE
))
140 err
= regcomp(®ex
, o
->pickaxe
, cflags
);
143 regerror(err
, ®ex
, errbuf
, 1024);
145 die("invalid log-grep regex: %s", errbuf
);
148 pickaxe(&diff_queued_diff
, o
, ®ex
, NULL
, diff_grep
);
154 static unsigned int contains(mmfile_t
*mf
, struct diff_options
*o
,
155 regex_t
*regexp
, kwset_t kws
)
169 assert(data
[sz
] == '\0');
170 while (*data
&& !regexec(regexp
, data
, 1, ®match
, flags
)) {
172 data
+= regmatch
.rm_eo
;
173 if (*data
&& regmatch
.rm_so
== regmatch
.rm_eo
)
178 } else { /* Classic exact string match */
180 struct kwsmatch kwsm
;
181 size_t offset
= kwsexec(kws
, data
, sz
, &kwsm
);
186 found
= data
+ offset
;
187 sz
-= found
- data
+ kwsm
.size
[0];
188 data
= found
+ kwsm
.size
[0];
195 static int has_changes(struct diff_filepair
*p
, struct diff_options
*o
,
196 regex_t
*regexp
, kwset_t kws
)
198 struct userdiff_driver
*textconv_one
= NULL
;
199 struct userdiff_driver
*textconv_two
= NULL
;
206 if (DIFF_OPT_TST(o
, ALLOW_TEXTCONV
)) {
207 textconv_one
= get_textconv(p
->one
);
208 textconv_two
= get_textconv(p
->two
);
212 * If we have an unmodified pair, we know that the count will be the
213 * same and don't even have to load the blobs. Unless textconv is in
214 * play, _and_ we are using two different textconv filters (e.g.,
215 * because a pair is an exact rename with different textconv attributes
216 * for each side, which might generate different content).
218 if (textconv_one
== textconv_two
&& diff_unmodified_pair(p
))
221 mf1
.size
= fill_textconv(textconv_one
, p
->one
, &mf1
.ptr
);
222 mf2
.size
= fill_textconv(textconv_two
, p
->two
, &mf2
.ptr
);
224 if (!DIFF_FILE_VALID(p
->one
)) {
225 if (!DIFF_FILE_VALID(p
->two
))
226 ret
= 0; /* ignore unmerged */
228 ret
= contains(&mf2
, o
, regexp
, kws
) != 0;
230 else if (!DIFF_FILE_VALID(p
->two
)) /* removed */
231 ret
= contains(&mf1
, o
, regexp
, kws
) != 0;
233 ret
= contains(&mf1
, o
, regexp
, kws
) !=
234 contains(&mf2
, o
, regexp
, kws
);
240 diff_free_filespec_data(p
->one
);
241 diff_free_filespec_data(p
->two
);
246 static void diffcore_pickaxe_count(struct diff_options
*o
)
248 const char *needle
= o
->pickaxe
;
249 int opts
= o
->pickaxe_opts
;
250 unsigned long len
= strlen(needle
);
251 regex_t regex
, *regexp
= NULL
;
254 if (opts
& DIFF_PICKAXE_REGEX
) {
256 err
= regcomp(®ex
, needle
, REG_EXTENDED
| REG_NEWLINE
);
258 /* The POSIX.2 people are surely sick */
260 regerror(err
, ®ex
, errbuf
, 1024);
262 die("invalid pickaxe regex: %s", errbuf
);
266 kws
= kwsalloc(DIFF_OPT_TST(o
, PICKAXE_IGNORE_CASE
)
267 ? tolower_trans_tbl
: NULL
);
268 kwsincr(kws
, needle
, len
);
272 pickaxe(&diff_queued_diff
, o
, regexp
, kws
, has_changes
);
274 if (opts
& DIFF_PICKAXE_REGEX
)
281 void diffcore_pickaxe(struct diff_options
*o
)
283 /* Might want to warn when both S and G are on; I don't care... */
284 if (o
->pickaxe_opts
& DIFF_PICKAXE_KIND_G
)
285 diffcore_pickaxe_grep(o
);
287 diffcore_pickaxe_count(o
);