2 7d283eee 2017-11-29 stsp * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 7d283eee 2017-11-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 7d283eee 2017-11-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 7d283eee 2017-11-29 stsp * copyright notice and this permission notice appear in all copies.
8 7d283eee 2017-11-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 7d283eee 2017-11-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 7d283eee 2017-11-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 7d283eee 2017-11-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 7d283eee 2017-11-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 7d283eee 2017-11-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 7d283eee 2017-11-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 7d283eee 2017-11-29 stsp #include <sys/queue.h>
18 1c7f0520 2017-11-29 stsp #include <sys/stat.h>
20 fe621944 2020-11-10 stsp #include <stdbool.h>
21 7d283eee 2017-11-29 stsp #include <stdio.h>
22 7d283eee 2017-11-29 stsp #include <stdlib.h>
23 7d283eee 2017-11-29 stsp #include <string.h>
24 f9d67749 2017-11-30 stsp #include <limits.h>
25 7d283eee 2017-11-29 stsp #include <sha1.h>
26 7d283eee 2017-11-29 stsp #include <zlib.h>
28 7d283eee 2017-11-29 stsp #include "got_object.h"
29 e09a504c 2019-06-28 stsp #include "got_repository.h"
30 7d283eee 2017-11-29 stsp #include "got_error.h"
31 789689b5 2017-11-30 stsp #include "got_diff.h"
32 511a516b 2018-05-19 stsp #include "got_opentemp.h"
33 324d37e7 2019-05-11 stsp #include "got_path.h"
34 0208f208 2020-05-05 stsp #include "got_cancel.h"
35 0208f208 2020-05-05 stsp #include "got_worktree.h"
37 718b3ab0 2018-03-17 stsp #include "got_lib_diff.h"
38 15a94983 2018-12-23 stsp #include "got_lib_delta.h"
39 15a94983 2018-12-23 stsp #include "got_lib_inflate.h"
40 15a94983 2018-12-23 stsp #include "got_lib_object.h"
42 404c43c4 2018-06-21 stsp static const struct got_error *
43 fe621944 2020-11-10 stsp add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
47 fe621944 2020-11-10 stsp p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
48 fe621944 2020-11-10 stsp if (p == NULL)
49 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
50 fe621944 2020-11-10 stsp *line_offsets = p;
51 fe621944 2020-11-10 stsp (*line_offsets)[*nlines] = off;
52 fe621944 2020-11-10 stsp (*nlines)++;
53 fe621944 2020-11-10 stsp return NULL;
56 fe621944 2020-11-10 stsp static const struct got_error *
57 fe621944 2020-11-10 stsp diff_blobs(off_t **line_offsets, size_t *nlines,
58 fe621944 2020-11-10 stsp struct got_diffreg_result **resultp, struct got_blob_object *blob1,
59 fe621944 2020-11-10 stsp struct got_blob_object *blob2,
60 46f68b20 2019-10-19 stsp const char *label1, const char *label2, mode_t mode1, mode_t mode2,
61 fe621944 2020-11-10 stsp int diff_context, int ignore_whitespace, FILE *outfile)
63 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
64 4e22badc 2017-11-30 stsp FILE *f1 = NULL, *f2 = NULL;
65 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
66 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
67 98abbc84 2017-11-30 stsp char *idstr1 = NULL, *idstr2 = NULL;
68 be659d10 2020-11-18 stsp off_t size1, size2;
69 fe621944 2020-11-10 stsp struct got_diffreg_result *result;
70 fe621944 2020-11-10 stsp off_t outoff = 0;
73 fe621944 2020-11-10 stsp if (line_offsets && *line_offsets && *nlines > 0)
74 fe621944 2020-11-10 stsp outoff = (*line_offsets)[*nlines - 1];
76 fe621944 2020-11-10 stsp if (resultp)
77 fe621944 2020-11-10 stsp *resultp = NULL;
79 4e22badc 2017-11-30 stsp if (blob1) {
80 a1fd68d8 2018-01-12 stsp f1 = got_opentemp();
81 4e22badc 2017-11-30 stsp if (f1 == NULL)
82 638f9024 2019-05-13 stsp return got_error_from_errno("got_opentemp");
85 4e22badc 2017-11-30 stsp if (blob2) {
86 a1fd68d8 2018-01-12 stsp f2 = got_opentemp();
87 4e22badc 2017-11-30 stsp if (f2 == NULL) {
88 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
95 98abbc84 2017-11-30 stsp if (blob1) {
96 f934cf2c 2018-02-12 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
97 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
102 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
105 98abbc84 2017-11-30 stsp if (blob2) {
106 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
107 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
112 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
114 09de383e 2018-12-24 stsp if (outfile) {
115 46f68b20 2019-10-19 stsp char *modestr1 = NULL, *modestr2 = NULL;
116 40dde666 2020-07-23 stsp int modebits;
117 46f68b20 2019-10-19 stsp if (mode1 && mode1 != mode2) {
118 40dde666 2020-07-23 stsp if (S_ISLNK(mode1))
119 40dde666 2020-07-23 stsp modebits = S_IFLNK;
121 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
122 46f68b20 2019-10-19 stsp if (asprintf(&modestr1, " (mode %o)",
123 40dde666 2020-07-23 stsp mode1 & modebits) == -1) {
124 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
128 46f68b20 2019-10-19 stsp if (mode2 && mode1 != mode2) {
129 40dde666 2020-07-23 stsp if (S_ISLNK(mode2))
130 40dde666 2020-07-23 stsp modebits = S_IFLNK;
132 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
133 46f68b20 2019-10-19 stsp if (asprintf(&modestr2, " (mode %o)",
134 40dde666 2020-07-23 stsp mode2 & modebits) == -1) {
135 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
139 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob - %s%s\n", idstr1,
140 46f68b20 2019-10-19 stsp modestr1 ? modestr1 : "");
143 fe621944 2020-11-10 stsp outoff += n;
144 fe621944 2020-11-10 stsp if (line_offsets) {
145 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
150 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob + %s%s\n", idstr2,
151 46f68b20 2019-10-19 stsp modestr2 ? modestr2 : "");
154 fe621944 2020-11-10 stsp outoff += n;
155 fe621944 2020-11-10 stsp if (line_offsets) {
156 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
161 46f68b20 2019-10-19 stsp free(modestr1);
162 46f68b20 2019-10-19 stsp free(modestr2);
164 fe621944 2020-11-10 stsp err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_PATIENCE,
165 fe621944 2020-11-10 stsp ignore_whitespace);
169 fe621944 2020-11-10 stsp if (outfile) {
170 fe621944 2020-11-10 stsp err = got_diffreg_output(line_offsets, nlines, result, f1, f2,
171 fe621944 2020-11-10 stsp label1 ? label1 : idstr1,
172 fe621944 2020-11-10 stsp label2 ? label2 : idstr2,
173 fe621944 2020-11-10 stsp GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
178 fe621944 2020-11-10 stsp if (resultp && err == NULL)
179 fe621944 2020-11-10 stsp *resultp = result;
181 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
182 fe621944 2020-11-10 stsp if (free_err && err == NULL)
183 fe621944 2020-11-10 stsp err = free_err;
186 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
187 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
188 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
189 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
190 7d283eee 2017-11-29 stsp return err;
193 aaa13589 2019-06-01 stsp const struct got_error *
194 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
195 aaa13589 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
196 aaa13589 2019-06-01 stsp struct got_object_id *id2, const char *label1, const char *label2,
197 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
199 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg *a = arg;
201 fe621944 2020-11-10 stsp return diff_blobs(&a->line_offsets, &a->nlines, NULL,
202 fe621944 2020-11-10 stsp blob1, blob2, label1, label2, mode1, mode2, a->diff_context,
203 fe621944 2020-11-10 stsp a->ignore_whitespace, a->outfile);
206 404c43c4 2018-06-21 stsp const struct got_error *
207 fe621944 2020-11-10 stsp got_diff_blob(off_t **line_offsets, size_t *nlines,
208 fe621944 2020-11-10 stsp struct got_blob_object *blob1, struct got_blob_object *blob2,
209 63035f9f 2019-10-06 stsp const char *label1, const char *label2, int diff_context,
210 63035f9f 2019-10-06 stsp int ignore_whitespace, FILE *outfile)
212 fe621944 2020-11-10 stsp return diff_blobs(line_offsets, nlines, NULL, blob1, blob2,
213 fe621944 2020-11-10 stsp label1, label2, 0, 0, diff_context, ignore_whitespace, outfile);
216 7f1f93af 2019-08-06 stsp static const struct got_error *
217 fe621944 2020-11-10 stsp diff_blob_file(struct got_diffreg_result **resultp,
218 4ce46740 2019-08-08 stsp struct got_blob_object *blob1, const char *label1, FILE *f2, size_t size2,
219 63035f9f 2019-10-06 stsp const char *label2, int diff_context, int ignore_whitespace, FILE *outfile)
221 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
222 b72f483a 2019-02-05 stsp FILE *f1 = NULL;
223 b72f483a 2019-02-05 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
224 b72f483a 2019-02-05 stsp char *idstr1 = NULL;
225 be659d10 2020-11-18 stsp off_t size1;
226 fe621944 2020-11-10 stsp struct got_diffreg_result *result = NULL;
228 fe621944 2020-11-10 stsp if (resultp)
229 fe621944 2020-11-10 stsp *resultp = NULL;
232 b72f483a 2019-02-05 stsp if (blob1) {
233 b72f483a 2019-02-05 stsp f1 = got_opentemp();
234 b72f483a 2019-02-05 stsp if (f1 == NULL)
235 638f9024 2019-05-13 stsp return got_error_from_errno("got_opentemp");
236 b72f483a 2019-02-05 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
237 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
242 b72f483a 2019-02-05 stsp idstr1 = "/dev/null";
245 7f1f93af 2019-08-06 stsp if (outfile) {
246 4ce46740 2019-08-08 stsp fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
247 7f1f93af 2019-08-06 stsp fprintf(outfile, "file + %s\n",
248 7f1f93af 2019-08-06 stsp f2 == NULL ? "/dev/null" : label2);
251 fe621944 2020-11-10 stsp err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_PATIENCE,
252 fe621944 2020-11-10 stsp ignore_whitespace);
256 fe621944 2020-11-10 stsp if (outfile) {
257 fe621944 2020-11-10 stsp err = got_diffreg_output(NULL, NULL, result, f1, f2,
258 fe621944 2020-11-10 stsp label2, label2, GOT_DIFF_OUTPUT_UNIDIFF, diff_context,
264 fe621944 2020-11-10 stsp if (resultp && err == NULL)
265 fe621944 2020-11-10 stsp *resultp = result;
266 fe621944 2020-11-10 stsp else if (result) {
267 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
268 fe621944 2020-11-10 stsp if (free_err && err == NULL)
269 fe621944 2020-11-10 stsp err = free_err;
272 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
273 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
274 b72f483a 2019-02-05 stsp return err;
277 7f1f93af 2019-08-06 stsp const struct got_error *
278 4ce46740 2019-08-08 stsp got_diff_blob_file(struct got_blob_object *blob1, const char *label1,
279 4ce46740 2019-08-08 stsp FILE *f2, size_t size2, const char *label2, int diff_context,
280 63035f9f 2019-10-06 stsp int ignore_whitespace, FILE *outfile)
282 4ce46740 2019-08-08 stsp return diff_blob_file(NULL, blob1, label1, f2, size2, label2,
283 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, outfile);
286 474b4f94 2017-11-30 stsp static const struct got_error *
287 46f68b20 2019-10-19 stsp diff_added_blob(struct got_object_id *id, const char *label, mode_t mode,
288 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
290 4e22badc 2017-11-30 stsp const struct got_error *err;
291 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
292 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
294 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
296 4e22badc 2017-11-30 stsp return err;
298 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
301 46f68b20 2019-10-19 stsp err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, 0, mode, repo);
303 2acfca77 2018-04-01 stsp got_object_close(obj);
305 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
306 2acfca77 2018-04-01 stsp return err;
309 474b4f94 2017-11-30 stsp static const struct got_error *
310 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
311 46f68b20 2019-10-19 stsp const char *label1, const char *label2, mode_t mode1, mode_t mode2,
312 46f68b20 2019-10-19 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
314 6a213ccb 2017-11-30 stsp const struct got_error *err;
315 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
316 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
317 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
318 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
320 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
322 730a8aa0 2018-04-24 stsp return err;
323 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
324 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
328 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
331 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
332 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
336 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
340 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
344 46f68b20 2019-10-19 stsp err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, mode1, mode2,
348 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
350 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
352 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
354 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
355 6a213ccb 2017-11-30 stsp return err;
358 474b4f94 2017-11-30 stsp static const struct got_error *
359 46f68b20 2019-10-19 stsp diff_deleted_blob(struct got_object_id *id, const char *label, mode_t mode,
360 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
362 365fb436 2017-11-30 stsp const struct got_error *err;
363 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
364 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
366 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
368 365fb436 2017-11-30 stsp return err;
370 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
373 46f68b20 2019-10-19 stsp err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, mode, 0, repo);
375 2acfca77 2018-04-01 stsp got_object_close(obj);
377 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
378 2acfca77 2018-04-01 stsp return err;
381 474b4f94 2017-11-30 stsp static const struct got_error *
382 54156555 2018-12-24 stsp diff_added_tree(struct got_object_id *id, const char *label,
383 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
384 31b4484f 2019-07-27 stsp int diff_content)
386 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
387 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
388 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
390 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
394 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
395 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
399 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
403 31b4484f 2019-07-27 stsp err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg,
404 31b4484f 2019-07-27 stsp diff_content);
407 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
408 9c70d4c3 2017-11-30 stsp if (treeobj)
409 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
410 9c70d4c3 2017-11-30 stsp return err;
413 474b4f94 2017-11-30 stsp static const struct got_error *
414 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
415 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
416 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
418 f6861a81 2018-09-13 stsp const struct got_error *err;
419 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
420 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
421 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
422 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
424 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
428 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
429 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
433 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
437 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
438 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
442 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
446 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
450 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg,
451 31b4484f 2019-07-27 stsp diff_content);
455 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
457 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
458 789689b5 2017-11-30 stsp if (treeobj1)
459 789689b5 2017-11-30 stsp got_object_close(treeobj1);
460 789689b5 2017-11-30 stsp if (treeobj2)
461 789689b5 2017-11-30 stsp got_object_close(treeobj2);
462 789689b5 2017-11-30 stsp return err;
465 474b4f94 2017-11-30 stsp static const struct got_error *
466 54156555 2018-12-24 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
467 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
468 31b4484f 2019-07-27 stsp int diff_content)
470 f6861a81 2018-09-13 stsp const struct got_error *err;
471 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
472 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
474 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
478 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
479 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
483 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
487 31b4484f 2019-07-27 stsp err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg,
488 31b4484f 2019-07-27 stsp diff_content);
491 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
492 2c56f2ce 2017-11-30 stsp if (treeobj)
493 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
494 2c56f2ce 2017-11-30 stsp return err;
497 474b4f94 2017-11-30 stsp static const struct got_error *
498 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
499 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
500 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
502 013404a9 2017-11-30 stsp /* XXX TODO */
503 474b4f94 2017-11-30 stsp return NULL;
506 474b4f94 2017-11-30 stsp static const struct got_error *
507 56e0773d 2019-11-28 stsp diff_entry_old_new(struct got_tree_entry *te1,
508 56e0773d 2019-11-28 stsp struct got_tree_entry *te2, const char *label1, const char *label2,
509 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
510 31b4484f 2019-07-27 stsp int diff_content)
512 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
513 19ae6da1 2018-11-05 stsp int id_match;
515 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te1))
516 63c5ca5d 2019-08-24 stsp return NULL;
518 474b4f94 2017-11-30 stsp if (te2 == NULL) {
519 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
520 56e0773d 2019-11-28 stsp err = diff_deleted_tree(&te1->id, label1, repo,
521 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
523 31b4484f 2019-07-27 stsp if (diff_content)
524 56e0773d 2019-11-28 stsp err = diff_deleted_blob(&te1->id, label1,
525 46f68b20 2019-10-19 stsp te1->mode, repo, cb, cb_arg);
527 56e0773d 2019-11-28 stsp err = cb(cb_arg, NULL, NULL, &te1->id, NULL,
528 46f68b20 2019-10-19 stsp label1, NULL, te1->mode, 0, repo);
530 f6861a81 2018-09-13 stsp return err;
531 63c5ca5d 2019-08-24 stsp } else if (got_object_tree_entry_is_submodule(te2))
532 63c5ca5d 2019-08-24 stsp return NULL;
534 56e0773d 2019-11-28 stsp id_match = (got_object_id_cmp(&te1->id, &te2->id) == 0);
535 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
536 19ae6da1 2018-11-05 stsp if (!id_match)
537 56e0773d 2019-11-28 stsp return diff_modified_tree(&te1->id, &te2->id,
538 31b4484f 2019-07-27 stsp label1, label2, repo, cb, cb_arg, diff_content);
539 40dde666 2020-07-23 stsp } else if ((S_ISREG(te1->mode) || S_ISLNK(te1->mode)) &&
540 40dde666 2020-07-23 stsp (S_ISREG(te2->mode) || S_ISLNK(te2->mode))) {
541 46f68b20 2019-10-19 stsp if (!id_match ||
542 40dde666 2020-07-23 stsp ((te1->mode & (S_IFLNK | S_IXUSR))) !=
543 40dde666 2020-07-23 stsp (te2->mode & (S_IFLNK | S_IXUSR))) {
544 31b4484f 2019-07-27 stsp if (diff_content)
545 56e0773d 2019-11-28 stsp return diff_modified_blob(&te1->id, &te2->id,
546 46f68b20 2019-10-19 stsp label1, label2, te1->mode, te2->mode,
547 46f68b20 2019-10-19 stsp repo, cb, cb_arg);
549 56e0773d 2019-11-28 stsp return cb(cb_arg, NULL, NULL, &te1->id,
550 56e0773d 2019-11-28 stsp &te2->id, label1, label2, te1->mode,
551 46f68b20 2019-10-19 stsp te2->mode, repo);
555 19ae6da1 2018-11-05 stsp if (id_match)
556 f6861a81 2018-09-13 stsp return NULL;
558 56e0773d 2019-11-28 stsp return diff_kind_mismatch(&te1->id, &te2->id, label1, label2, repo,
559 aaa13589 2019-06-01 stsp cb, cb_arg);
562 474b4f94 2017-11-30 stsp static const struct got_error *
563 56e0773d 2019-11-28 stsp diff_entry_new_old(struct got_tree_entry *te2,
564 56e0773d 2019-11-28 stsp struct got_tree_entry *te1, const char *label2,
565 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
566 31b4484f 2019-07-27 stsp int diff_content)
568 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
569 63c5ca5d 2019-08-24 stsp return NULL;
571 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te2))
572 f6861a81 2018-09-13 stsp return NULL;
574 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
575 56e0773d 2019-11-28 stsp return diff_added_tree(&te2->id, label2, repo, cb, cb_arg,
576 31b4484f 2019-07-27 stsp diff_content);
578 31b4484f 2019-07-27 stsp if (diff_content)
579 56e0773d 2019-11-28 stsp return diff_added_blob(&te2->id, label2, te2->mode, repo, cb,
582 56e0773d 2019-11-28 stsp return cb(cb_arg, NULL, NULL, NULL, &te2->id, NULL, label2, 0,
583 46f68b20 2019-10-19 stsp te2->mode, repo);
586 0208f208 2020-05-05 stsp const struct got_error *
587 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths(void *arg, struct got_blob_object *blob1,
588 0208f208 2020-05-05 stsp struct got_blob_object *blob2, struct got_object_id *id1,
589 0208f208 2020-05-05 stsp struct got_object_id *id2, const char *label1, const char *label2,
590 0208f208 2020-05-05 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
592 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
593 0208f208 2020-05-05 stsp struct got_pathlist_head *paths = arg;
594 0208f208 2020-05-05 stsp struct got_diff_changed_path *change = NULL;
595 0208f208 2020-05-05 stsp char *path = NULL;
597 0208f208 2020-05-05 stsp path = strdup(label2 ? label2 : label1);
598 0208f208 2020-05-05 stsp if (path == NULL)
599 0208f208 2020-05-05 stsp return got_error_from_errno("malloc");
601 0208f208 2020-05-05 stsp change = malloc(sizeof(*change));
602 0208f208 2020-05-05 stsp if (change == NULL) {
603 0208f208 2020-05-05 stsp err = got_error_from_errno("malloc");
607 0208f208 2020-05-05 stsp change->status = GOT_STATUS_NO_CHANGE;
608 0208f208 2020-05-05 stsp if (id1 == NULL)
609 0208f208 2020-05-05 stsp change->status = GOT_STATUS_ADD;
610 0208f208 2020-05-05 stsp else if (id2 == NULL)
611 0208f208 2020-05-05 stsp change->status = GOT_STATUS_DELETE;
613 0208f208 2020-05-05 stsp if (got_object_id_cmp(id1, id2) != 0)
614 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODIFY;
615 0208f208 2020-05-05 stsp else if (mode1 != mode2)
616 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODE_CHANGE;
619 0208f208 2020-05-05 stsp err = got_pathlist_insert(NULL, paths, path, change);
622 0208f208 2020-05-05 stsp free(path);
623 0208f208 2020-05-05 stsp free(change);
625 0208f208 2020-05-05 stsp return err;
628 474b4f94 2017-11-30 stsp const struct got_error *
629 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
630 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
631 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
633 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
634 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
635 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
636 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
637 56e0773d 2019-11-28 stsp int tidx1 = 0, tidx2 = 0;
639 883f0469 2018-06-23 stsp if (tree1) {
640 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, 0);
641 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
642 f6861a81 2018-09-13 stsp te1->name) == -1)
643 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
645 883f0469 2018-06-23 stsp if (tree2) {
646 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, 0);
647 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
648 f6861a81 2018-09-13 stsp te2->name) == -1)
649 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
654 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
656 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
657 1de5e065 2019-06-01 stsp te1->name);
661 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
662 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
664 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
666 aaa13589 2019-06-01 stsp err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
667 31b4484f 2019-07-27 stsp cb_arg, diff_content);
673 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
675 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
676 1de5e065 2019-06-01 stsp te2->name);
679 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
680 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te->name) == -1)
682 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
684 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
685 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te2->name) == -1)
687 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
689 31b4484f 2019-07-27 stsp err = diff_entry_new_old(te2, te, l2, repo,
690 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
699 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, tidx1);
701 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
702 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
703 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
709 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, tidx2);
711 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
712 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
713 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
715 474b4f94 2017-11-30 stsp } while (te1 || te2);
717 11528a82 2018-05-19 stsp return err;
720 11528a82 2018-05-19 stsp const struct got_error *
721 fe621944 2020-11-10 stsp got_diff_objects_as_blobs(off_t **line_offsets, size_t *nlines,
722 fe621944 2020-11-10 stsp struct got_object_id *id1, struct got_object_id *id2,
723 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context,
724 63035f9f 2019-10-06 stsp int ignore_whitespace, struct got_repository *repo, FILE *outfile)
726 11528a82 2018-05-19 stsp const struct got_error *err;
727 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
729 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
730 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
733 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob1, repo, id1, 8192);
738 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob2, repo, id2, 8192);
742 fe621944 2020-11-10 stsp err = got_diff_blob(line_offsets, nlines, blob1, blob2,
743 fe621944 2020-11-10 stsp label1, label2, diff_context, ignore_whitespace, outfile);
746 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
748 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
749 474b4f94 2017-11-30 stsp return err;
752 11528a82 2018-05-19 stsp const struct got_error *
753 fe621944 2020-11-10 stsp got_diff_objects_as_trees(off_t **line_offsets, size_t *nlines,
754 fe621944 2020-11-10 stsp struct got_object_id *id1, struct got_object_id *id2,
755 63035f9f 2019-10-06 stsp char *label1, char *label2, int diff_context, int ignore_whitespace,
756 63035f9f 2019-10-06 stsp struct got_repository *repo, FILE *outfile)
758 11528a82 2018-05-19 stsp const struct got_error *err;
759 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
760 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
761 fe621944 2020-11-10 stsp int want_lineoffsets = (line_offsets != NULL && *line_offsets != NULL);
763 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
764 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
767 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
772 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
776 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
777 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
778 aaa13589 2019-06-01 stsp arg.outfile = outfile;
779 fe621944 2020-11-10 stsp if (want_lineoffsets) {
780 fe621944 2020-11-10 stsp arg.line_offsets = *line_offsets;
781 fe621944 2020-11-10 stsp arg.nlines = *nlines;
783 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
784 fe621944 2020-11-10 stsp arg.nlines = 0;
786 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo,
787 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
789 fe621944 2020-11-10 stsp if (want_lineoffsets) {
790 fe621944 2020-11-10 stsp *line_offsets = arg.line_offsets; /* was likely re-allocated */
791 fe621944 2020-11-10 stsp *nlines = arg.nlines;
795 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
797 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
798 11528a82 2018-05-19 stsp return err;
801 11528a82 2018-05-19 stsp const struct got_error *
802 fe621944 2020-11-10 stsp got_diff_objects_as_commits(off_t **line_offsets, size_t *nlines,
803 fe621944 2020-11-10 stsp struct got_object_id *id1, struct got_object_id *id2,
804 fe621944 2020-11-10 stsp int diff_context, int ignore_whitespace,
805 15a94983 2018-12-23 stsp struct got_repository *repo, FILE *outfile)
807 11528a82 2018-05-19 stsp const struct got_error *err;
808 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
810 15a94983 2018-12-23 stsp if (id2 == NULL)
811 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
814 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
819 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
823 fe621944 2020-11-10 stsp err = got_diff_objects_as_trees(line_offsets, nlines,
824 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
825 63035f9f 2019-10-06 stsp got_object_commit_get_tree_id(commit2), "", "", diff_context,
826 63035f9f 2019-10-06 stsp ignore_whitespace, repo, outfile);
828 11528a82 2018-05-19 stsp if (commit1)
829 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
830 11528a82 2018-05-19 stsp if (commit2)
831 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
832 11528a82 2018-05-19 stsp return err;
835 dc424a06 2019-08-07 stsp const struct got_error *
836 fe621944 2020-11-10 stsp got_diff_files(struct got_diffreg_result **resultp,
837 fe621944 2020-11-10 stsp FILE *f1, const char *label1, FILE *f2, const char *label2,
838 fe621944 2020-11-10 stsp int diff_context, int ignore_whitespace, FILE *outfile)
840 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
841 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
843 fe621944 2020-11-10 stsp if (resultp)
844 fe621944 2020-11-10 stsp *resultp = NULL;
846 dc424a06 2019-08-07 stsp if (outfile) {
847 dc424a06 2019-08-07 stsp fprintf(outfile, "file - %s\n",
848 dc424a06 2019-08-07 stsp f1 == NULL ? "/dev/null" : label1);
849 dc424a06 2019-08-07 stsp fprintf(outfile, "file + %s\n",
850 dc424a06 2019-08-07 stsp f2 == NULL ? "/dev/null" : label2);
853 fe621944 2020-11-10 stsp err = got_diffreg(&diffreg_result, f1, f2, GOT_DIFF_ALGORITHM_PATIENCE,
854 fe621944 2020-11-10 stsp ignore_whitespace);
858 fe621944 2020-11-10 stsp if (outfile) {
859 fe621944 2020-11-10 stsp err = got_diffreg_output(NULL, NULL, diffreg_result,
860 fe621944 2020-11-10 stsp f1, f2, label1, label2, GOT_DIFF_OUTPUT_UNIDIFF,
861 fe621944 2020-11-10 stsp diff_context, outfile);
867 fe621944 2020-11-10 stsp if (resultp && err == NULL)
868 fe621944 2020-11-10 stsp *resultp = diffreg_result;
869 fe621944 2020-11-10 stsp else if (diffreg_result) {
870 fe621944 2020-11-10 stsp const struct got_error *free_err;
871 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
872 fe621944 2020-11-10 stsp if (free_err && err == NULL)
873 fe621944 2020-11-10 stsp err = free_err;
876 dc424a06 2019-08-07 stsp return err;
