blob: 894a1ba6778df6f3536624e61ffb53b65c42f9cf [file] [log] [blame]
Bram Moolenaare828b762018-09-10 17:51:58 +02001/*
2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003-2016 Davide Libenzi, Johannes E. Schindelin
4 *
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
9 *
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
14 *
15 * You should have received a copy of the GNU Lesser General Public
16 * License along with this library; if not, see
17 * <http://www.gnu.org/licenses/>.
18 *
19 * Davide Libenzi <davidel@xmailserver.org>
20 *
21 */
22#include "xinclude.h"
Bram Moolenaare828b762018-09-10 17:51:58 +020023
24/*
25 * The basic idea of patience diff is to find lines that are unique in
26 * both files. These are intuitively the ones that we want to see as
27 * common lines.
28 *
29 * The maximal ordered sequence of such line pairs (where ordered means
30 * that the order in the sequence agrees with the order of the lines in
31 * both files) naturally defines an initial set of common lines.
32 *
33 * Now, the algorithm tries to extend the set of common lines by growing
34 * the line ranges where the files have identical lines.
35 *
36 * Between those common lines, the patience diff algorithm is applied
37 * recursively, until no unique line pairs can be found; these line ranges
38 * are handled by the well-known Myers algorithm.
39 */
40
41#define NON_UNIQUE ULONG_MAX
42
43/*
44 * This is a hash mapping from line hash to line numbers in the first and
45 * second file.
46 */
47struct hashmap {
48 int nr, alloc;
49 struct entry {
50 unsigned long hash;
51 /*
52 * 0 = unused entry, 1 = first line, 2 = second, etc.
53 * line2 is NON_UNIQUE if the line is not unique
54 * in either the first or the second file.
55 */
56 unsigned long line1, line2;
57 /*
58 * "next" & "previous" are used for the longest common
59 * sequence;
60 * initially, "next" reflects only the order in file1.
61 */
62 struct entry *next, *previous;
63
64 /*
65 * If 1, this entry can serve as an anchor. See
66 * Documentation/diff-options.txt for more information.
67 */
68 unsigned anchor : 1;
69 } *entries, *first, *last;
Christian Brabandtba02e472021-08-31 20:46:39 +020070 /* were common records found? */
Bram Moolenaare828b762018-09-10 17:51:58 +020071 unsigned long has_matches;
Bram Moolenaare828b762018-09-10 17:51:58 +020072 xdfenv_t *env;
73 xpparam_t const *xpp;
74};
75
76static int is_anchor(xpparam_t const *xpp, const char *line)
77{
Christian Brabandtba02e472021-08-31 20:46:39 +020078 int i;
79 for (i = 0; i < (int)xpp->anchors_nr; i++) {
Bram Moolenaare828b762018-09-10 17:51:58 +020080 if (!strncmp(line, xpp->anchors[i], strlen(xpp->anchors[i])))
81 return 1;
82 }
83 return 0;
84}
85
Christian Brabandtba02e472021-08-31 20:46:39 +020086/* The argument "pass" is 1 for the first file, 2 for the second. */
Bram Moolenaare828b762018-09-10 17:51:58 +020087static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
88 int pass)
89{
90 xrecord_t **records = pass == 1 ?
91 map->env->xdf1.recs : map->env->xdf2.recs;
Christian Brabandtba02e472021-08-31 20:46:39 +020092 xrecord_t *record = records[line - 1];
Bram Moolenaare828b762018-09-10 17:51:58 +020093 /*
94 * After xdl_prepare_env() (or more precisely, due to
95 * xdl_classify_record()), the "ha" member of the records (AKA lines)
96 * is _not_ the hash anymore, but a linearized version of it. In
97 * other words, the "ha" member is guaranteed to start with 0 and
98 * the second record's ha can only be 0 or 1, etc.
99 *
100 * So we multiply ha by 2 in the hope that the hashing was
101 * "unique enough".
102 */
103 int index = (int)((record->ha << 1) % map->alloc);
104
105 while (map->entries[index].line1) {
Christian Brabandtba02e472021-08-31 20:46:39 +0200106 if (map->entries[index].hash != record->ha) {
Bram Moolenaare828b762018-09-10 17:51:58 +0200107 if (++index >= map->alloc)
108 index = 0;
109 continue;
110 }
111 if (pass == 2)
112 map->has_matches = 1;
113 if (pass == 1 || map->entries[index].line2)
114 map->entries[index].line2 = NON_UNIQUE;
115 else
116 map->entries[index].line2 = line;
117 return;
118 }
119 if (pass == 2)
120 return;
121 map->entries[index].line1 = line;
122 map->entries[index].hash = record->ha;
123 map->entries[index].anchor = is_anchor(xpp, map->env->xdf1.recs[line - 1]->ptr);
124 if (!map->first)
125 map->first = map->entries + index;
126 if (map->last) {
127 map->last->next = map->entries + index;
128 map->entries[index].previous = map->last;
129 }
130 map->last = map->entries + index;
131 map->nr++;
132}
133
134/*
135 * This function has to be called for each recursion into the inter-hunk
136 * parts, as previously non-unique lines can become unique when being
137 * restricted to a smaller part of the files.
138 *
139 * It is assumed that env has been prepared using xdl_prepare().
140 */
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000141static int fill_hashmap(xpparam_t const *xpp, xdfenv_t *env,
Bram Moolenaare828b762018-09-10 17:51:58 +0200142 struct hashmap *result,
143 int line1, int count1, int line2, int count2)
144{
Bram Moolenaare828b762018-09-10 17:51:58 +0200145 result->xpp = xpp;
146 result->env = env;
147
Christian Brabandtba02e472021-08-31 20:46:39 +0200148 /* We know exactly how large we want the hash map */
Bram Moolenaare828b762018-09-10 17:51:58 +0200149 result->alloc = count1 * 2;
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000150 if (!XDL_CALLOC_ARRAY(result->entries, result->alloc))
Bram Moolenaare828b762018-09-10 17:51:58 +0200151 return -1;
Bram Moolenaare828b762018-09-10 17:51:58 +0200152
Christian Brabandtba02e472021-08-31 20:46:39 +0200153 /* First, fill with entries from the first file */
Bram Moolenaare828b762018-09-10 17:51:58 +0200154 while (count1--)
155 insert_record(xpp, line1++, result, 1);
156
Christian Brabandtba02e472021-08-31 20:46:39 +0200157 /* Then search for matches in the second file */
Bram Moolenaare828b762018-09-10 17:51:58 +0200158 while (count2--)
159 insert_record(xpp, line2++, result, 2);
160
161 return 0;
162}
163
164/*
165 * Find the longest sequence with a smaller last element (meaning a smaller
166 * line2, as we construct the sequence with entries ordered by line1).
167 */
168static int binary_search(struct entry **sequence, int longest,
169 struct entry *entry)
170{
171 int left = -1, right = longest;
172
173 while (left + 1 < right) {
174 int middle = left + (right - left) / 2;
Christian Brabandtba02e472021-08-31 20:46:39 +0200175 /* by construction, no two entries can be equal */
Bram Moolenaare828b762018-09-10 17:51:58 +0200176 if (sequence[middle]->line2 > entry->line2)
177 right = middle;
178 else
179 left = middle;
180 }
Christian Brabandtba02e472021-08-31 20:46:39 +0200181 /* return the index in "sequence", _not_ the sequence length */
Bram Moolenaare828b762018-09-10 17:51:58 +0200182 return left;
183}
184
185/*
186 * The idea is to start with the list of common unique lines sorted by
187 * the order in file1. For each of these pairs, the longest (partial)
188 * sequence whose last element's line2 is smaller is determined.
189 *
190 * For efficiency, the sequences are kept in a list containing exactly one
191 * item per sequence length: the sequence with the smallest last
192 * element (in terms of line2).
193 */
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000194static int find_longest_common_sequence(struct hashmap *map, struct entry **res)
Bram Moolenaare828b762018-09-10 17:51:58 +0200195{
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000196 struct entry **sequence;
Bram Moolenaare828b762018-09-10 17:51:58 +0200197 int longest = 0, i;
198 struct entry *entry;
Christian Brabandtba02e472021-08-31 20:46:39 +0200199
Bram Moolenaare828b762018-09-10 17:51:58 +0200200 /*
201 * If not -1, this entry in sequence must never be overridden.
202 * Therefore, overriding entries before this has no effect, so
203 * do not do that either.
204 */
205 int anchor_i = -1;
206
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000207 if (!XDL_ALLOC_ARRAY(sequence, map->nr))
208 return -1;
Bram Moolenaar5c6f5742018-09-13 17:32:07 +0200209
Bram Moolenaare828b762018-09-10 17:51:58 +0200210 for (entry = map->first; entry; entry = entry->next) {
211 if (!entry->line2 || entry->line2 == NON_UNIQUE)
212 continue;
213 i = binary_search(sequence, longest, entry);
214 entry->previous = i < 0 ? NULL : sequence[i];
215 ++i;
216 if (i <= anchor_i)
217 continue;
218 sequence[i] = entry;
219 if (entry->anchor) {
220 anchor_i = i;
221 longest = anchor_i + 1;
222 } else if (i == longest) {
223 longest++;
224 }
225 }
226
Christian Brabandtba02e472021-08-31 20:46:39 +0200227 /* No common unique lines were found */
Bram Moolenaare828b762018-09-10 17:51:58 +0200228 if (!longest) {
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000229 *res = NULL;
Bram Moolenaare828b762018-09-10 17:51:58 +0200230 xdl_free(sequence);
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000231 return 0;
Bram Moolenaare828b762018-09-10 17:51:58 +0200232 }
233
Christian Brabandtba02e472021-08-31 20:46:39 +0200234 /* Iterate starting at the last element, adjusting the "next" members */
Bram Moolenaare828b762018-09-10 17:51:58 +0200235 entry = sequence[longest - 1];
236 entry->next = NULL;
237 while (entry->previous) {
238 entry->previous->next = entry;
239 entry = entry->previous;
240 }
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000241 *res = entry;
Bram Moolenaare828b762018-09-10 17:51:58 +0200242 xdl_free(sequence);
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000243 return 0;
Bram Moolenaare828b762018-09-10 17:51:58 +0200244}
245
246static int match(struct hashmap *map, int line1, int line2)
247{
248 xrecord_t *record1 = map->env->xdf1.recs[line1 - 1];
249 xrecord_t *record2 = map->env->xdf2.recs[line2 - 1];
Christian Brabandtba02e472021-08-31 20:46:39 +0200250 return record1->ha == record2->ha;
Bram Moolenaare828b762018-09-10 17:51:58 +0200251}
252
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000253static int patience_diff(xpparam_t const *xpp, xdfenv_t *env,
Bram Moolenaare828b762018-09-10 17:51:58 +0200254 int line1, int count1, int line2, int count2);
255
256static int walk_common_sequence(struct hashmap *map, struct entry *first,
257 int line1, int count1, int line2, int count2)
258{
259 int end1 = line1 + count1, end2 = line2 + count2;
260 int next1, next2;
261
262 for (;;) {
Christian Brabandtba02e472021-08-31 20:46:39 +0200263 /* Try to grow the line ranges of common lines */
Bram Moolenaare828b762018-09-10 17:51:58 +0200264 if (first) {
265 next1 = first->line1;
266 next2 = first->line2;
267 while (next1 > line1 && next2 > line2 &&
268 match(map, next1 - 1, next2 - 1)) {
269 next1--;
270 next2--;
271 }
272 } else {
273 next1 = end1;
274 next2 = end2;
275 }
276 while (line1 < next1 && line2 < next2 &&
277 match(map, line1, line2)) {
278 line1++;
279 line2++;
280 }
281
Christian Brabandtba02e472021-08-31 20:46:39 +0200282 /* Recurse */
Bram Moolenaare828b762018-09-10 17:51:58 +0200283 if (next1 > line1 || next2 > line2) {
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000284 if (patience_diff(map->xpp, map->env,
Bram Moolenaare828b762018-09-10 17:51:58 +0200285 line1, next1 - line1,
286 line2, next2 - line2))
287 return -1;
288 }
289
290 if (!first)
291 return 0;
292
293 while (first->next &&
294 first->next->line1 == first->line1 + 1 &&
295 first->next->line2 == first->line2 + 1)
296 first = first->next;
297
298 line1 = first->line1 + 1;
299 line2 = first->line2 + 1;
300
301 first = first->next;
302 }
303}
304
305static int fall_back_to_classic_diff(struct hashmap *map,
306 int line1, int count1, int line2, int count2)
307{
308 xpparam_t xpp;
Christian Brabandtba02e472021-08-31 20:46:39 +0200309
310 memset(&xpp, 0, sizeof(xpp));
Bram Moolenaare828b762018-09-10 17:51:58 +0200311 xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
312
313 return xdl_fall_back_diff(map->env, &xpp,
314 line1, count1, line2, count2);
315}
316
317/*
318 * Recursively find the longest common sequence of unique lines,
319 * and if none was found, ask xdl_do_diff() to do the job.
320 *
321 * This function assumes that env was prepared with xdl_prepare_env().
322 */
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000323static int patience_diff(xpparam_t const *xpp, xdfenv_t *env,
Bram Moolenaare828b762018-09-10 17:51:58 +0200324 int line1, int count1, int line2, int count2)
325{
326 struct hashmap map;
327 struct entry *first;
328 int result = 0;
329
Christian Brabandtba02e472021-08-31 20:46:39 +0200330 /* trivial case: one side is empty */
Bram Moolenaare828b762018-09-10 17:51:58 +0200331 if (!count1) {
332 while(count2--)
333 env->xdf2.rchg[line2++ - 1] = 1;
334 return 0;
335 } else if (!count2) {
336 while(count1--)
337 env->xdf1.rchg[line1++ - 1] = 1;
338 return 0;
339 }
340
341 memset(&map, 0, sizeof(map));
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000342 if (fill_hashmap(xpp, env, &map,
Bram Moolenaare828b762018-09-10 17:51:58 +0200343 line1, count1, line2, count2))
344 return -1;
345
Christian Brabandtba02e472021-08-31 20:46:39 +0200346 /* are there any matching lines at all? */
Bram Moolenaare828b762018-09-10 17:51:58 +0200347 if (!map.has_matches) {
348 while(count1--)
349 env->xdf1.rchg[line1++ - 1] = 1;
350 while(count2--)
351 env->xdf2.rchg[line2++ - 1] = 1;
352 xdl_free(map.entries);
353 return 0;
354 }
355
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000356 result = find_longest_common_sequence(&map, &first);
357 if (result)
358 goto out;
Bram Moolenaare828b762018-09-10 17:51:58 +0200359 if (first)
360 result = walk_common_sequence(&map, first,
361 line1, count1, line2, count2);
362 else
363 result = fall_back_to_classic_diff(&map,
364 line1, count1, line2, count2);
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000365 out:
Bram Moolenaare828b762018-09-10 17:51:58 +0200366 xdl_free(map.entries);
367 return result;
368}
369
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000370int xdl_do_patience_diff(xpparam_t const *xpp, xdfenv_t *env)
Bram Moolenaare828b762018-09-10 17:51:58 +0200371{
Yee Cheng Chin5fedb8a2023-03-20 17:30:52 +0000372 return patience_diff(xpp, env, 1, env->xdf1.nrec, 1, env->xdf2.nrec);
Bram Moolenaare828b762018-09-10 17:51:58 +0200373}