summaryrefslogtreecommitdiff
path: root/diff-helper.c
blob: 3ef57060d62054365895ff592ef4c3bd9d54fe17 (plain)
1
2
3
4
5
6
7
8
9
10
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
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
88
89
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
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
/*
 * Copyright (C) 2005 Junio C Hamano
 */
#include <limits.h>
#include "cache.h"
#include "strbuf.h"
#include "diff.h"
 
static int matches_pathspec(const char *name, const char **spec, int cnt)
{
	int i;
	int namelen = strlen(name);
	for (i = 0; i < cnt; i++) {
		int speclen = strlen(spec[i]);
		if (! strncmp(spec[i], name, speclen) &&
		    speclen <= namelen &&
		    (name[speclen] == 0 ||
		     name[speclen] == '/'))
			return 1;
	}
	return 0;
}
 
static int detect_rename = 0;
 
/*
 * We do not detect circular renames.  Just hold created and deleted
 * entries and later attempt to match them up.  If they do not match,
 * then spit them out as deletes or creates as original.
 */
 
static struct diff_spec_hold {
	struct diff_spec_hold *next;
	struct diff_spec_hold *matched;
	struct diff_spec old, new;
	char path[1];
} *createdfile, *deletedfile;
 
static void hold_spec(const char *path,
		      struct diff_spec *old, struct diff_spec *new)
{
	struct diff_spec_hold **list, *elem;
	list = (! old->file_valid) ? &createdfile : &deletedfile;
	elem = xmalloc(sizeof(*elem) + strlen(path));
	strcpy(elem->path, path);
	elem->next = *list;
	*list = elem;
	elem->old = *old;
	elem->new = *new;
	elem->matched = 0;
}
 
#define MINIMUM_SCORE 7000
int estimate_similarity(struct diff_spec *one, struct diff_spec *two)
{
	/* Return how similar they are, representing the score as an
	 * integer between 0 and 10000.
	 *
	 * This version is very dumb and detects exact matches only.
	 * Wnen Nico's delta stuff gets in, I'll use the delta
	 * algorithm to estimate the similarity score in core.
	 */
 
	if (one->sha1_valid && two->sha1_valid &&
	    !memcmp(one->blob_sha1, two->blob_sha1, 20))
		return 10000;
	return 0;
}
 
static void flush_renames(const char **spec, int cnt, int reverse)
{
	struct diff_spec_hold *rename_src, *rename_dst, *elem;
	struct diff_spec_hold *leftover = NULL;
	int score, best_score;
 
	while (createdfile) {
		rename_dst = createdfile;
		createdfile = rename_dst->next;
		best_score = MINIMUM_SCORE;
		rename_src = NULL;
		for (elem = deletedfile;
		     elem;
		     elem = elem->next) {
			if (elem->matched)
				continue;
			score = estimate_similarity(&elem->old,
						    &rename_dst->new);
			if (best_score < score) {
				rename_src = elem;
				best_score = score;
			}
		}
		if (rename_src) {
			rename_src->matched = rename_dst;
			rename_dst->matched = rename_src;
 
			if (!cnt ||
			    matches_pathspec(rename_src->path, spec, cnt) ||
			    matches_pathspec(rename_dst->path, spec, cnt)) {
				if (reverse)
					run_external_diff(rename_dst->path,
							  rename_src->path,
							  &rename_dst->new,
							  &rename_src->old);
				else
					run_external_diff(rename_src->path,
							  rename_dst->path,
							  &rename_src->old,
							  &rename_dst->new);
			}
		}
		else {
			rename_dst->next = leftover;
			leftover = rename_dst;
		}
	}
 
	/* unmatched deletes */
	for (elem = deletedfile; elem; elem = elem->next) {
		if (elem->matched)
			continue;
		if (!cnt ||
		    matches_pathspec(elem->path, spec, cnt)) {
			if (reverse)
				run_external_diff(elem->path, NULL,
						  &elem->new, &elem->old);
			else
				run_external_diff(elem->path, NULL,
						  &elem->old, &elem->new);
		}
	}
 
	/* unmatched creates */
	for (elem = leftover; elem; elem = elem->next) {
		if (!cnt ||
		    matches_pathspec(elem->path, spec, cnt)) {
			if (reverse)
				run_external_diff(elem->path, NULL,
						  &elem->new, &elem->old);
			else
				run_external_diff(elem->path, NULL,
						  &elem->old, &elem->new);
		}
	}
}
 
