2 * Copyright (C) 2005 Junio C Hamano
3 * Copyright (C) 2010 Google Inc.
5 #include "git-compat-util.h"
8 #include "xdiff-interface.h"
14 typedef int (*pickaxe_fn
)(mmfile_t
*one
, mmfile_t
*two
,
15 struct diff_options
*o
,
16 regex_t
*regexp
, kwset_t kws
);
23 static int diffgrep_consume(void *priv
, char *line
, unsigned long len
)
25 struct diffgrep_cb
*data
= priv
;
28 if (line
[0] != '+' && line
[0] != '-')
31 BUG("Already matched in diffgrep_consume! Broken xdiff_emit_line_fn?");
32 if (!regexec_buf(data
->regexp
, line
+ 1, len
- 1, 1,
40 static int diff_grep(mmfile_t
*one
, mmfile_t
*two
,
41 struct diff_options
*o
,
42 regex_t
*regexp
, kwset_t kws UNUSED
)
44 struct diffgrep_cb ecbdata
;
50 * We have both sides; need to run textual diff and see if
51 * the pattern appears on added/deleted lines.
53 memset(&xpp
, 0, sizeof(xpp
));
54 memset(&xecfg
, 0, sizeof(xecfg
));
55 ecbdata
.regexp
= regexp
;
57 xecfg
.flags
= XDL_EMIT_NO_HUNK_HDR
;
58 xecfg
.ctxlen
= o
->context
;
59 xecfg
.interhunkctxlen
= o
->interhunkcontext
;
62 * An xdiff error might be our "data->hit" from above. See the
63 * comment for xdiff_emit_line_fn in xdiff-interface.h
65 ret
= xdi_diff_outf(one
, two
, NULL
, diffgrep_consume
,
66 &ecbdata
, &xpp
, &xecfg
);
74 static unsigned int contains(mmfile_t
*mf
, regex_t
*regexp
, kwset_t kws
,
78 unsigned long sz
= mf
->size
;
79 const char *data
= mf
->ptr
;
86 !regexec_buf(regexp
, data
, sz
, 1, ®match
, flags
)) {
88 data
+= regmatch
.rm_eo
;
90 if (sz
&& regmatch
.rm_so
== regmatch
.rm_eo
) {
96 if (limit
&& cnt
== limit
)
100 } else { /* Classic exact string match */
102 struct kwsmatch kwsm
;
103 size_t offset
= kwsexec(kws
, data
, sz
, &kwsm
);
106 sz
-= offset
+ kwsm
.size
[0];
107 data
+= offset
+ kwsm
.size
[0];
110 if (limit
&& cnt
== limit
)
117 static int has_changes(mmfile_t
*one
, mmfile_t
*two
,
118 struct diff_options
*o UNUSED
,
119 regex_t
*regexp
, kwset_t kws
)
121 unsigned int c1
= one
? contains(one
, regexp
, kws
, 0) : 0;
122 unsigned int c2
= two
? contains(two
, regexp
, kws
, c1
+ 1) : 0;
126 static int pickaxe_match(struct diff_filepair
*p
, struct diff_options
*o
,
127 regex_t
*regexp
, kwset_t kws
, pickaxe_fn fn
)
129 struct userdiff_driver
*textconv_one
= NULL
;
130 struct userdiff_driver
*textconv_two
= NULL
;
134 /* ignore unmerged */
135 if (!DIFF_FILE_VALID(p
->one
) && !DIFF_FILE_VALID(p
->two
))
139 return (DIFF_FILE_VALID(p
->one
) &&
140 oidset_contains(o
->objfind
, &p
->one
->oid
)) ||
141 (DIFF_FILE_VALID(p
->two
) &&
142 oidset_contains(o
->objfind
, &p
->two
->oid
));
145 if (o
->flags
.allow_textconv
) {
146 textconv_one
= get_textconv(o
->repo
, p
->one
);
147 textconv_two
= get_textconv(o
->repo
, p
->two
);
151 * If we have an unmodified pair, we know that the count will be the
152 * same and don't even have to load the blobs. Unless textconv is in
153 * play, _and_ we are using two different textconv filters (e.g.,
154 * because a pair is an exact rename with different textconv attributes
155 * for each side, which might generate different content).
157 if (textconv_one
== textconv_two
&& diff_unmodified_pair(p
))
160 if ((o
->pickaxe_opts
& DIFF_PICKAXE_KIND_G
) &&
162 ((!textconv_one
&& diff_filespec_is_binary(o
->repo
, p
->one
)) ||
163 (!textconv_two
&& diff_filespec_is_binary(o
->repo
, p
->two
))))
166 mf1
.size
= fill_textconv(o
->repo
, textconv_one
, p
->one
, &mf1
.ptr
);
167 mf2
.size
= fill_textconv(o
->repo
, textconv_two
, p
->two
, &mf2
.ptr
);
169 ret
= fn(&mf1
, &mf2
, o
, regexp
, kws
);
175 diff_free_filespec_data(p
->one
);
176 diff_free_filespec_data(p
->two
);
181 static void pickaxe(struct diff_queue_struct
*q
, struct diff_options
*o
,
182 regex_t
*regexp
, kwset_t kws
, pickaxe_fn fn
)
185 struct diff_queue_struct outq
= DIFF_QUEUE_INIT
;
187 if (o
->pickaxe_opts
& DIFF_PICKAXE_ALL
) {
188 /* Showing the whole changeset if needle exists */
189 for (i
= 0; i
< q
->nr
; i
++) {
190 struct diff_filepair
*p
= q
->queue
[i
];
191 if (pickaxe_match(p
, o
, regexp
, kws
, fn
))
192 return; /* do not munge the queue */
196 * Otherwise we will clear the whole queue by copying
197 * the empty outq at the end of this function, but
198 * first clear the current entries in the queue.
200 for (i
= 0; i
< q
->nr
; i
++)
201 diff_free_filepair(q
->queue
[i
]);
203 /* Showing only the filepairs that has the needle */
204 for (i
= 0; i
< q
->nr
; i
++) {
205 struct diff_filepair
*p
= q
->queue
[i
];
206 if (pickaxe_match(p
, o
, regexp
, kws
, fn
))
209 diff_free_filepair(p
);
217 static void regcomp_or_die(regex_t
*regex
, const char *needle
, int cflags
)
219 int err
= regcomp(regex
, needle
, cflags
);
221 /* The POSIX.2 people are surely sick */
223 regerror(err
, regex
, errbuf
, 1024);
224 die("invalid regex: %s", errbuf
);
228 void diffcore_pickaxe(struct diff_options
*o
)
230 const char *needle
= o
->pickaxe
;
231 int opts
= o
->pickaxe_opts
;
232 regex_t regex
, *regexp
= NULL
;
236 if (opts
& ~DIFF_PICKAXE_KIND_OBJFIND
&&
237 (!needle
|| !*needle
))
238 BUG("should have needle under -G or -S");
239 if (opts
& (DIFF_PICKAXE_REGEX
| DIFF_PICKAXE_KIND_G
)) {
240 int cflags
= REG_EXTENDED
| REG_NEWLINE
;
241 if (o
->pickaxe_opts
& DIFF_PICKAXE_IGNORE_CASE
)
243 regcomp_or_die(®ex
, needle
, cflags
);
246 if (opts
& DIFF_PICKAXE_KIND_G
)
248 else if (opts
& DIFF_PICKAXE_REGEX
)
252 * We don't need to check the combination of
253 * -G and --pickaxe-regex, by the time we get
254 * here diff.c has already died if they're
255 * combined. See the usage tests in
256 * t4209-log-pickaxe.sh.
259 } else if (opts
& DIFF_PICKAXE_KIND_S
) {
260 if (o
->pickaxe_opts
& DIFF_PICKAXE_IGNORE_CASE
&&
261 has_non_ascii(needle
)) {
262 struct strbuf sb
= STRBUF_INIT
;
263 int cflags
= REG_NEWLINE
| REG_ICASE
;
265 basic_regex_quote_buf(&sb
, needle
);
266 regcomp_or_die(®ex
, sb
.buf
, cflags
);
270 kws
= kwsalloc(o
->pickaxe_opts
& DIFF_PICKAXE_IGNORE_CASE
271 ? tolower_trans_tbl
: NULL
);
272 kwsincr(kws
, needle
, strlen(needle
));
276 } else if (opts
& DIFF_PICKAXE_KIND_OBJFIND
) {
279 BUG("unknown pickaxe_opts flag");
282 pickaxe(&diff_queued_diff
, o
, regexp
, kws
, fn
);