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 void fill_one(struct diff_filespec
*one
,
78 mmfile_t
*mf
, struct userdiff_driver
*textconv
)
80 if (DIFF_FILE_VALID(one
)) {
81 mf
->size
= fill_textconv(textconv
, one
, &mf
->ptr
);
83 memset(mf
, 0, sizeof(*mf
));
87 static int diff_grep(struct diff_filepair
*p
, struct diff_options
*o
,
88 regex_t
*regexp
, kwset_t kws
)
91 struct userdiff_driver
*textconv_one
= NULL
;
92 struct userdiff_driver
*textconv_two
= NULL
;
96 if (diff_unmodified_pair(p
))
99 textconv_one
= get_textconv(p
->one
);
100 textconv_two
= get_textconv(p
->two
);
102 fill_one(p
->one
, &mf1
, textconv_one
);
103 fill_one(p
->two
, &mf2
, textconv_two
);
107 return 0; /* ignore unmerged */
108 /* created "two" -- does it have what we are looking for? */
109 hit
= !regexec(regexp
, mf2
.ptr
, 1, ®match
, 0);
110 } else if (!mf2
.ptr
) {
111 /* removed "one" -- did it have what we are looking for? */
112 hit
= !regexec(regexp
, mf1
.ptr
, 1, ®match
, 0);
115 * We have both sides; need to run textual diff and see if
116 * the pattern appears on added/deleted lines.
118 struct diffgrep_cb ecbdata
;
122 memset(&xpp
, 0, sizeof(xpp
));
123 memset(&xecfg
, 0, sizeof(xecfg
));
124 ecbdata
.regexp
= regexp
;
126 xecfg
.ctxlen
= o
->context
;
127 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
128 xdi_diff_outf(&mf1
, &mf2
, diffgrep_consume
, &ecbdata
,
139 static void diffcore_pickaxe_grep(struct diff_options
*o
)
143 int cflags
= REG_EXTENDED
| REG_NEWLINE
;
145 if (DIFF_OPT_TST(o
, PICKAXE_IGNORE_CASE
))
148 err
= regcomp(®ex
, o
->pickaxe
, cflags
);
151 regerror(err
, ®ex
, errbuf
, 1024);
153 die("invalid log-grep regex: %s", errbuf
);
156 pickaxe(&diff_queued_diff
, o
, ®ex
, NULL
, diff_grep
);
162 static unsigned int contains(mmfile_t
*mf
, struct diff_options
*o
,
163 regex_t
*regexp
, kwset_t kws
)
177 assert(data
[sz
] == '\0');
178 while (*data
&& !regexec(regexp
, data
, 1, ®match
, flags
)) {
180 data
+= regmatch
.rm_eo
;
181 if (*data
&& regmatch
.rm_so
== regmatch
.rm_eo
)
186 } else { /* Classic exact string match */
188 struct kwsmatch kwsm
;
189 size_t offset
= kwsexec(kws
, data
, sz
, &kwsm
);
194 found
= data
+ offset
;
195 sz
-= found
- data
+ kwsm
.size
[0];
196 data
= found
+ kwsm
.size
[0];
203 static int has_changes(struct diff_filepair
*p
, struct diff_options
*o
,
204 regex_t
*regexp
, kwset_t kws
)
206 struct userdiff_driver
*textconv_one
= NULL
;
207 struct userdiff_driver
*textconv_two
= NULL
;
214 textconv_one
= get_textconv(p
->one
);
215 textconv_two
= get_textconv(p
->two
);
218 * If we have an unmodified pair, we know that the count will be the
219 * same and don't even have to load the blobs. Unless textconv is in
220 * play, _and_ we are using two different textconv filters (e.g.,
221 * because a pair is an exact rename with different textconv attributes
222 * for each side, which might generate different content).
224 if (textconv_one
== textconv_two
&& diff_unmodified_pair(p
))
227 fill_one(p
->one
, &mf1
, textconv_one
);
228 fill_one(p
->two
, &mf2
, textconv_two
);
232 ret
= 0; /* ignore unmerged */
234 ret
= contains(&mf2
, o
, regexp
, kws
) != 0;
236 else if (!mf2
.ptr
) /* removed */
237 ret
= contains(&mf1
, o
, regexp
, kws
) != 0;
239 ret
= contains(&mf1
, o
, regexp
, kws
) !=
240 contains(&mf2
, o
, regexp
, kws
);
246 diff_free_filespec_data(p
->one
);
247 diff_free_filespec_data(p
->two
);
252 static void diffcore_pickaxe_count(struct diff_options
*o
)
254 const char *needle
= o
->pickaxe
;
255 int opts
= o
->pickaxe_opts
;
256 unsigned long len
= strlen(needle
);
257 regex_t regex
, *regexp
= NULL
;
260 if (opts
& DIFF_PICKAXE_REGEX
) {
262 err
= regcomp(®ex
, needle
, REG_EXTENDED
| REG_NEWLINE
);
264 /* The POSIX.2 people are surely sick */
266 regerror(err
, ®ex
, errbuf
, 1024);
268 die("invalid pickaxe regex: %s", errbuf
);
272 kws
= kwsalloc(DIFF_OPT_TST(o
, PICKAXE_IGNORE_CASE
)
273 ? tolower_trans_tbl
: NULL
);
274 kwsincr(kws
, needle
, len
);
278 pickaxe(&diff_queued_diff
, o
, regexp
, kws
, has_changes
);
280 if (opts
& DIFF_PICKAXE_REGEX
)
287 void diffcore_pickaxe(struct diff_options
*o
)
289 /* Might want to warn when both S and G are on; I don't care... */
290 if (o
->pickaxe_opts
& DIFF_PICKAXE_KIND_G
)
291 diffcore_pickaxe_grep(o
);
293 diffcore_pickaxe_count(o
);