diffcore-pickaxe.c 6.13 KB
Newer Older
1 2
/*
 * Copyright (C) 2005 Junio C Hamano
3
 * Copyright (C) 2010 Google Inc.
4 5 6 7
 */
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
8
#include "xdiff-interface.h"
Fredrik K's avatar
Fredrik K committed
9
#include "kwset.h"
10

René Scharfe's avatar
René Scharfe committed
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
typedef int (*pickaxe_fn)(struct diff_filepair *p, struct diff_options *o, regex_t *regexp, kwset_t kws);

static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,
		    regex_t *regexp, kwset_t kws, pickaxe_fn fn)
{
	int i;
	struct diff_queue_struct outq;

	DIFF_QUEUE_CLEAR(&outq);

	if (o->pickaxe_opts & DIFF_PICKAXE_ALL) {
		/* Showing the whole changeset if needle exists */
		for (i = 0; i < q->nr; i++) {
			struct diff_filepair *p = q->queue[i];
			if (fn(p, o, regexp, kws))
				return; /* do not munge the queue */
		}

		/*
		 * Otherwise we will clear the whole queue by copying
		 * the empty outq at the end of this function, but
		 * first clear the current entries in the queue.
		 */
		for (i = 0; i < q->nr; i++)
			diff_free_filepair(q->queue[i]);
	} else {
		/* Showing only the filepairs that has the needle */
		for (i = 0; i < q->nr; i++) {
			struct diff_filepair *p = q->queue[i];
			if (fn(p, o, regexp, kws))
				diff_q(&outq, p);
			else
				diff_free_filepair(p);
		}
	}

	free(q->queue);
	*q = outq;
}

51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
struct diffgrep_cb {
	regex_t *regexp;
	int hit;
};

static void diffgrep_consume(void *priv, char *line, unsigned long len)
{
	struct diffgrep_cb *data = priv;
	regmatch_t regmatch;
	int hold;

	if (line[0] != '+' && line[0] != '-')
		return;
	if (data->hit)
		/*
		 * NEEDSWORK: we should have a way to terminate the
		 * caller early.
		 */
		return;
	/* Yuck -- line ought to be "const char *"! */
	hold = line[len];
	line[len] = '\0';
	data->hit = !regexec(data->regexp, line + 1, 1, &regmatch, 0);
	line[len] = hold;
}

static void fill_one(struct diff_filespec *one,
		     mmfile_t *mf, struct userdiff_driver **textconv)
{
	if (DIFF_FILE_VALID(one)) {
		*textconv = get_textconv(one);
		mf->size = fill_textconv(*textconv, one, &mf->ptr);
	} else {
		memset(mf, 0, sizeof(*mf));
	}
}

88 89
static int diff_grep(struct diff_filepair *p, struct diff_options *o,
		     regex_t *regexp, kwset_t kws)
90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
{
	regmatch_t regmatch;
	struct userdiff_driver *textconv_one = NULL;
	struct userdiff_driver *textconv_two = NULL;
	mmfile_t mf1, mf2;
	int hit;

	if (diff_unmodified_pair(p))
		return 0;

	fill_one(p->one, &mf1, &textconv_one);
	fill_one(p->two, &mf2, &textconv_two);

	if (!mf1.ptr) {
		if (!mf2.ptr)
			return 0; /* ignore unmerged */
		/* created "two" -- does it have what we are looking for? */
		hit = !regexec(regexp, p->two->data, 1, &regmatch, 0);
	} else if (!mf2.ptr) {
		/* removed "one" -- did it have what we are looking for? */
		hit = !regexec(regexp, p->one->data, 1, &regmatch, 0);
	} else {
		/*
		 * We have both sides; need to run textual diff and see if
		 * the pattern appears on added/deleted lines.
		 */
		struct diffgrep_cb ecbdata;
		xpparam_t xpp;
		xdemitconf_t xecfg;

		memset(&xpp, 0, sizeof(xpp));
		memset(&xecfg, 0, sizeof(xecfg));
		ecbdata.regexp = regexp;
		ecbdata.hit = 0;
		xecfg.ctxlen = o->context;
		xecfg.interhunkctxlen = o->interhunkcontext;
		xdi_diff_outf(&mf1, &mf2, diffgrep_consume, &ecbdata,
			      &xpp, &xecfg);
		hit = ecbdata.hit;
	}
	if (textconv_one)
		free(mf1.ptr);
	if (textconv_two)
		free(mf2.ptr);
	return hit;
}

static void diffcore_pickaxe_grep(struct diff_options *o)
{
René Scharfe's avatar
René Scharfe committed
139
	int err;
140
	regex_t regex;
141
	int cflags = REG_EXTENDED | REG_NEWLINE;
142

143 144 145 146
	if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE))
		cflags |= REG_ICASE;

	err = regcomp(&regex, o->pickaxe, cflags);
