dir: use fspathncmp() in pl_hashmap_cmp()
[git/debian.git] / xdiff / xpatience.c
blob1a21c6a74b368cb094e20c708a43071c72558d7e
1 /*
2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003-2016 Davide Libenzi, Johannes E. Schindelin
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.
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.
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/>.
19 * Davide Libenzi <davidel@xmailserver.org>
22 #include "xinclude.h"
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.
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.
33 * Now, the algorithm tries to extend the set of common lines by growing
34 * the line ranges where the files have identical lines.
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.
41 #define NON_UNIQUE ULONG_MAX
44 * This is a hash mapping from line hash to line numbers in the first and
45 * second file.
47 struct hashmap {
48 int nr, alloc;
49 struct entry {
50 unsigned long hash;
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.
56 unsigned long line1, line2;
58 * "next" & "previous" are used for the longest common
59 * sequence;
60 * initially, "next" reflects only the order in file1.
62 struct entry *next, *previous;
65 * If 1, this entry can serve as an anchor. See
66 * Documentation/diff-options.txt for more information.
68 unsigned anchor : 1;
69 } *entries, *first, *last;
70 /* were common records found? */
71 unsigned long has_matches;
72 mmfile_t *file1, *file2;
73 xdfenv_t *env;
74 xpparam_t const *xpp;
77 static int is_anchor(xpparam_t const *xpp, const char *line)
79 int i;
80 for (i = 0; i < xpp->anchors_nr; i++) {
81 if (!strncmp(line, xpp->anchors[i], strlen(xpp->anchors[i])))
82 return 1;
84 return 0;
87 /* The argument "pass" is 1 for the first file, 2 for the second. */
88 static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
89 int pass)
91 xrecord_t **records = pass == 1 ?
92 map->env->xdf1.recs : map->env->xdf2.recs;
93 xrecord_t *record = records[line - 1];
95 * After xdl_prepare_env() (or more precisely, due to
96 * xdl_classify_record()), the "ha" member of the records (AKA lines)
97 * is _not_ the hash anymore, but a linearized version of it. In
98 * other words, the "ha" member is guaranteed to start with 0 and
99 * the second record's ha can only be 0 or 1, etc.
101 * So we multiply ha by 2 in the hope that the hashing was
102 * "unique enough".
104 int index = (int)((record->ha << 1) % map->alloc);
106 while (map->entries[index].line1) {
107 if (map->entries[index].hash != record->ha) {
108 if (++index >= map->alloc)
109 index = 0;
110 continue;
112 if (pass == 2)
113 map->has_matches = 1;
114 if (pass == 1 || map->entries[index].line2)
115 map->entries[index].line2 = NON_UNIQUE;
116 else
117 map->entries[index].line2 = line;
118 return;
120 if (pass == 2)
121 return;
122 map->entries[index].line1 = line;
123 map->entries[index].hash = record->ha;
124 map->entries[index].anchor = is_anchor(xpp, map->env->xdf1.recs[line - 1]->ptr);
125 if (!map->first)
126 map->first = map->entries + index;
127 if (map->last) {
128 map->last->next = map->entries + index;
129 map->entries[index].previous = map->last;
131 map->last = map->entries + index;
132 map->nr++;
136 * This function has to be called for each recursion into the inter-hunk
137 * parts, as previously non-unique lines can become unique when being
138 * restricted to a smaller part of the files.
140 * It is assumed that env has been prepared using xdl_prepare().
142 static int fill_hashmap(mmfile_t *file1, mmfile_t *file2,
143 xpparam_t const *xpp, xdfenv_t *env,
144 struct hashmap *result,
145 int line1, int count1, int line2, int count2)
147 result->file1 = file1;
148 result->file2 = file2;
149 result->xpp = xpp;
150 result->env = env;
152 /* We know exactly how large we want the hash map */
153 result->alloc = count1 * 2;
154 result->entries = (struct entry *)
155 xdl_malloc(result->alloc * sizeof(struct entry));
156 if (!result->entries)
157 return -1;
158 memset(result->entries, 0, result->alloc * sizeof(struct entry));
160 /* First, fill with entries from the first file */
161 while (count1--)
162 insert_record(xpp, line1++, result, 1);
164 /* Then search for matches in the second file */
165 while (count2--)
166 insert_record(xpp, line2++, result, 2);
168 return 0;
172 * Find the longest sequence with a smaller last element (meaning a smaller
173 * line2, as we construct the sequence with entries ordered by line1).
175 static int binary_search(struct entry **sequence, int longest,
176 struct entry *entry)
178 int left = -1, right = longest;
180 while (left + 1 < right) {
181 int middle = left + (right - left) / 2;
182 /* by construction, no two entries can be equal */
183 if (sequence[middle]->line2 > entry->line2)
184 right = middle;
185 else
186 left = middle;
188 /* return the index in "sequence", _not_ the sequence length */
189 return left;
193 * The idea is to start with the list of common unique lines sorted by
194 * the order in file1. For each of these pairs, the longest (partial)
195 * sequence whose last element's line2 is smaller is determined.
197 * For efficiency, the sequences are kept in a list containing exactly one
198 * item per sequence length: the sequence with the smallest last
199 * element (in terms of line2).
201 static int find_longest_common_sequence(struct hashmap *map, struct entry **res)
203 struct entry **sequence = xdl_malloc(map->nr * sizeof(struct entry *));
204 int longest = 0, i;
205 struct entry *entry;
208 * If not -1, this entry in sequence must never be overridden.
209 * Therefore, overriding entries before this has no effect, so
210 * do not do that either.
212 int anchor_i = -1;
214 if (!sequence)
215 return -1;
217 for (entry = map->first; entry; entry = entry->next) {
218 if (!entry->line2 || entry->line2 == NON_UNIQUE)
219 continue;
220 i = binary_search(sequence, longest, entry);
221 entry->previous = i < 0 ? NULL : sequence[i];
222 ++i;
223 if (i <= anchor_i)
224 continue;
225 sequence[i] = entry;
226 if (entry->anchor) {
227 anchor_i = i;
228 longest = anchor_i + 1;
229 } else if (i == longest) {
230 longest++;
234 /* No common unique lines were found */
235 if (!longest) {
236 *res = NULL;
237 xdl_free(sequence);
238 return 0;
241 /* Iterate starting at the last element, adjusting the "next" members */
242 entry = sequence[longest - 1];
243 entry->next = NULL;
244 while (entry->previous) {
245 entry->previous->next = entry;
246 entry = entry->previous;
248 *res = entry;
249 xdl_free(sequence);
250 return 0;
253 static int match(struct hashmap *map, int line1, int line2)
255 xrecord_t *record1 = map->env->xdf1.recs[line1 - 1];
256 xrecord_t *record2 = map->env->xdf2.recs[line2 - 1];
257 return record1->ha == record2->ha;
260 static int patience_diff(mmfile_t *file1, mmfile_t *file2,
261 xpparam_t const *xpp, xdfenv_t *env,
262 int line1, int count1, int line2, int count2);
264 static int walk_common_sequence(struct hashmap *map, struct entry *first,
265 int line1, int count1, int line2, int count2)
267 int end1 = line1 + count1, end2 = line2 + count2;
268 int next1, next2;
270 for (;;) {
271 /* Try to grow the line ranges of common lines */
272 if (first) {
273 next1 = first->line1;
274 next2 = first->line2;
275 while (next1 > line1 && next2 > line2 &&
276 match(map, next1 - 1, next2 - 1)) {
277 next1--;
278 next2--;
280 } else {
281 next1 = end1;
282 next2 = end2;
284 while (line1 < next1 && line2 < next2 &&
285 match(map, line1, line2)) {
286 line1++;
287 line2++;
290 /* Recurse */
291 if (next1 > line1 || next2 > line2) {
292 if (patience_diff(map->file1, map->file2,
293 map->xpp, map->env,
294 line1, next1 - line1,
295 line2, next2 - line2))
296 return -1;
299 if (!first)
300 return 0;
302 while (first->next &&
303 first->next->line1 == first->line1 + 1 &&
304 first->next->line2 == first->line2 + 1)
305 first = first->next;
307 line1 = first->line1 + 1;
308 line2 = first->line2 + 1;
310 first = first->next;
314 static int fall_back_to_classic_diff(struct hashmap *map,
315 int line1, int count1, int line2, int count2)
317 xpparam_t xpp;
319 memset(&xpp, 0, sizeof(xpp));
320 xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
322 return xdl_fall_back_diff(map->env, &xpp,
323 line1, count1, line2, count2);
327 * Recursively find the longest common sequence of unique lines,
328 * and if none was found, ask xdl_do_diff() to do the job.
330 * This function assumes that env was prepared with xdl_prepare_env().
332 static int patience_diff(mmfile_t *file1, mmfile_t *file2,
333 xpparam_t const *xpp, xdfenv_t *env,
334 int line1, int count1, int line2, int count2)
336 struct hashmap map;
337 struct entry *first;
338 int result = 0;
340 /* trivial case: one side is empty */
341 if (!count1) {
342 while(count2--)
343 env->xdf2.rchg[line2++ - 1] = 1;
344 return 0;
345 } else if (!count2) {
346 while(count1--)
347 env->xdf1.rchg[line1++ - 1] = 1;
348 return 0;
351 memset(&map, 0, sizeof(map));
352 if (fill_hashmap(file1, file2, xpp, env, &map,
353 line1, count1, line2, count2))
354 return -1;
356 /* are there any matching lines at all? */
357 if (!map.has_matches) {
358 while(count1--)
359 env->xdf1.rchg[line1++ - 1] = 1;
360 while(count2--)
361 env->xdf2.rchg[line2++ - 1] = 1;
362 xdl_free(map.entries);
363 return 0;
366 result = find_longest_common_sequence(&map, &first);
367 if (result)
368 goto out;
369 if (first)
370 result = walk_common_sequence(&map, first,
371 line1, count1, line2, count2);
372 else
373 result = fall_back_to_classic_diff(&map,
374 line1, count1, line2, count2);
375 out:
376 xdl_free(map.entries);
377 return result;
380 int xdl_do_patience_diff(mmfile_t *file1, mmfile_t *file2,
381 xpparam_t const *xpp, xdfenv_t *env)
383 return patience_diff(file1, file2, xpp, env,
384 1, env->xdf1.nrec, 1, env->xdf2.nrec);