Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 297 lines (265 sloc) 8.947 kB
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #include "cache.h"
5 #include "diff.h"
6 #include "diffcore.h"
7
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
8 static int should_break(struct diff_filespec *src,
9 struct diff_filespec *dst,
10 int break_score,
11 int *merge_score_p)
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
12 {
13 /* dst is recorded as a modification of src. Are they so
14 * different that we are better off recording this as a pair
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
15 * of delete and create?
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
16 *
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
17 * There are two criteria used in this algorithm. For the
18 * purposes of helping later rename/copy, we take both delete
19 * and insert into account and estimate the amount of "edit".
20 * If the edit is very large, we break this pair so that
21 * rename/copy can pick the pieces up to match with other
22 * files.
23 *
24 * On the other hand, we would want to ignore inserts for the
25 * pure "complete rewrite" detection. As long as most of the
26 * existing contents were removed from the file, it is a
27 * complete rewrite, and if sizable chunk from the original
28 * still remains in the result, it is not a rewrite. It does
29 * not matter how much or how little new material is added to
30 * the file.
31 *
32 * The score we leave for such a broken filepair uses the
33 * latter definition so that later clean-up stage can find the
34 * pieces that should not have been broken according to the
35 * latter definition after rename/copy runs, and merge the
36 * broken pair that have a score lower than given criteria
37 * back together. The break operation itself happens
38 * according to the former definition.
39 *
40 * The minimum_edit parameter tells us when to break (the
41 * amount of "edit" required for us to consider breaking the
42 * pair). We leave the amount of deletion in *merge_score_p
43 * when we return.
44 *
45 * The value we return is 1 if we want the pair to be broken,
46 * or 0 if we do not.
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
47 */
eb3a9dd @d0k Remove unused function scope local variables
d0k authored
48 unsigned long delta_size, max_size;
6dd4b66 @torvalds Fix diffcore-break total breakage
torvalds authored
49 unsigned long src_copied, literal_added, src_removed;
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
50
51 *merge_score_p = 0; /* assume no deletion --- "do not break"
52 * is the default.
53 */
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
54
b45563a @gitster rename: Break filepairs with different types.
gitster authored
55 if (S_ISREG(src->mode) != S_ISREG(dst->mode)) {
56 *merge_score_p = (int)MAX_SCORE;
57 return 1; /* even their types are different */
58 }
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
59
aeecd23 diffcore-break: micro-optimize by avoiding delta between identical fi…
Junio C Hamano authored
60 if (src->sha1_valid && dst->sha1_valid &&
a89fccd Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
David Rientjes authored
61 !hashcmp(src->sha1, dst->sha1))
aeecd23 diffcore-break: micro-optimize by avoiding delta between identical fi…
Junio C Hamano authored
62 return 0; /* they are the same */
63
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
64 if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
65 return 0; /* error but caught downstream */
66
6dd4b66 @torvalds Fix diffcore-break total breakage
torvalds authored
67 max_size = ((src->size > dst->size) ? src->size : dst->size);
68 if (max_size < MINIMUM_BREAK_SIZE)
0532a5e diffcore-break: do not break too small filepair.
Junio C Hamano authored
69 return 0; /* we do not break too small filepair */
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
70
d8c3d03 @gitster diffcore_count_changes: pass diffcore_filespec
gitster authored
71 if (diffcore_count_changes(src, dst,
8282de9 @peff diffcore-break: save cnt_data for other phases
peff authored
72 &src->cnt_data, &dst->cnt_data,
6541675 diffcore-rename: split out the delta counting code.
Junio C Hamano authored
73 0,
74 &src_copied, &literal_added))
75 return 0;
355e76a [PATCH] Tweak count-delta interface
Junio C Hamano authored
76
4d0f39c diffcore-break: similarity estimator fix.
Junio C Hamano authored
77 /* sanity */
78 if (src->size < src_copied)
79 src_copied = src->size;
80 if (dst->size < literal_added + src_copied) {
81 if (src_copied < dst->size)
82 literal_added = dst->size - src_copied;
83 else
84 literal_added = 0;
85 }
86 src_removed = src->size - src_copied;
87
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
88 /* Compute merge-score, which is "how much is removed
89 * from the source material". The clean-up stage will
90 * merge the surviving pair together if the score is
91 * less than the minimum, after rename/copy runs.
92 */
dc49cd7 @spearce Cast 64 bit off_t to 32 bit size_t
spearce authored
93 *merge_score_p = (int)(src_removed * MAX_SCORE / src->size);
6dd4b66 @torvalds Fix diffcore-break total breakage
torvalds authored
94 if (*merge_score_p > break_score)
95 return 1;
4d0f39c diffcore-break: similarity estimator fix.
Junio C Hamano authored
96
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
97 /* Extent of damage, which counts both inserts and
98 * deletes.
99 */
4d0f39c diffcore-break: similarity estimator fix.
Junio C Hamano authored
100 delta_size = src_removed + literal_added;
6dd4b66 @torvalds Fix diffcore-break total breakage
torvalds authored
101 if (delta_size * MAX_SCORE / max_size < break_score)
4d0f39c diffcore-break: similarity estimator fix.
Junio C Hamano authored
102 return 0;
103
104 /* If you removed a lot without adding new material, that is
105 * not really a rewrite.
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
106 */
4d0f39c diffcore-break: similarity estimator fix.
Junio C Hamano authored
107 if ((src->size * break_score < src_removed * MAX_SCORE) &&
108 (literal_added * 20 < src_removed) &&
109 (literal_added * 20 < src_copied))
110 return 0;
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
111
4d0f39c diffcore-break: similarity estimator fix.
Junio C Hamano authored
112 return 1;
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
113 }
114
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
115 void diffcore_break(int break_score)
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
116 {
117 struct diff_queue_struct *q = &diff_queued_diff;
118 struct diff_queue_struct outq;
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
119
120 /* When the filepair has this much edit (insert and delete),
121 * it is first considered to be a rewrite and broken into a
122 * create and delete filepair. This is to help breaking a
123 * file that had too much new stuff added, possibly from
124 * moving contents from another file, so that rename/copy can
125 * match it with the other file.
126 *
127 * int break_score; we reuse incoming parameter for this.
128 */
129
130 /* After a pair is broken according to break_score and
131 * subjected to rename/copy, both of them may survive intact,
132 * due to lack of suitable rename/copy peer. Or, the caller
133 * may be calling us without using rename/copy. When that
134 * happens, we merge the broken pieces back into one
135 * modification together if the pair did not have more than
136 * this much delete. For this computation, we do not take
137 * insert into account at all. If you start from a 100-line
138 * file and delete 97 lines of it, it does not matter if you
139 * add 27 lines to it to make a new 30-line file or if you add
140 * 997 lines to it to make a 1000-line file. Either way what
141 * you did was a rewrite of 97%. On the other hand, if you
142 * delete 3 lines, keeping 97 lines intact, it does not matter
143 * if you add 3 lines to it to make a new 100-line file or if
144 * you add 903 lines to it to make a new 1000-line file.
145 * Either way you did a lot of additions and not a rewrite.
146 * This merge happens to catch the latter case. A merge_score
147 * of 80% would be a good default value (a broken pair that
148 * has score lower than merge_score will be merged back
149 * together).
150 */
151 int merge_score;
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
152 int i;
153
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
154 /* See comment on DEFAULT_BREAK_SCORE and
155 * DEFAULT_MERGE_SCORE in diffcore.h
156 */
157 merge_score = (break_score >> 16) & 0xFFFF;
158 break_score = (break_score & 0xFFFF);
159
160 if (!break_score)
161 break_score = DEFAULT_BREAK_SCORE;
162 if (!merge_score)
163 merge_score = DEFAULT_MERGE_SCORE;
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
164
165 outq.nr = outq.alloc = 0;
166 outq.queue = NULL;
167
168 for (i = 0; i < q->nr; i++) {
169 struct diff_filepair *p = q->queue[i];
170 int score;
171
b45563a @gitster rename: Break filepairs with different types.
gitster authored
172 /*
173 * We deal only with in-place edit of blobs.
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
174 * We do not break anything else.
175 */
176 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two) &&
b45563a @gitster rename: Break filepairs with different types.
gitster authored
177 object_type(p->one->mode) == OBJ_BLOB &&
178 object_type(p->two->mode) == OBJ_BLOB &&
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
179 !strcmp(p->one->path, p->two->path)) {
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
180 if (should_break(p->one, p->two,
0532a5e diffcore-break: do not break too small filepair.
Junio C Hamano authored
181 break_score, &score)) {
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
182 /* Split this into delete and create */
183 struct diff_filespec *null_one, *null_two;
184 struct diff_filepair *dp;
185
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
186 /* Set score to 0 for the pair that
187 * needs to be merged back together
188 * should they survive rename/copy.
189 * Also we do not want to break very
190 * small files.
191 */
f78c79c [PATCH] diffcore-break.c: various fixes.
Junio C Hamano authored
192 if (score < merge_score)
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
193 score = 0;
194
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
195 /* deletion of one */
196 null_one = alloc_filespec(p->one->path);
197 dp = diff_queue(&outq, p->one, null_one);
198 dp->score = score;
199 dp->broken_pair = 1;
200
201 /* creation of two */
202 null_two = alloc_filespec(p->two->path);
203 dp = diff_queue(&outq, null_two, p->two);
204 dp->score = score;
205 dp->broken_pair = 1;
206
8282de9 @peff diffcore-break: save cnt_data for other phases
peff authored
207 diff_free_filespec_blob(p->one);
208 diff_free_filespec_blob(p->two);
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
209 free(p); /* not diff_free_filepair(), we are
210 * reusing one and two here.
211 */
212 continue;
213 }
214 }
f4f19fb @peff diffcore-break: free filespec data as we go
peff authored
215 diff_free_filespec_data(p->one);
216 diff_free_filespec_data(p->two);
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
217 diff_q(&outq, p);
218 }
219 free(q->queue);
220 *q = outq;
221
222 return;
223 }
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
224
225 static void merge_broken(struct diff_filepair *p,
226 struct diff_filepair *pp,
227 struct diff_queue_struct *outq)
228 {
229 /* p and pp are broken pairs we want to merge */
366175e [PATCH] Rework -B output.
Junio C Hamano authored
230 struct diff_filepair *c = p, *d = pp, *dp;
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
231 if (DIFF_FILE_VALID(p->one)) {
232 /* this must be a delete half */
233 d = p; c = pp;
234 }
235 /* Sanity check */
236 if (!DIFF_FILE_VALID(d->one))
237 die("internal error in merge #1");
238 if (DIFF_FILE_VALID(d->two))
239 die("internal error in merge #2");
240 if (DIFF_FILE_VALID(c->one))
241 die("internal error in merge #3");
242 if (!DIFF_FILE_VALID(c->two))
243 die("internal error in merge #4");
244
366175e [PATCH] Rework -B output.
Junio C Hamano authored
245 dp = diff_queue(outq, d->one, c->two);
246 dp->score = p->score;
19397b4 Revert "[PATCH] plug memory leak in diff.c::diff_free_filepair()"
Junio C Hamano authored
247 diff_free_filespec_data(d->two);
248 diff_free_filespec_data(c->one);
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
249 free(d);
250 free(c);
251 }
252
253 void diffcore_merge_broken(void)
254 {
255 struct diff_queue_struct *q = &diff_queued_diff;
256 struct diff_queue_struct outq;
257 int i, j;
258
259 outq.nr = outq.alloc = 0;
260 outq.queue = NULL;
261
262 for (i = 0; i < q->nr; i++) {
263 struct diff_filepair *p = q->queue[i];
264 if (!p)
265 /* we already merged this with its peer */
266 continue;
267 else if (p->broken_pair &&
268 !strcmp(p->one->path, p->two->path)) {
269 /* If the peer also survived rename/copy, then
270 * we merge them back together.
271 */
272 for (j = i + 1; j < q->nr; j++) {
273 struct diff_filepair *pp = q->queue[j];
274 if (pp->broken_pair &&
275 !strcmp(pp->one->path, pp->two->path) &&
276 !strcmp(p->one->path, pp->two->path)) {
277 /* Peer survived. Merge them */
278 merge_broken(p, pp, &outq);
279 q->queue[j] = NULL;
280 break;
281 }
282 }
283 if (q->nr <= j)
284 /* The peer did not survive, so we keep
285 * it in the output.
286 */
287 diff_q(&outq, p);
288 }
289 else
290 diff_q(&outq, p);
291 }
292 free(q->queue);
293 *q = outq;
294
295 return;
296 }
Something went wrong with that request. Please try again.