147 148 149 150 151 152 153
	if (err) {
		char errbuf[1024];
		regerror(err, &regex, errbuf, 1024);
		regfree(&regex);
		die("invalid log-grep regex: %s", errbuf);
	}

René Scharfe's avatar
René Scharfe committed
154
	pickaxe(&diff_queued_diff, o, &regex, NULL, diff_grep);
155

René Scharfe's avatar
René Scharfe committed
156
	regfree(&regex);
157 158
	return;
}
159

160
static unsigned int contains(struct diff_filespec *one, struct diff_options *o,
Fredrik K's avatar
Fredrik K committed
161
			     regex_t *regexp, kwset_t kws)
162
{
163
	unsigned int cnt;
164
	unsigned long sz;
165
	const char *data;
166
	if (!o->pickaxe[0])
167
		return 0;
168 169
	if (diff_populate_filespec(one, 0))
		return 0;
170

171 172
	sz = one->size;
	data = one->data;
173 174
	cnt = 0;

175 176 177 178
	if (regexp) {
		regmatch_t regmatch;
		int flags = 0;

179
		assert(data[sz] == '\0');
180 181
		while (*data && !regexec(regexp, data, 1, &regmatch, flags)) {
			flags |= REG_NOTBOL;
182 183 184
			data += regmatch.rm_eo;
			if (*data && regmatch.rm_so == regmatch.rm_eo)
				data++;
185 186
			cnt++;
		}
187 188

	} else { /* Classic exact string match */
189
		while (sz) {
190 191
			struct kwsmatch kwsm;
			size_t offset = kwsexec(kws, data, sz, &kwsm);
Fredrik K's avatar
Fredrik K committed
192 193
			const char *found;
			if (offset == -1)
194
				break;
Fredrik K's avatar
Fredrik K committed
195 196
			else
				found = data + offset;
197 198
			sz -= found - data + kwsm.size[0];
			data = found + kwsm.size[0];
199
			cnt++;
200
		}
201
	}
202
	diff_free_filespec_data(one);
203
	return cnt;
204 205
}

206 207
static int has_changes(struct diff_filepair *p, struct diff_options *o,
		       regex_t *regexp, kwset_t kws)
208 209 210 211 212
{
	if (!DIFF_FILE_VALID(p->one)) {
		if (!DIFF_FILE_VALID(p->two))
			return 0; /* ignore unmerged */
		/* created */
213
		return contains(p->two, o, regexp, kws) != 0;
214 215
	}
	if (!DIFF_FILE_VALID(p->two))
216
		return contains(p->one, o, regexp, kws) != 0;
217
	if (!diff_unmodified_pair(p)) {
218 219
		return contains(p->one, o, regexp, kws) !=
		       contains(p->two, o, regexp, kws);
220 221 222 223
	}
	return 0;
}

224
static void diffcore_pickaxe_count(struct diff_options *o)
225
{
226 227
	const char *needle = o->pickaxe;
	int opts = o->pickaxe_opts;
228
	unsigned long len = strlen(needle);
229
	regex_t regex, *regexp = NULL;
Fredrik K's avatar
Fredrik K committed
230
	kwset_t kws = NULL;
231

232 233 234 235 236 237 238 239 240 241 242
	if (opts & DIFF_PICKAXE_REGEX) {
		int err;
		err = regcomp(&regex, needle, REG_EXTENDED | REG_NEWLINE);
		if (err) {
			/* The POSIX.2 people are surely sick */
			char errbuf[1024];
			regerror(err, &regex, errbuf, 1024);
			regfree(&regex);
			die("invalid pickaxe regex: %s", errbuf);
		}
		regexp = &regex;
Fredrik K's avatar
Fredrik K committed
243
	} else {
244 245
		kws = kwsalloc(DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE)
			       ? tolower_trans_tbl : NULL);
Fredrik K's avatar
Fredrik K committed
246 247
		kwsincr(kws, needle, len);
		kwsprep(kws);
248 249
	}

René Scharfe's avatar
René Scharfe committed
250
	pickaxe(&diff_queued_diff, o, regexp, kws, has_changes);
René Scharfe's avatar
René Scharfe committed
251

252
	if (opts & DIFF_PICKAXE_REGEX)
253
		regfree(&regex);
Fredrik K's avatar
Fredrik K committed
254 255
	else
		kwsfree(kws);
256 257
	return;
}
258 259 260 261 262

void diffcore_pickaxe(struct diff_options *o)
{
	/* Might want to warn when both S and G are on; I don't care... */
	if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)
263
		diffcore_pickaxe_grep(o);
264
	else
265
		diffcore_pickaxe_count(o);
266
}