static int parse_oneside_change(const char *cp, struct diff_spec *one,
				char *path)
{
	int ch;
 
	one->file_valid = one->sha1_valid = 1;
	one->mode = 0;
	while ((ch = *cp) && '0' <= ch && ch <= '7') {
		one->mode = (one->mode << 3) | (ch - '0');
		cp++;
	}
 
	if (strncmp(cp, "\tblob\t", 6))
		return -1;
	cp += 6;
	if (get_sha1_hex(cp, one->blob_sha1))
		return -1;
	cp += 40;
	if (*cp++ != '\t')
		return -1;
	strcpy(path, cp);
	return 0;
}
 
static int parse_diff_raw_output(const char *buf,
				 const char **spec, int cnt, int reverse)
{
	struct diff_spec old, new;
	char path[PATH_MAX];
	const char *cp = buf;
	int ch;
 
	switch (*cp++) {
	case 'U':
		if (!cnt || matches_pathspec(cp + 1, spec, cnt))
			diff_unmerge(cp + 1);
		return 0;
	case '+':
		old.file_valid = 0;
		parse_oneside_change(cp, &new, path);
		break;
	case '-':
		new.file_valid = 0;
		parse_oneside_change(cp, &old, path);
		break;
	case '*':
		old.file_valid = old.sha1_valid =
			new.file_valid = new.sha1_valid = 1;
		old.mode = new.mode = 0;
		while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
			old.mode = (old.mode << 3) | (ch - '0');
			cp++;
		}
		if (strncmp(cp, "->", 2))
			return -1;
		cp += 2;
		while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
			new.mode = (new.mode << 3) | (ch - '0');
			cp++;
		}
		if (strncmp(cp, "\tblob\t", 6))
			return -1;
		cp += 6;
		if (get_sha1_hex(cp, old.blob_sha1))
			return -1;
		cp += 40;
		if (strncmp(cp, "->", 2))
			return -1;
		cp += 2;
		if (get_sha1_hex(cp, new.blob_sha1))
			return -1;
		cp += 40;
		if (*cp++ != '\t')
			return -1;
		strcpy(path, cp);
		break;
	default:
		return -1;
	}
 
	if (detect_rename && old.file_valid != new.file_valid) {
		/* hold these */
		hold_spec(path, &old, &new);
		return 0;
	}
 
	if (!cnt || matches_pathspec(path, spec, cnt)) {
		if (reverse)
			run_external_diff(path, NULL, &new, &old);
		else
			run_external_diff(path, NULL, &old, &new);
	}
	return 0;
}
 
static const char *diff_helper_usage =
	"git-diff-helper [-r] [-R] [-z] paths...";
 
int main(int ac, const char **av) {
	struct strbuf sb;
	int reverse = 0;
	int line_termination = '\n';
 
	strbuf_init(&sb);
 
	while (1 < ac && av[1][0] == '-') {
		if (av[1][1] == 'R')
			reverse = 1;
		else if (av[1][1] == 'z')
			line_termination = 0;
		else if (av[1][1] == 'r')
			detect_rename = 1;
		else
			usage(diff_helper_usage);
		ac--; av++;
	}
	/* the remaining parameters are paths patterns */
 
	while (1) {
		int status;
		read_line(&sb, stdin, line_termination);
		if (sb.eof)
			break;
		status = parse_diff_raw_output(sb.buf, av+1, ac-1, reverse);
		if (status)
			fprintf(stderr, "cannot parse %s\n", sb.buf);
	}
 
	if (detect_rename)
		flush_renames(av+1, ac-1, reverse);
	return 0;
}