2 40fa9110 2020-10-20 neels * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 40fa9110 2020-10-20 neels * Permission to use, copy, modify, and distribute this software for any
5 40fa9110 2020-10-20 neels * purpose with or without fee is hereby granted, provided that the above
6 40fa9110 2020-10-20 neels * copyright notice and this permission notice appear in all copies.
8 40fa9110 2020-10-20 neels * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 40fa9110 2020-10-20 neels * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 40fa9110 2020-10-20 neels * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 40fa9110 2020-10-20 neels * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 40fa9110 2020-10-20 neels * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 40fa9110 2020-10-20 neels * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 40fa9110 2020-10-20 neels * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 40fa9110 2020-10-20 neels #include <sys/queue.h>
18 40fa9110 2020-10-20 neels #include <sys/stat.h>
20 40fa9110 2020-10-20 neels #include <stdbool.h>
21 40fa9110 2020-10-20 neels #include <stdio.h>
22 40fa9110 2020-10-20 neels #include <stdlib.h>
23 40fa9110 2020-10-20 neels #include <string.h>
24 40fa9110 2020-10-20 neels #include <limits.h>
25 40fa9110 2020-10-20 neels #include <sha1.h>
26 40fa9110 2020-10-20 neels #include <zlib.h>
28 40fa9110 2020-10-20 neels #include "got_object.h"
29 40fa9110 2020-10-20 neels #include "got_repository.h"
30 40fa9110 2020-10-20 neels #include "got_error.h"
31 40fa9110 2020-10-20 neels #include "got_diff.h"
32 40fa9110 2020-10-20 neels #include "got_opentemp.h"
33 40fa9110 2020-10-20 neels #include "got_path.h"
34 40fa9110 2020-10-20 neels #include "got_cancel.h"
35 40fa9110 2020-10-20 neels #include "got_worktree.h"
37 40fa9110 2020-10-20 neels #include "got_lib_diff.h"
38 40fa9110 2020-10-20 neels #include "got_lib_delta.h"
39 40fa9110 2020-10-20 neels #include "got_lib_inflate.h"
40 40fa9110 2020-10-20 neels #include "got_lib_object.h"
42 40fa9110 2020-10-20 neels static const struct got_error *
43 40fa9110 2020-10-20 neels add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
47 40fa9110 2020-10-20 neels p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
48 40fa9110 2020-10-20 neels if (p == NULL)
49 40fa9110 2020-10-20 neels return got_error_from_errno("reallocarray");
50 40fa9110 2020-10-20 neels *line_offsets = p;
51 40fa9110 2020-10-20 neels (*line_offsets)[*nlines] = off;
52 40fa9110 2020-10-20 neels (*nlines)++;
53 40fa9110 2020-10-20 neels return NULL;
56 40fa9110 2020-10-20 neels static const struct got_error *
57 40fa9110 2020-10-20 neels diff_blobs(off_t **line_offsets, size_t *nlines,
58 40fa9110 2020-10-20 neels struct got_diffreg_result **resultp, struct got_blob_object *blob1,
59 40fa9110 2020-10-20 neels struct got_blob_object *blob2,
60 40fa9110 2020-10-20 neels const char *label1, const char *label2, mode_t mode1, mode_t mode2,
61 40fa9110 2020-10-20 neels int diff_context, int ignore_whitespace, FILE *outfile)
63 40fa9110 2020-10-20 neels const struct got_error *err = NULL, *free_err;
64 40fa9110 2020-10-20 neels FILE *f1 = NULL, *f2 = NULL;
65 40fa9110 2020-10-20 neels char hex1[SHA1_DIGEST_STRING_LENGTH];
66 40fa9110 2020-10-20 neels char hex2[SHA1_DIGEST_STRING_LENGTH];
67 40fa9110 2020-10-20 neels char *idstr1 = NULL, *idstr2 = NULL;
68 40fa9110 2020-10-20 neels size_t size1, size2;
69 40fa9110 2020-10-20 neels struct got_diffreg_result *result;
70 40fa9110 2020-10-20 neels off_t outoff = 0;
73 40fa9110 2020-10-20 neels if (line_offsets && *line_offsets && *nlines > 0)
74 40fa9110 2020-10-20 neels outoff = (*line_offsets)[*nlines - 1];
76 40fa9110 2020-10-20 neels if (resultp)
77 40fa9110 2020-10-20 neels *resultp = NULL;
79 40fa9110 2020-10-20 neels if (blob1) {
80 40fa9110 2020-10-20 neels f1 = got_opentemp();
81 40fa9110 2020-10-20 neels if (f1 == NULL)
82 40fa9110 2020-10-20 neels return got_error_from_errno("got_opentemp");
85 40fa9110 2020-10-20 neels if (blob2) {
86 40fa9110 2020-10-20 neels f2 = got_opentemp();
87 40fa9110 2020-10-20 neels if (f2 == NULL) {
88 40fa9110 2020-10-20 neels err = got_error_from_errno("got_opentemp");
89 40fa9110 2020-10-20 neels fclose(f1);
90 40fa9110 2020-10-20 neels return err;
95 40fa9110 2020-10-20 neels if (blob1) {
96 40fa9110 2020-10-20 neels idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
97 40fa9110 2020-10-20 neels err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
100 40fa9110 2020-10-20 neels goto done;
102 40fa9110 2020-10-20 neels idstr1 = "/dev/null";
104 40fa9110 2020-10-20 neels size2 = 0;
105 40fa9110 2020-10-20 neels if (blob2) {
106 40fa9110 2020-10-20 neels idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
107 40fa9110 2020-10-20 neels err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
110 40fa9110 2020-10-20 neels goto done;
112 40fa9110 2020-10-20 neels idstr2 = "/dev/null";
114 40fa9110 2020-10-20 neels if (outfile) {
115 40fa9110 2020-10-20 neels char *modestr1 = NULL, *modestr2 = NULL;
116 40fa9110 2020-10-20 neels int modebits;
117 40fa9110 2020-10-20 neels if (mode1 && mode1 != mode2) {
118 40fa9110 2020-10-20 neels if (S_ISLNK(mode1))
119 40fa9110 2020-10-20 neels modebits = S_IFLNK;
121 40fa9110 2020-10-20 neels modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
122 40fa9110 2020-10-20 neels if (asprintf(&modestr1, " (mode %o)",
123 40fa9110 2020-10-20 neels mode1 & modebits) == -1) {
124 40fa9110 2020-10-20 neels err = got_error_from_errno("asprintf");
125 40fa9110 2020-10-20 neels goto done;
128 40fa9110 2020-10-20 neels if (mode2 && mode1 != mode2) {
129 40fa9110 2020-10-20 neels if (S_ISLNK(mode2))
130 40fa9110 2020-10-20 neels modebits = S_IFLNK;
132 40fa9110 2020-10-20 neels modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
133 40fa9110 2020-10-20 neels if (asprintf(&modestr2, " (mode %o)",
134 40fa9110 2020-10-20 neels mode2 & modebits) == -1) {
135 40fa9110 2020-10-20 neels err = got_error_from_errno("asprintf");
136 40fa9110 2020-10-20 neels goto done;
139 40fa9110 2020-10-20 neels n = fprintf(outfile, "blob - %s%s\n", idstr1,
140 40fa9110 2020-10-20 neels modestr1 ? modestr1 : "");
141 40fa9110 2020-10-20 neels if (n < 0) {
142 40fa9110 2020-10-20 neels err = got_error_from_errno("fprintf");
143 40fa9110 2020-10-20 neels goto done;
145 40fa9110 2020-10-20 neels outoff += n;
146 40fa9110 2020-10-20 neels if (line_offsets) {
147 40fa9110 2020-10-20 neels err = add_line_offset(line_offsets, nlines, outoff);
149 40fa9110 2020-10-20 neels goto done;
152 40fa9110 2020-10-20 neels n = fprintf(outfile, "blob + %s%s\n", idstr2,
153 40fa9110 2020-10-20 neels modestr2 ? modestr2 : "");
154 40fa9110 2020-10-20 neels if (n < 0) {
155 40fa9110 2020-10-20 neels err = got_error_from_errno("fprintf");
156 40fa9110 2020-10-20 neels goto done;
158 40fa9110 2020-10-20 neels outoff += n;
159 40fa9110 2020-10-20 neels if (line_offsets) {
160 40fa9110 2020-10-20 neels err = add_line_offset(line_offsets, nlines, outoff);
162 40fa9110 2020-10-20 neels goto done;
165 40fa9110 2020-10-20 neels free(modestr1);
166 40fa9110 2020-10-20 neels free(modestr2);
168 40fa9110 2020-10-20 neels err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_MYERS,
169 40fa9110 2020-10-20 neels ignore_whitespace);
171 40fa9110 2020-10-20 neels goto done;
173 40fa9110 2020-10-20 neels if (outfile) {
174 40fa9110 2020-10-20 neels err = got_diffreg_output(line_offsets, nlines, result, f1, f2,
175 40fa9110 2020-10-20 neels label1 ? label1 : idstr1,
176 40fa9110 2020-10-20 neels label2 ? label2 : idstr2,
177 40fa9110 2020-10-20 neels GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
179 40fa9110 2020-10-20 neels goto done;
182 40fa9110 2020-10-20 neels if (resultp && err == NULL)
183 40fa9110 2020-10-20 neels *resultp = result;
185 40fa9110 2020-10-20 neels free_err = got_diffreg_result_free(result);
186 40fa9110 2020-10-20 neels if (free_err && err == NULL)
187 40fa9110 2020-10-20 neels err = free_err;
190 40fa9110 2020-10-20 neels if (f1 && fclose(f1) != 0 && err == NULL)
191 40fa9110 2020-10-20 neels err = got_error_from_errno("fclose");
192 40fa9110 2020-10-20 neels if (f2 && fclose(f2) != 0 && err == NULL)
193 40fa9110 2020-10-20 neels err = got_error_from_errno("fclose");
194 40fa9110 2020-10-20 neels return err;
197 40fa9110 2020-10-20 neels const struct got_error *
198 40fa9110 2020-10-20 neels got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
199 40fa9110 2020-10-20 neels struct got_blob_object *blob2, struct got_object_id *id1,
200 40fa9110 2020-10-20 neels struct got_object_id *id2, const char *label1, const char *label2,
201 40fa9110 2020-10-20 neels mode_t mode1, mode_t mode2, struct got_repository *repo)
203 40fa9110 2020-10-20 neels struct got_diff_blob_output_unidiff_arg *a = arg;
205 40fa9110 2020-10-20 neels return diff_blobs(&a->line_offsets, &a->nlines, NULL,
206 40fa9110 2020-10-20 neels blob1, blob2, label1, label2, mode1, mode2, a->diff_context,
207 40fa9110 2020-10-20 neels a->ignore_whitespace, a->outfile);
210 40fa9110 2020-10-20 neels const struct got_error *
211 40fa9110 2020-10-20 neels got_diff_blob(off_t **line_offsets, size_t *nlines,
212 40fa9110 2020-10-20 neels struct got_blob_object *blob1, struct got_blob_object *blob2,
213 40fa9110 2020-10-20 neels const char *label1, const char *label2, int diff_context,
214 40fa9110 2020-10-20 neels int ignore_whitespace, FILE *outfile)
216 40fa9110 2020-10-20 neels return diff_blobs(line_offsets, nlines, NULL, blob1, blob2,
217 40fa9110 2020-10-20 neels label1, label2, 0, 0, diff_context, ignore_whitespace, outfile);
220 40fa9110 2020-10-20 neels static const struct got_error *
221 40fa9110 2020-10-20 neels diff_blob_file(struct got_diffreg_result **resultp,
222 40fa9110 2020-10-20 neels struct got_blob_object *blob1, const char *label1, FILE *f2, size_t size2,
223 40fa9110 2020-10-20 neels const char *label2, int diff_context, int ignore_whitespace, FILE *outfile)
225 40fa9110 2020-10-20 neels const struct got_error *err = NULL, *free_err;
226 40fa9110 2020-10-20 neels FILE *f1 = NULL;
227 40fa9110 2020-10-20 neels char hex1[SHA1_DIGEST_STRING_LENGTH];
228 40fa9110 2020-10-20 neels char *idstr1 = NULL;
229 40fa9110 2020-10-20 neels size_t size1;
230 40fa9110 2020-10-20 neels struct got_diffreg_result *result = NULL;
232 40fa9110 2020-10-20 neels if (resultp)
233 40fa9110 2020-10-20 neels *resultp = NULL;
235 40fa9110 2020-10-20 neels size1 = 0;
236 40fa9110 2020-10-20 neels if (blob1) {
237 40fa9110 2020-10-20 neels f1 = got_opentemp();
238 40fa9110 2020-10-20 neels if (f1 == NULL)
239 40fa9110 2020-10-20 neels return got_error_from_errno("got_opentemp");
240 40fa9110 2020-10-20 neels idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
241 40fa9110 2020-10-20 neels err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
244 40fa9110 2020-10-20 neels goto done;
246 40fa9110 2020-10-20 neels idstr1 = "/dev/null";
249 40fa9110 2020-10-20 neels if (outfile) {
250 40fa9110 2020-10-20 neels fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
251 40fa9110 2020-10-20 neels fprintf(outfile, "file + %s\n",
252 40fa9110 2020-10-20 neels f2 == NULL ? "/dev/null" : label2);
255 40fa9110 2020-10-20 neels err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_MYERS,
256 40fa9110 2020-10-20 neels ignore_whitespace);
258 40fa9110 2020-10-20 neels goto done;
260 40fa9110 2020-10-20 neels if (outfile) {
261 40fa9110 2020-10-20 neels err = got_diffreg_output(NULL, NULL, result, f1, f2,
262 40fa9110 2020-10-20 neels label2, label2, GOT_DIFF_OUTPUT_UNIDIFF, diff_context,
265 40fa9110 2020-10-20 neels goto done;
268 40fa9110 2020-10-20 neels if (resultp && err == NULL)
269 40fa9110 2020-10-20 neels *resultp = result;
270 40fa9110 2020-10-20 neels else if (result) {
271 40fa9110 2020-10-20 neels free_err = got_diffreg_result_free(result);
272 40fa9110 2020-10-20 neels if (free_err && err == NULL)
273 40fa9110 2020-10-20 neels err = free_err;
276 40fa9110 2020-10-20 neels if (f1 && fclose(f1) != 0 && err == NULL)
277 40fa9110 2020-10-20 neels err = got_error_from_errno("fclose");
278 40fa9110 2020-10-20 neels return err;
281 40fa9110 2020-10-20 neels const struct got_error *
282 40fa9110 2020-10-20 neels got_diff_blob_file(struct got_blob_object *blob1, const char *label1,
283 40fa9110 2020-10-20 neels FILE *f2, size_t size2, const char *label2, int diff_context,
284 40fa9110 2020-10-20 neels int ignore_whitespace, FILE *outfile)
286 40fa9110 2020-10-20 neels return diff_blob_file(NULL, blob1, label1, f2, size2, label2,
287 40fa9110 2020-10-20 neels diff_context, ignore_whitespace, outfile);
290 40fa9110 2020-10-20 neels const struct got_error *
291 40fa9110 2020-10-20 neels got_diff_blob_file_lines_changed(struct got_diffreg_result **result,
292 40fa9110 2020-10-20 neels struct got_blob_object *blob1, FILE *f2, size_t size2)
294 40fa9110 2020-10-20 neels return diff_blob_file(result, blob1, NULL, f2, size2, NULL,
295 40fa9110 2020-10-20 neels 0, 0, NULL);
298 40fa9110 2020-10-20 neels const struct got_error *
299 40fa9110 2020-10-20 neels got_diff_blob_lines_changed(struct got_diffreg_result **result,
300 40fa9110 2020-10-20 neels struct got_blob_object *blob1, struct got_blob_object *blob2)
302 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
304 40fa9110 2020-10-20 neels err = diff_blobs(NULL, NULL, result, blob1, blob2,
305 40fa9110 2020-10-20 neels NULL, NULL, 0, 0, 3, 0, NULL);
306 40fa9110 2020-10-20 neels if (err) {
307 40fa9110 2020-10-20 neels got_diffreg_result_free(*result);
308 40fa9110 2020-10-20 neels *result = NULL;
310 40fa9110 2020-10-20 neels return err;
313 40fa9110 2020-10-20 neels static const struct got_error *
314 40fa9110 2020-10-20 neels diff_added_blob(struct got_object_id *id, const char *label, mode_t mode,
315 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
317 40fa9110 2020-10-20 neels const struct got_error *err;
318 40fa9110 2020-10-20 neels struct got_blob_object *blob = NULL;
319 40fa9110 2020-10-20 neels struct got_object *obj = NULL;
321 40fa9110 2020-10-20 neels err = got_object_open(&obj, repo, id);
323 40fa9110 2020-10-20 neels return err;
325 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob, repo, obj, 8192);
327 40fa9110 2020-10-20 neels goto done;
328 40fa9110 2020-10-20 neels err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, 0, mode, repo);
330 40fa9110 2020-10-20 neels got_object_close(obj);
332 40fa9110 2020-10-20 neels got_object_blob_close(blob);
333 40fa9110 2020-10-20 neels return err;
336 40fa9110 2020-10-20 neels static const struct got_error *
337 40fa9110 2020-10-20 neels diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
338 40fa9110 2020-10-20 neels const char *label1, const char *label2, mode_t mode1, mode_t mode2,
339 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
341 40fa9110 2020-10-20 neels const struct got_error *err;
342 40fa9110 2020-10-20 neels struct got_object *obj1 = NULL;
343 40fa9110 2020-10-20 neels struct got_object *obj2 = NULL;
344 40fa9110 2020-10-20 neels struct got_blob_object *blob1 = NULL;
345 40fa9110 2020-10-20 neels struct got_blob_object *blob2 = NULL;
347 40fa9110 2020-10-20 neels err = got_object_open(&obj1, repo, id1);
349 40fa9110 2020-10-20 neels return err;
350 40fa9110 2020-10-20 neels if (obj1->type != GOT_OBJ_TYPE_BLOB) {
351 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
352 40fa9110 2020-10-20 neels goto done;
355 40fa9110 2020-10-20 neels err = got_object_open(&obj2, repo, id2);
357 40fa9110 2020-10-20 neels goto done;
358 40fa9110 2020-10-20 neels if (obj2->type != GOT_OBJ_TYPE_BLOB) {
359 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_BAD_OBJ_DATA);
360 40fa9110 2020-10-20 neels goto done;
363 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob1, repo, obj1, 8192);
365 40fa9110 2020-10-20 neels goto done;
367 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob2, repo, obj2, 8192);
369 40fa9110 2020-10-20 neels goto done;
371 40fa9110 2020-10-20 neels err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, mode1, mode2,
375 40fa9110 2020-10-20 neels got_object_close(obj1);
377 40fa9110 2020-10-20 neels got_object_close(obj2);
378 40fa9110 2020-10-20 neels if (blob1)
379 40fa9110 2020-10-20 neels got_object_blob_close(blob1);
380 40fa9110 2020-10-20 neels if (blob2)
381 40fa9110 2020-10-20 neels got_object_blob_close(blob2);
382 40fa9110 2020-10-20 neels return err;
385 40fa9110 2020-10-20 neels static const struct got_error *
386 40fa9110 2020-10-20 neels diff_deleted_blob(struct got_object_id *id, const char *label, mode_t mode,
387 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
389 40fa9110 2020-10-20 neels const struct got_error *err;
390 40fa9110 2020-10-20 neels struct got_blob_object *blob = NULL;
391 40fa9110 2020-10-20 neels struct got_object *obj = NULL;
393 40fa9110 2020-10-20 neels err = got_object_open(&obj, repo, id);
395 40fa9110 2020-10-20 neels return err;
397 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob, repo, obj, 8192);
399 40fa9110 2020-10-20 neels goto done;
400 40fa9110 2020-10-20 neels err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, mode, 0, repo);
402 40fa9110 2020-10-20 neels got_object_close(obj);
404 40fa9110 2020-10-20 neels got_object_blob_close(blob);
405 40fa9110 2020-10-20 neels return err;
408 40fa9110 2020-10-20 neels static const struct got_error *
409 40fa9110 2020-10-20 neels diff_added_tree(struct got_object_id *id, const char *label,
410 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
411 40fa9110 2020-10-20 neels int diff_content)
413 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
414 40fa9110 2020-10-20 neels struct got_object *treeobj = NULL;
415 40fa9110 2020-10-20 neels struct got_tree_object *tree = NULL;
417 40fa9110 2020-10-20 neels err = got_object_open(&treeobj, repo, id);
419 40fa9110 2020-10-20 neels goto done;
421 40fa9110 2020-10-20 neels if (treeobj->type != GOT_OBJ_TYPE_TREE) {
422 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
423 40fa9110 2020-10-20 neels goto done;
426 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree, repo, treeobj);
428 40fa9110 2020-10-20 neels goto done;
430 40fa9110 2020-10-20 neels err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg,
431 40fa9110 2020-10-20 neels diff_content);
434 40fa9110 2020-10-20 neels got_object_tree_close(tree);
435 40fa9110 2020-10-20 neels if (treeobj)
436 40fa9110 2020-10-20 neels got_object_close(treeobj);
437 40fa9110 2020-10-20 neels return err;
440 40fa9110 2020-10-20 neels static const struct got_error *
441 40fa9110 2020-10-20 neels diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
442 40fa9110 2020-10-20 neels const char *label1, const char *label2, struct got_repository *repo,
443 40fa9110 2020-10-20 neels got_diff_blob_cb cb, void *cb_arg, int diff_content)
445 40fa9110 2020-10-20 neels const struct got_error *err;
446 40fa9110 2020-10-20 neels struct got_object *treeobj1 = NULL;
447 40fa9110 2020-10-20 neels struct got_object *treeobj2 = NULL;
448 40fa9110 2020-10-20 neels struct got_tree_object *tree1 = NULL;
449 40fa9110 2020-10-20 neels struct got_tree_object *tree2 = NULL;
451 40fa9110 2020-10-20 neels err = got_object_open(&treeobj1, repo, id1);
453 40fa9110 2020-10-20 neels goto done;
455 40fa9110 2020-10-20 neels if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
456 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
457 40fa9110 2020-10-20 neels goto done;
460 40fa9110 2020-10-20 neels err = got_object_open(&treeobj2, repo, id2);
462 40fa9110 2020-10-20 neels goto done;
464 40fa9110 2020-10-20 neels if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
465 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
466 40fa9110 2020-10-20 neels goto done;
469 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree1, repo, treeobj1);
471 40fa9110 2020-10-20 neels goto done;
473 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree2, repo, treeobj2);
475 40fa9110 2020-10-20 neels goto done;
477 40fa9110 2020-10-20 neels err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg,
478 40fa9110 2020-10-20 neels diff_content);
481 40fa9110 2020-10-20 neels if (tree1)
482 40fa9110 2020-10-20 neels got_object_tree_close(tree1);
483 40fa9110 2020-10-20 neels if (tree2)
484 40fa9110 2020-10-20 neels got_object_tree_close(tree2);
485 40fa9110 2020-10-20 neels if (treeobj1)
486 40fa9110 2020-10-20 neels got_object_close(treeobj1);
487 40fa9110 2020-10-20 neels if (treeobj2)
488 40fa9110 2020-10-20 neels got_object_close(treeobj2);
489 40fa9110 2020-10-20 neels return err;
492 40fa9110 2020-10-20 neels static const struct got_error *
493 40fa9110 2020-10-20 neels diff_deleted_tree(struct got_object_id *id, const char *label,
494 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
495 40fa9110 2020-10-20 neels int diff_content)
497 40fa9110 2020-10-20 neels const struct got_error *err;
498 40fa9110 2020-10-20 neels struct got_object *treeobj = NULL;
499 40fa9110 2020-10-20 neels struct got_tree_object *tree = NULL;
501 40fa9110 2020-10-20 neels err = got_object_open(&treeobj, repo, id);
503 40fa9110 2020-10-20 neels goto done;
505 40fa9110 2020-10-20 neels if (treeobj->type != GOT_OBJ_TYPE_TREE) {
506 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
507 40fa9110 2020-10-20 neels goto done;
510 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree, repo, treeobj);
512 40fa9110 2020-10-20 neels goto done;
514 40fa9110 2020-10-20 neels err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg,
515 40fa9110 2020-10-20 neels diff_content);
518 40fa9110 2020-10-20 neels got_object_tree_close(tree);
519 40fa9110 2020-10-20 neels if (treeobj)
520 40fa9110 2020-10-20 neels got_object_close(treeobj);
521 40fa9110 2020-10-20 neels return err;
524 40fa9110 2020-10-20 neels static const struct got_error *
525 40fa9110 2020-10-20 neels diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
526 40fa9110 2020-10-20 neels const char *label1, const char *label2, struct got_repository *repo,
527 40fa9110 2020-10-20 neels got_diff_blob_cb cb, void *cb_arg)
529 40fa9110 2020-10-20 neels /* XXX TODO */
530 40fa9110 2020-10-20 neels return NULL;
533 40fa9110 2020-10-20 neels static const struct got_error *
534 40fa9110 2020-10-20 neels diff_entry_old_new(struct got_tree_entry *te1,
535 40fa9110 2020-10-20 neels struct got_tree_entry *te2, const char *label1, const char *label2,
536 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
537 40fa9110 2020-10-20 neels int diff_content)
539 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
540 40fa9110 2020-10-20 neels int id_match;
542 40fa9110 2020-10-20 neels if (got_object_tree_entry_is_submodule(te1))
543 40fa9110 2020-10-20 neels return NULL;
545 40fa9110 2020-10-20 neels if (te2 == NULL) {
546 40fa9110 2020-10-20 neels if (S_ISDIR(te1->mode))
547 40fa9110 2020-10-20 neels err = diff_deleted_tree(&te1->id, label1, repo,
548 40fa9110 2020-10-20 neels cb, cb_arg, diff_content);
550 40fa9110 2020-10-20 neels if (diff_content)
551 40fa9110 2020-10-20 neels err = diff_deleted_blob(&te1->id, label1,
552 40fa9110 2020-10-20 neels te1->mode, repo, cb, cb_arg);
554 40fa9110 2020-10-20 neels err = cb(cb_arg, NULL, NULL, &te1->id, NULL,
555 40fa9110 2020-10-20 neels label1, NULL, te1->mode, 0, repo);
557 40fa9110 2020-10-20 neels return err;
558 40fa9110 2020-10-20 neels } else if (got_object_tree_entry_is_submodule(te2))
559 40fa9110 2020-10-20 neels return NULL;
561 40fa9110 2020-10-20 neels id_match = (got_object_id_cmp(&te1->id, &te2->id) == 0);
562 40fa9110 2020-10-20 neels if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
563 40fa9110 2020-10-20 neels if (!id_match)
564 40fa9110 2020-10-20 neels return diff_modified_tree(&te1->id, &te2->id,
565 40fa9110 2020-10-20 neels label1, label2, repo, cb, cb_arg, diff_content);
566 40fa9110 2020-10-20 neels } else if ((S_ISREG(te1->mode) || S_ISLNK(te1->mode)) &&
567 40fa9110 2020-10-20 neels (S_ISREG(te2->mode) || S_ISLNK(te2->mode))) {
568 40fa9110 2020-10-20 neels if (!id_match ||
569 40fa9110 2020-10-20 neels ((te1->mode & (S_IFLNK | S_IXUSR))) !=
570 40fa9110 2020-10-20 neels (te2->mode & (S_IFLNK | S_IXUSR))) {
571 40fa9110 2020-10-20 neels if (diff_content)
572 40fa9110 2020-10-20 neels return diff_modified_blob(&te1->id, &te2->id,
573 40fa9110 2020-10-20 neels label1, label2, te1->mode, te2->mode,
574 40fa9110 2020-10-20 neels repo, cb, cb_arg);
576 40fa9110 2020-10-20 neels return cb(cb_arg, NULL, NULL, &te1->id,
577 40fa9110 2020-10-20 neels &te2->id, label1, label2, te1->mode,
578 40fa9110 2020-10-20 neels te2->mode, repo);
582 40fa9110 2020-10-20 neels if (id_match)
583 40fa9110 2020-10-20 neels return NULL;
585 40fa9110 2020-10-20 neels return diff_kind_mismatch(&te1->id, &te2->id, label1, label2, repo,
586 40fa9110 2020-10-20 neels cb, cb_arg);
589 40fa9110 2020-10-20 neels static const struct got_error *
590 40fa9110 2020-10-20 neels diff_entry_new_old(struct got_tree_entry *te2,
591 40fa9110 2020-10-20 neels struct got_tree_entry *te1, const char *label2,
592 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
593 40fa9110 2020-10-20 neels int diff_content)
595 40fa9110 2020-10-20 neels if (te1 != NULL) /* handled by diff_entry_old_new() */
596 40fa9110 2020-10-20 neels return NULL;
598 40fa9110 2020-10-20 neels if (got_object_tree_entry_is_submodule(te2))
599 40fa9110 2020-10-20 neels return NULL;
601 40fa9110 2020-10-20 neels if (S_ISDIR(te2->mode))
602 40fa9110 2020-10-20 neels return diff_added_tree(&te2->id, label2, repo, cb, cb_arg,
603 40fa9110 2020-10-20 neels diff_content);
605 40fa9110 2020-10-20 neels if (diff_content)
606 40fa9110 2020-10-20 neels return diff_added_blob(&te2->id, label2, te2->mode, repo, cb,
609 40fa9110 2020-10-20 neels return cb(cb_arg, NULL, NULL, NULL, &te2->id, NULL, label2, 0,
610 40fa9110 2020-10-20 neels te2->mode, repo);
613 40fa9110 2020-10-20 neels const struct got_error *
614 40fa9110 2020-10-20 neels got_diff_tree_collect_changed_paths(void *arg, struct got_blob_object *blob1,
615 40fa9110 2020-10-20 neels struct got_blob_object *blob2, struct got_object_id *id1,
616 40fa9110 2020-10-20 neels struct got_object_id *id2, const char *label1, const char *label2,
617 40fa9110 2020-10-20 neels mode_t mode1, mode_t mode2, struct got_repository *repo)
619 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
620 40fa9110 2020-10-20 neels struct got_pathlist_head *paths = arg;
621 40fa9110 2020-10-20 neels struct got_diff_changed_path *change = NULL;
622 40fa9110 2020-10-20 neels char *path = NULL;
624 40fa9110 2020-10-20 neels path = strdup(label2 ? label2 : label1);
625 40fa9110 2020-10-20 neels if (path == NULL)
626 40fa9110 2020-10-20 neels return got_error_from_errno("malloc");
628 40fa9110 2020-10-20 neels change = malloc(sizeof(*change));
629 40fa9110 2020-10-20 neels if (change == NULL) {
630 40fa9110 2020-10-20 neels err = got_error_from_errno("malloc");
631 40fa9110 2020-10-20 neels goto done;
634 40fa9110 2020-10-20 neels change->status = GOT_STATUS_NO_CHANGE;
635 40fa9110 2020-10-20 neels if (id1 == NULL)
636 40fa9110 2020-10-20 neels change->status = GOT_STATUS_ADD;
637 40fa9110 2020-10-20 neels else if (id2 == NULL)
638 40fa9110 2020-10-20 neels change->status = GOT_STATUS_DELETE;
640 40fa9110 2020-10-20 neels if (got_object_id_cmp(id1, id2) != 0)
641 40fa9110 2020-10-20 neels change->status = GOT_STATUS_MODIFY;
642 40fa9110 2020-10-20 neels else if (mode1 != mode2)
643 40fa9110 2020-10-20 neels change->status = GOT_STATUS_MODE_CHANGE;
646 40fa9110 2020-10-20 neels err = got_pathlist_insert(NULL, paths, path, change);
648 40fa9110 2020-10-20 neels if (err) {
649 40fa9110 2020-10-20 neels free(path);
650 40fa9110 2020-10-20 neels free(change);
652 40fa9110 2020-10-20 neels return err;
655 40fa9110 2020-10-20 neels const struct got_error *
656 40fa9110 2020-10-20 neels got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
657 40fa9110 2020-10-20 neels const char *label1, const char *label2, struct got_repository *repo,
658 40fa9110 2020-10-20 neels got_diff_blob_cb cb, void *cb_arg, int diff_content)
660 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
661 40fa9110 2020-10-20 neels struct got_tree_entry *te1 = NULL;
662 40fa9110 2020-10-20 neels struct got_tree_entry *te2 = NULL;
663 40fa9110 2020-10-20 neels char *l1 = NULL, *l2 = NULL;
664 40fa9110 2020-10-20 neels int tidx1 = 0, tidx2 = 0;
666 40fa9110 2020-10-20 neels if (tree1) {
667 40fa9110 2020-10-20 neels te1 = got_object_tree_get_entry(tree1, 0);
668 40fa9110 2020-10-20 neels if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
669 40fa9110 2020-10-20 neels te1->name) == -1)
670 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
672 40fa9110 2020-10-20 neels if (tree2) {
673 40fa9110 2020-10-20 neels te2 = got_object_tree_get_entry(tree2, 0);
674 40fa9110 2020-10-20 neels if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
675 40fa9110 2020-10-20 neels te2->name) == -1)
676 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
680 40fa9110 2020-10-20 neels if (te1) {
681 40fa9110 2020-10-20 neels struct got_tree_entry *te = NULL;
682 40fa9110 2020-10-20 neels if (tree2)
683 40fa9110 2020-10-20 neels te = got_object_tree_find_entry(tree2,
684 40fa9110 2020-10-20 neels te1->name);
687 40fa9110 2020-10-20 neels l2 = NULL;
688 40fa9110 2020-10-20 neels if (te && asprintf(&l2, "%s%s%s", label2,
689 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te->name) == -1)
691 40fa9110 2020-10-20 neels got_error_from_errno("asprintf");
693 40fa9110 2020-10-20 neels err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
694 40fa9110 2020-10-20 neels cb_arg, diff_content);
699 40fa9110 2020-10-20 neels if (te2) {
700 40fa9110 2020-10-20 neels struct got_tree_entry *te = NULL;
701 40fa9110 2020-10-20 neels if (tree1)
702 40fa9110 2020-10-20 neels te = got_object_tree_find_entry(tree1,
703 40fa9110 2020-10-20 neels te2->name);
706 40fa9110 2020-10-20 neels if (asprintf(&l2, "%s%s%s", label2,
707 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te->name) == -1)
709 40fa9110 2020-10-20 neels got_error_from_errno("asprintf");
711 40fa9110 2020-10-20 neels if (asprintf(&l2, "%s%s%s", label2,
712 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te2->name) == -1)
714 40fa9110 2020-10-20 neels got_error_from_errno("asprintf");
716 40fa9110 2020-10-20 neels err = diff_entry_new_old(te2, te, l2, repo,
717 40fa9110 2020-10-20 neels cb, cb_arg, diff_content);
723 40fa9110 2020-10-20 neels l1 = NULL;
724 40fa9110 2020-10-20 neels if (te1) {
726 40fa9110 2020-10-20 neels te1 = got_object_tree_get_entry(tree1, tidx1);
727 40fa9110 2020-10-20 neels if (te1 &&
728 40fa9110 2020-10-20 neels asprintf(&l1, "%s%s%s", label1,
729 40fa9110 2020-10-20 neels label1[0] ? "/" : "", te1->name) == -1)
730 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
733 40fa9110 2020-10-20 neels l2 = NULL;
734 40fa9110 2020-10-20 neels if (te2) {
736 40fa9110 2020-10-20 neels te2 = got_object_tree_get_entry(tree2, tidx2);
737 40fa9110 2020-10-20 neels if (te2 &&
738 40fa9110 2020-10-20 neels asprintf(&l2, "%s%s%s", label2,
739 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te2->name) == -1)
740 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
742 40fa9110 2020-10-20 neels } while (te1 || te2);
744 40fa9110 2020-10-20 neels return err;
747 40fa9110 2020-10-20 neels const struct got_error *
748 40fa9110 2020-10-20 neels got_diff_objects_as_blobs(off_t **line_offsets, size_t *nlines,
749 40fa9110 2020-10-20 neels struct got_object_id *id1, struct got_object_id *id2,
750 40fa9110 2020-10-20 neels const char *label1, const char *label2, int diff_context,
751 40fa9110 2020-10-20 neels int ignore_whitespace, struct got_repository *repo, FILE *outfile)
753 40fa9110 2020-10-20 neels const struct got_error *err;
754 40fa9110 2020-10-20 neels struct got_blob_object *blob1 = NULL, *blob2 = NULL;
756 40fa9110 2020-10-20 neels if (id1 == NULL && id2 == NULL)
757 40fa9110 2020-10-20 neels return got_error(GOT_ERR_NO_OBJ);
759 40fa9110 2020-10-20 neels if (id1) {
760 40fa9110 2020-10-20 neels err = got_object_open_as_blob(&blob1, repo, id1, 8192);
762 40fa9110 2020-10-20 neels goto done;
764 40fa9110 2020-10-20 neels if (id2) {
765 40fa9110 2020-10-20 neels err = got_object_open_as_blob(&blob2, repo, id2, 8192);
767 40fa9110 2020-10-20 neels goto done;
769 40fa9110 2020-10-20 neels err = got_diff_blob(line_offsets, nlines, blob1, blob2,
770 40fa9110 2020-10-20 neels label1, label2, diff_context, ignore_whitespace, outfile);
772 40fa9110 2020-10-20 neels if (blob1)
773 40fa9110 2020-10-20 neels got_object_blob_close(blob1);
774 40fa9110 2020-10-20 neels if (blob2)
775 40fa9110 2020-10-20 neels got_object_blob_close(blob2);
776 40fa9110 2020-10-20 neels return err;
779 40fa9110 2020-10-20 neels const struct got_error *
780 40fa9110 2020-10-20 neels got_diff_objects_as_trees(off_t **line_offsets, size_t *nlines,
781 40fa9110 2020-10-20 neels struct got_object_id *id1, struct got_object_id *id2,
782 40fa9110 2020-10-20 neels char *label1, char *label2, int diff_context, int ignore_whitespace,
783 40fa9110 2020-10-20 neels struct got_repository *repo, FILE *outfile)
785 40fa9110 2020-10-20 neels const struct got_error *err;
786 40fa9110 2020-10-20 neels struct got_tree_object *tree1 = NULL, *tree2 = NULL;
787 40fa9110 2020-10-20 neels struct got_diff_blob_output_unidiff_arg arg;
788 40fa9110 2020-10-20 neels int want_lineoffsets = (line_offsets != NULL && *line_offsets != NULL);
790 40fa9110 2020-10-20 neels if (id1 == NULL && id2 == NULL)
791 40fa9110 2020-10-20 neels return got_error(GOT_ERR_NO_OBJ);
793 40fa9110 2020-10-20 neels if (id1) {
794 40fa9110 2020-10-20 neels err = got_object_open_as_tree(&tree1, repo, id1);
796 40fa9110 2020-10-20 neels goto done;
798 40fa9110 2020-10-20 neels if (id2) {
799 40fa9110 2020-10-20 neels err = got_object_open_as_tree(&tree2, repo, id2);
801 40fa9110 2020-10-20 neels goto done;
803 40fa9110 2020-10-20 neels arg.diff_context = diff_context;
804 40fa9110 2020-10-20 neels arg.ignore_whitespace = ignore_whitespace;
805 40fa9110 2020-10-20 neels arg.outfile = outfile;
806 40fa9110 2020-10-20 neels if (want_lineoffsets) {
807 40fa9110 2020-10-20 neels arg.line_offsets = *line_offsets;
808 40fa9110 2020-10-20 neels arg.nlines = *nlines;
810 40fa9110 2020-10-20 neels arg.line_offsets = NULL;
811 40fa9110 2020-10-20 neels arg.nlines = 0;
813 40fa9110 2020-10-20 neels err = got_diff_tree(tree1, tree2, label1, label2, repo,
814 40fa9110 2020-10-20 neels got_diff_blob_output_unidiff, &arg, 1);
816 40fa9110 2020-10-20 neels if (want_lineoffsets) {
817 40fa9110 2020-10-20 neels *line_offsets = arg.line_offsets; /* was likely re-allocated */
818 40fa9110 2020-10-20 neels *nlines = arg.nlines;
821 40fa9110 2020-10-20 neels if (tree1)
822 40fa9110 2020-10-20 neels got_object_tree_close(tree1);
823 40fa9110 2020-10-20 neels if (tree2)
824 40fa9110 2020-10-20 neels got_object_tree_close(tree2);
825 40fa9110 2020-10-20 neels return err;
828 40fa9110 2020-10-20 neels const struct got_error *
829 40fa9110 2020-10-20 neels got_diff_objects_as_commits(off_t **line_offsets, size_t *nlines,
830 40fa9110 2020-10-20 neels struct got_object_id *id1, struct got_object_id *id2,
831 40fa9110 2020-10-20 neels int diff_context, int ignore_whitespace,
832 40fa9110 2020-10-20 neels struct got_repository *repo, FILE *outfile)
834 40fa9110 2020-10-20 neels const struct got_error *err;
835 40fa9110 2020-10-20 neels struct got_commit_object *commit1 = NULL, *commit2 = NULL;
837 40fa9110 2020-10-20 neels if (id2 == NULL)
838 40fa9110 2020-10-20 neels return got_error(GOT_ERR_NO_OBJ);
840 40fa9110 2020-10-20 neels if (id1) {
841 40fa9110 2020-10-20 neels err = got_object_open_as_commit(&commit1, repo, id1);
843 40fa9110 2020-10-20 neels goto done;
846 40fa9110 2020-10-20 neels err = got_object_open_as_commit(&commit2, repo, id2);
848 40fa9110 2020-10-20 neels goto done;
850 40fa9110 2020-10-20 neels err = got_diff_objects_as_trees(line_offsets, nlines,
851 40fa9110 2020-10-20 neels commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
852 40fa9110 2020-10-20 neels got_object_commit_get_tree_id(commit2), "", "", diff_context,
853 40fa9110 2020-10-20 neels ignore_whitespace, repo, outfile);
855 40fa9110 2020-10-20 neels if (commit1)
856 40fa9110 2020-10-20 neels got_object_commit_close(commit1);
857 40fa9110 2020-10-20 neels if (commit2)
858 40fa9110 2020-10-20 neels got_object_commit_close(commit2);
859 40fa9110 2020-10-20 neels return err;
862 40fa9110 2020-10-20 neels const struct got_error *
863 40fa9110 2020-10-20 neels got_diff_files(struct got_diffreg_result **resultp,
864 40fa9110 2020-10-20 neels FILE *f1, const char *label1, FILE *f2, const char *label2,
865 40fa9110 2020-10-20 neels int diff_context, int ignore_whitespace, FILE *outfile)
867 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
868 40fa9110 2020-10-20 neels struct got_diffreg_result *diffreg_result = NULL;
870 40fa9110 2020-10-20 neels if (resultp)
871 40fa9110 2020-10-20 neels *resultp = NULL;
873 40fa9110 2020-10-20 neels if (outfile) {
874 40fa9110 2020-10-20 neels fprintf(outfile, "file - %s\n",
875 40fa9110 2020-10-20 neels f1 == NULL ? "/dev/null" : label1);
876 40fa9110 2020-10-20 neels fprintf(outfile, "file + %s\n",
877 40fa9110 2020-10-20 neels f2 == NULL ? "/dev/null" : label2);
880 40fa9110 2020-10-20 neels err = got_diffreg(&diffreg_result, f1, f2, GOT_DIFF_ALGORITHM_MYERS,
881 40fa9110 2020-10-20 neels ignore_whitespace);
883 40fa9110 2020-10-20 neels goto done;
885 40fa9110 2020-10-20 neels if (outfile) {
886 40fa9110 2020-10-20 neels err = got_diffreg_output(NULL, NULL, diffreg_result,
887 40fa9110 2020-10-20 neels f1, f2, label1, label2, GOT_DIFF_OUTPUT_UNIDIFF,
888 40fa9110 2020-10-20 neels diff_context, outfile);
890 40fa9110 2020-10-20 neels goto done;
894 40fa9110 2020-10-20 neels if (resultp && err == NULL)
895 40fa9110 2020-10-20 neels *resultp = diffreg_result;
896 40fa9110 2020-10-20 neels else if (diffreg_result) {
897 40fa9110 2020-10-20 neels const struct got_error *free_err;
898 40fa9110 2020-10-20 neels free_err = got_diffreg_result_free(diffreg_result);
899 40fa9110 2020-10-20 neels if (free_err && err == NULL)
900 40fa9110 2020-10-20 neels err = free_err;
903 40fa9110 2020-10-20 neels return err;