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 8b925c6c 2022-07-16 thomas #include <sys/queue.h>
18 1c7f0520 2017-11-29 stsp #include <sys/stat.h>
20 7d283eee 2017-11-29 stsp #include <stdio.h>
21 7d283eee 2017-11-29 stsp #include <stdlib.h>
22 7d283eee 2017-11-29 stsp #include <string.h>
23 f9d67749 2017-11-30 stsp #include <limits.h>
24 7d283eee 2017-11-29 stsp #include <zlib.h>
26 dd038bc6 2021-09-21 thomas.ad #include "got_compat.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 324d37e7 2019-05-11 stsp #include "got_path.h"
33 0208f208 2020-05-05 stsp #include "got_cancel.h"
34 0208f208 2020-05-05 stsp #include "got_worktree.h"
35 1758cce7 2022-06-13 thomas #include "got_opentemp.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 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
60 46f68b20 2019-10-19 stsp const char *label1, const char *label2, mode_t mode1, mode_t mode2,
61 25ec7006 2022-07-01 thomas int diff_context, int ignore_whitespace, int force_text_diff, FILE *outfile,
62 25ec7006 2022-07-01 thomas enum got_diff_algorithm diff_algo)
64 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
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 0c6f49ba 2022-07-01 thomas const 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];
75 9c659ea0 2020-11-22 stsp else if (line_offsets) {
76 9c659ea0 2020-11-22 stsp err = add_line_offset(line_offsets, nlines, 0);
81 fe621944 2020-11-10 stsp if (resultp)
82 fe621944 2020-11-10 stsp *resultp = NULL;
85 1758cce7 2022-06-13 thomas err = got_opentemp_truncate(f1);
87 a0f32f33 2022-06-13 thomas goto done;
90 1758cce7 2022-06-13 thomas err = got_opentemp_truncate(f2);
92 a0f32f33 2022-06-13 thomas goto done;
96 98abbc84 2017-11-30 stsp if (blob1) {
97 f934cf2c 2018-02-12 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
98 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
103 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
106 98abbc84 2017-11-30 stsp if (blob2) {
107 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
108 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
113 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
115 09de383e 2018-12-24 stsp if (outfile) {
116 46f68b20 2019-10-19 stsp char *modestr1 = NULL, *modestr2 = NULL;
117 40dde666 2020-07-23 stsp int modebits;
118 46f68b20 2019-10-19 stsp if (mode1 && mode1 != mode2) {
119 40dde666 2020-07-23 stsp if (S_ISLNK(mode1))
120 40dde666 2020-07-23 stsp modebits = S_IFLNK;
122 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
123 46f68b20 2019-10-19 stsp if (asprintf(&modestr1, " (mode %o)",
124 40dde666 2020-07-23 stsp mode1 & modebits) == -1) {
125 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
129 46f68b20 2019-10-19 stsp if (mode2 && mode1 != mode2) {
130 40dde666 2020-07-23 stsp if (S_ISLNK(mode2))
131 40dde666 2020-07-23 stsp modebits = S_IFLNK;
133 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
134 46f68b20 2019-10-19 stsp if (asprintf(&modestr2, " (mode %o)",
135 40dde666 2020-07-23 stsp mode2 & modebits) == -1) {
136 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
140 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob - %s%s\n", idstr1,
141 46f68b20 2019-10-19 stsp modestr1 ? modestr1 : "");
144 fe621944 2020-11-10 stsp outoff += n;
145 fe621944 2020-11-10 stsp if (line_offsets) {
146 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
151 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob + %s%s\n", idstr2,
152 46f68b20 2019-10-19 stsp modestr2 ? modestr2 : "");
155 fe621944 2020-11-10 stsp outoff += n;
156 fe621944 2020-11-10 stsp if (line_offsets) {
157 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
162 46f68b20 2019-10-19 stsp free(modestr1);
163 46f68b20 2019-10-19 stsp free(modestr2);
165 25ec7006 2022-07-01 thomas err = got_diffreg(&result, f1, f2, diff_algo, ignore_whitespace,
166 25ec7006 2022-07-01 thomas force_text_diff);
170 fe621944 2020-11-10 stsp if (outfile) {
171 1cb46f00 2020-11-21 stsp err = got_diffreg_output(line_offsets, nlines, result,
172 1cb46f00 2020-11-21 stsp blob1 != NULL, blob2 != NULL,
173 fe621944 2020-11-10 stsp label1 ? label1 : idstr1,
174 fe621944 2020-11-10 stsp label2 ? label2 : idstr2,
175 fe621944 2020-11-10 stsp GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
180 fe621944 2020-11-10 stsp if (resultp && err == NULL)
181 fe621944 2020-11-10 stsp *resultp = result;
183 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
184 fe621944 2020-11-10 stsp if (free_err && err == NULL)
185 fe621944 2020-11-10 stsp err = free_err;
188 7d283eee 2017-11-29 stsp return err;
191 aaa13589 2019-06-01 stsp const struct got_error *
192 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
193 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
194 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
195 a0f32f33 2022-06-13 thomas const char *label1, const char *label2, mode_t mode1, mode_t mode2,
196 a0f32f33 2022-06-13 thomas struct got_repository *repo)
198 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg *a = arg;
200 fe621944 2020-11-10 stsp return diff_blobs(&a->line_offsets, &a->nlines, NULL,
201 a0f32f33 2022-06-13 thomas blob1, blob2, f1, f2, label1, label2, mode1, mode2, a->diff_context,
202 25ec7006 2022-07-01 thomas a->ignore_whitespace, a->force_text_diff, a->outfile, a->diff_algo);
205 404c43c4 2018-06-21 stsp const struct got_error *
206 fe621944 2020-11-10 stsp got_diff_blob(off_t **line_offsets, size_t *nlines,
207 fe621944 2020-11-10 stsp struct got_blob_object *blob1, struct got_blob_object *blob2,
208 a0f32f33 2022-06-13 thomas FILE *f1, FILE *f2, const char *label1, const char *label2,
209 25ec7006 2022-07-01 thomas enum got_diff_algorithm diff_algo, int diff_context,
210 25ec7006 2022-07-01 thomas int ignore_whitespace, int force_text_diff, FILE *outfile)
212 a0f32f33 2022-06-13 thomas return diff_blobs(line_offsets, nlines, NULL, blob1, blob2, f1, f2,
213 64453f7e 2020-11-21 stsp label1, label2, 0, 0, diff_context, ignore_whitespace,
214 25ec7006 2022-07-01 thomas force_text_diff, outfile, diff_algo);
217 7f1f93af 2019-08-06 stsp static const struct got_error *
218 fe621944 2020-11-10 stsp diff_blob_file(struct got_diffreg_result **resultp,
219 a0f32f33 2022-06-13 thomas struct got_blob_object *blob1, FILE *f1, off_t size1, const char *label1,
220 25ec7006 2022-07-01 thomas FILE *f2, int f2_exists, size_t size2, const char *label2,
221 25ec7006 2022-07-01 thomas enum got_diff_algorithm diff_algo, int diff_context, int ignore_whitespace,
222 25ec7006 2022-07-01 thomas int force_text_diff, FILE *outfile)
224 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
225 b72f483a 2019-02-05 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
226 0c6f49ba 2022-07-01 thomas const char *idstr1 = NULL;
227 fe621944 2020-11-10 stsp struct got_diffreg_result *result = NULL;
229 fe621944 2020-11-10 stsp if (resultp)
230 fe621944 2020-11-10 stsp *resultp = NULL;
232 a0f32f33 2022-06-13 thomas if (blob1)
233 b72f483a 2019-02-05 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
235 b72f483a 2019-02-05 stsp idstr1 = "/dev/null";
237 7f1f93af 2019-08-06 stsp if (outfile) {
238 4ce46740 2019-08-08 stsp fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
239 7f1f93af 2019-08-06 stsp fprintf(outfile, "file + %s\n",
240 dd2e2f52 2022-07-01 thomas f2_exists ? label2 : "/dev/null");
243 25ec7006 2022-07-01 thomas err = got_diffreg(&result, f1, f2, diff_algo, ignore_whitespace,
244 25ec7006 2022-07-01 thomas force_text_diff);
248 fe621944 2020-11-10 stsp if (outfile) {
249 1cb46f00 2020-11-21 stsp err = got_diffreg_output(NULL, NULL, result,
250 dd2e2f52 2022-07-01 thomas blob1 != NULL, f2_exists,
251 1cb46f00 2020-11-21 stsp label2, /* show local file's path, not a blob ID */
252 1cb46f00 2020-11-21 stsp label2, GOT_DIFF_OUTPUT_UNIDIFF,
253 1cb46f00 2020-11-21 stsp diff_context, outfile);
258 fe621944 2020-11-10 stsp if (resultp && err == NULL)
259 fe621944 2020-11-10 stsp *resultp = result;
260 fe621944 2020-11-10 stsp else if (result) {
261 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
262 fe621944 2020-11-10 stsp if (free_err && err == NULL)
263 fe621944 2020-11-10 stsp err = free_err;
266 b72f483a 2019-02-05 stsp return err;
269 7f1f93af 2019-08-06 stsp const struct got_error *
270 a0f32f33 2022-06-13 thomas got_diff_blob_file(struct got_blob_object *blob1, FILE *f1, off_t size1,
271 dd2e2f52 2022-07-01 thomas const char *label1, FILE *f2, int f2_exists, size_t size2,
272 25ec7006 2022-07-01 thomas const char *label2, enum got_diff_algorithm diff_algo, int diff_context,
273 25ec7006 2022-07-01 thomas int ignore_whitespace, int force_text_diff, FILE *outfile)
275 dd2e2f52 2022-07-01 thomas return diff_blob_file(NULL, blob1, f1, size1, label1, f2, f2_exists,
276 25ec7006 2022-07-01 thomas size2, label2, diff_algo, diff_context, ignore_whitespace,
277 25ec7006 2022-07-01 thomas force_text_diff, outfile );
280 474b4f94 2017-11-30 stsp static const struct got_error *
281 dd2e2f52 2022-07-01 thomas diff_added_blob(struct got_object_id *id, FILE *f1, FILE *f2, int fd2,
282 19a6a6b5 2022-07-01 thomas const char *label, mode_t mode, struct got_repository *repo,
283 a0f32f33 2022-06-13 thomas got_diff_blob_cb cb, void *cb_arg)
285 4e22badc 2017-11-30 stsp const struct got_error *err;
286 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
287 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
289 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
291 4e22badc 2017-11-30 stsp return err;
293 dd2e2f52 2022-07-01 thomas err = got_object_blob_open(&blob, repo, obj, 8192, fd2);
296 dd2e2f52 2022-07-01 thomas err = cb(cb_arg, NULL, blob, f1, f2, NULL, id,
297 a0f32f33 2022-06-13 thomas NULL, label, 0, mode, repo);
299 2acfca77 2018-04-01 stsp got_object_close(obj);
301 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
302 2acfca77 2018-04-01 stsp return err;
305 474b4f94 2017-11-30 stsp static const struct got_error *
306 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
307 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
308 19a6a6b5 2022-07-01 thomas const char *label1, const char *label2,
309 a0f32f33 2022-06-13 thomas mode_t mode1, mode_t mode2, struct got_repository *repo,
310 a0f32f33 2022-06-13 thomas got_diff_blob_cb cb, void *cb_arg)
312 6a213ccb 2017-11-30 stsp const struct got_error *err;
313 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
314 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
315 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
316 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
318 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
320 730a8aa0 2018-04-24 stsp return err;
322 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
323 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
327 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
330 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
331 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
335 f4ae6ddb 2022-07-01 thomas err = got_object_blob_open(&blob1, repo, obj1, 8192, fd1);
339 f4ae6ddb 2022-07-01 thomas err = got_object_blob_open(&blob2, repo, obj2, 8192, fd2);
343 a0f32f33 2022-06-13 thomas err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2, label1, label2,
344 a0f32f33 2022-06-13 thomas mode1, mode2, repo);
347 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
349 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
351 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
353 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
354 6a213ccb 2017-11-30 stsp return err;
357 474b4f94 2017-11-30 stsp static const struct got_error *
358 dd2e2f52 2022-07-01 thomas diff_deleted_blob(struct got_object_id *id, FILE *f1, int fd1,
359 dd2e2f52 2022-07-01 thomas FILE *f2, const char *label, mode_t mode, struct got_repository *repo,
360 19a6a6b5 2022-07-01 thomas 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 dd2e2f52 2022-07-01 thomas err = got_object_blob_open(&blob, repo, obj, 8192, fd1);
373 dd2e2f52 2022-07-01 thomas err = cb(cb_arg, blob, NULL, f1, f2, id, NULL, label, NULL,
374 a0f32f33 2022-06-13 thomas mode, 0, repo);
376 2acfca77 2018-04-01 stsp got_object_close(obj);
378 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
379 2acfca77 2018-04-01 stsp return err;
382 474b4f94 2017-11-30 stsp static const struct got_error *
383 dd2e2f52 2022-07-01 thomas diff_added_tree(struct got_object_id *id, FILE *f1, FILE *f2, int fd2,
384 dd2e2f52 2022-07-01 thomas const char *label, struct got_repository *repo, got_diff_blob_cb cb,
385 dd2e2f52 2022-07-01 thomas void *cb_arg, int diff_content)
387 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
388 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
389 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
391 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
395 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
396 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
400 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
404 dd2e2f52 2022-07-01 thomas err = got_diff_tree(NULL, tree, f1, f2, -1, fd2, NULL, label,
405 a0f32f33 2022-06-13 thomas repo, cb, cb_arg, diff_content);
408 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
409 9c70d4c3 2017-11-30 stsp if (treeobj)
410 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
411 9c70d4c3 2017-11-30 stsp return err;
414 474b4f94 2017-11-30 stsp static const struct got_error *
415 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
416 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
417 19a6a6b5 2022-07-01 thomas const char *label1, const char *label2,
418 a0f32f33 2022-06-13 thomas struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
419 a0f32f33 2022-06-13 thomas int diff_content)
421 f6861a81 2018-09-13 stsp const struct got_error *err;
422 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
423 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
424 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
425 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
427 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
431 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
432 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
436 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
440 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
441 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
445 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
449 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
453 19a6a6b5 2022-07-01 thomas err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2,
454 19a6a6b5 2022-07-01 thomas label1, label2, repo, cb, cb_arg, diff_content);
458 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
460 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
461 789689b5 2017-11-30 stsp if (treeobj1)
462 789689b5 2017-11-30 stsp got_object_close(treeobj1);
463 789689b5 2017-11-30 stsp if (treeobj2)
464 789689b5 2017-11-30 stsp got_object_close(treeobj2);
465 789689b5 2017-11-30 stsp return err;
468 474b4f94 2017-11-30 stsp static const struct got_error *
469 dd2e2f52 2022-07-01 thomas diff_deleted_tree(struct got_object_id *id, FILE *f1, int fd1,
470 dd2e2f52 2022-07-01 thomas FILE *f2, const char *label, struct got_repository *repo,
471 19a6a6b5 2022-07-01 thomas got_diff_blob_cb cb, void *cb_arg, int diff_content)
473 f6861a81 2018-09-13 stsp const struct got_error *err;
474 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
475 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
477 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
481 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
482 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
486 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
490 dd2e2f52 2022-07-01 thomas err = got_diff_tree(tree, NULL, f1, f2, fd1, -1, label, NULL,
491 a0f32f33 2022-06-13 thomas repo, cb, cb_arg, diff_content);
494 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
495 2c56f2ce 2017-11-30 stsp if (treeobj)
496 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
497 2c56f2ce 2017-11-30 stsp return err;
500 474b4f94 2017-11-30 stsp static const struct got_error *
501 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
502 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
503 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
505 013404a9 2017-11-30 stsp /* XXX TODO */
506 474b4f94 2017-11-30 stsp return NULL;
509 474b4f94 2017-11-30 stsp static const struct got_error *
510 a0f32f33 2022-06-13 thomas diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_entry *te2,
511 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
512 19a6a6b5 2022-07-01 thomas const char *label1, const char *label2,
513 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
514 31b4484f 2019-07-27 stsp int diff_content)
516 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
517 19ae6da1 2018-11-05 stsp int id_match;
519 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te1))
520 63c5ca5d 2019-08-24 stsp return NULL;
522 474b4f94 2017-11-30 stsp if (te2 == NULL) {
523 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
524 dd2e2f52 2022-07-01 thomas err = diff_deleted_tree(&te1->id, f1, fd1, f2,
525 dd2e2f52 2022-07-01 thomas label1, repo, cb, cb_arg, diff_content);
527 31b4484f 2019-07-27 stsp if (diff_content)
528 19a6a6b5 2022-07-01 thomas err = diff_deleted_blob(&te1->id, f1, fd1,
529 dd2e2f52 2022-07-01 thomas f2, label1, te1->mode, repo, cb, cb_arg);
531 a0f32f33 2022-06-13 thomas err = cb(cb_arg, NULL, NULL, NULL, NULL,
532 a0f32f33 2022-06-13 thomas &te1->id, NULL, label1, NULL,
533 a0f32f33 2022-06-13 thomas te1->mode, 0, repo);
535 f6861a81 2018-09-13 stsp return err;
536 63c5ca5d 2019-08-24 stsp } else if (got_object_tree_entry_is_submodule(te2))
537 63c5ca5d 2019-08-24 stsp return NULL;
539 56e0773d 2019-11-28 stsp id_match = (got_object_id_cmp(&te1->id, &te2->id) == 0);
540 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
541 19ae6da1 2018-11-05 stsp if (!id_match)
542 a0f32f33 2022-06-13 thomas return diff_modified_tree(&te1->id, &te2->id, f1, f2,
543 19a6a6b5 2022-07-01 thomas fd1, fd2, label1, label2, repo, cb, cb_arg,
544 19a6a6b5 2022-07-01 thomas diff_content);
545 40dde666 2020-07-23 stsp } else if ((S_ISREG(te1->mode) || S_ISLNK(te1->mode)) &&
546 40dde666 2020-07-23 stsp (S_ISREG(te2->mode) || S_ISLNK(te2->mode))) {
547 46f68b20 2019-10-19 stsp if (!id_match ||
548 40dde666 2020-07-23 stsp ((te1->mode & (S_IFLNK | S_IXUSR))) !=
549 40dde666 2020-07-23 stsp (te2->mode & (S_IFLNK | S_IXUSR))) {
550 31b4484f 2019-07-27 stsp if (diff_content)
551 56e0773d 2019-11-28 stsp return diff_modified_blob(&te1->id, &te2->id,
552 19a6a6b5 2022-07-01 thomas f1, f2, fd1, fd2, label1, label2,
553 19a6a6b5 2022-07-01 thomas te1->mode, te2->mode, repo, cb, cb_arg);
555 a0f32f33 2022-06-13 thomas return cb(cb_arg, NULL, NULL, NULL, NULL,
556 a0f32f33 2022-06-13 thomas &te1->id, &te2->id, label1, label2,
557 a0f32f33 2022-06-13 thomas te1->mode, te2->mode, repo);
561 19ae6da1 2018-11-05 stsp if (id_match)
562 f6861a81 2018-09-13 stsp return NULL;
564 56e0773d 2019-11-28 stsp return diff_kind_mismatch(&te1->id, &te2->id, label1, label2, repo,
565 aaa13589 2019-06-01 stsp cb, cb_arg);
568 474b4f94 2017-11-30 stsp static const struct got_error *
569 56e0773d 2019-11-28 stsp diff_entry_new_old(struct got_tree_entry *te2,
570 dd2e2f52 2022-07-01 thomas struct got_tree_entry *te1, FILE *f1, FILE *f2, int fd2, const char *label2,
571 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
572 31b4484f 2019-07-27 stsp int diff_content)
574 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
575 63c5ca5d 2019-08-24 stsp return NULL;
577 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te2))
578 f6861a81 2018-09-13 stsp return NULL;
580 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
581 dd2e2f52 2022-07-01 thomas return diff_added_tree(&te2->id, f1, f2, fd2, label2,
582 a0f32f33 2022-06-13 thomas repo, cb, cb_arg, diff_content);
584 31b4484f 2019-07-27 stsp if (diff_content)
585 dd2e2f52 2022-07-01 thomas return diff_added_blob(&te2->id, f1, f2, fd2,
586 19a6a6b5 2022-07-01 thomas label2, te2->mode, repo, cb, cb_arg);
588 a0f32f33 2022-06-13 thomas return cb(cb_arg, NULL, NULL, NULL, NULL, NULL, &te2->id,
589 a0f32f33 2022-06-13 thomas NULL, label2, 0, te2->mode, repo);
592 0208f208 2020-05-05 stsp const struct got_error *
593 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths(void *arg, struct got_blob_object *blob1,
594 a0f32f33 2022-06-13 thomas struct got_blob_object *blob2, FILE *f1, FILE *f2,
595 a0f32f33 2022-06-13 thomas struct got_object_id *id1, struct got_object_id *id2,
596 a0f32f33 2022-06-13 thomas const char *label1, const char *label2,
597 0208f208 2020-05-05 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
599 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
600 0208f208 2020-05-05 stsp struct got_pathlist_head *paths = arg;
601 0208f208 2020-05-05 stsp struct got_diff_changed_path *change = NULL;
602 0208f208 2020-05-05 stsp char *path = NULL;
604 0208f208 2020-05-05 stsp path = strdup(label2 ? label2 : label1);
605 0208f208 2020-05-05 stsp if (path == NULL)
606 0208f208 2020-05-05 stsp return got_error_from_errno("malloc");
608 0208f208 2020-05-05 stsp change = malloc(sizeof(*change));
609 0208f208 2020-05-05 stsp if (change == NULL) {
610 0208f208 2020-05-05 stsp err = got_error_from_errno("malloc");
614 0208f208 2020-05-05 stsp change->status = GOT_STATUS_NO_CHANGE;
615 0208f208 2020-05-05 stsp if (id1 == NULL)
616 0208f208 2020-05-05 stsp change->status = GOT_STATUS_ADD;
617 0208f208 2020-05-05 stsp else if (id2 == NULL)
618 0208f208 2020-05-05 stsp change->status = GOT_STATUS_DELETE;
620 0208f208 2020-05-05 stsp if (got_object_id_cmp(id1, id2) != 0)
621 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODIFY;
622 0208f208 2020-05-05 stsp else if (mode1 != mode2)
623 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODE_CHANGE;
626 4c71f93b 2021-12-31 thomas err = got_pathlist_append(paths, path, change);
629 0208f208 2020-05-05 stsp free(path);
630 0208f208 2020-05-05 stsp free(change);
632 0208f208 2020-05-05 stsp return err;
635 474b4f94 2017-11-30 stsp const struct got_error *
636 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
637 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
638 19a6a6b5 2022-07-01 thomas const char *label1, const char *label2,
639 a0f32f33 2022-06-13 thomas struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
640 a0f32f33 2022-06-13 thomas int diff_content)
642 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
643 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
644 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
645 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
646 56e0773d 2019-11-28 stsp int tidx1 = 0, tidx2 = 0;
648 883f0469 2018-06-23 stsp if (tree1) {
649 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, 0);
650 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
651 f6861a81 2018-09-13 stsp te1->name) == -1)
652 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
654 883f0469 2018-06-23 stsp if (tree2) {
655 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, 0);
656 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
657 f6861a81 2018-09-13 stsp te2->name) == -1)
658 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
663 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
665 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
666 1de5e065 2019-06-01 stsp te1->name);
670 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
671 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
673 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
675 19a6a6b5 2022-07-01 thomas err = diff_entry_old_new(te1, te, f1, f2, fd1, fd2,
676 19a6a6b5 2022-07-01 thomas l1, l2, repo, cb, cb_arg, diff_content);
682 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
684 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
685 1de5e065 2019-06-01 stsp te2->name);
688 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
689 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te->name) == -1)
691 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
693 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
694 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te2->name) == -1)
696 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
698 dd2e2f52 2022-07-01 thomas err = diff_entry_new_old(te2, te, f1, f2, fd2, l2,
699 dd2e2f52 2022-07-01 thomas repo, cb, cb_arg, diff_content);
708 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, tidx1);
710 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
711 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
712 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
718 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, tidx2);
720 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
721 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
722 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
724 474b4f94 2017-11-30 stsp } while (te1 || te2);
726 11528a82 2018-05-19 stsp return err;
729 11528a82 2018-05-19 stsp const struct got_error *
730 fe621944 2020-11-10 stsp got_diff_objects_as_blobs(off_t **line_offsets, size_t *nlines,
731 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
732 19a6a6b5 2022-07-01 thomas struct got_object_id *id1, struct got_object_id *id2,
733 25ec7006 2022-07-01 thomas const char *label1, const char *label2,
734 25ec7006 2022-07-01 thomas enum got_diff_algorithm diff_algo, int diff_context,
735 64453f7e 2020-11-21 stsp int ignore_whitespace, int force_text_diff,
736 64453f7e 2020-11-21 stsp struct got_repository *repo, FILE *outfile)
738 11528a82 2018-05-19 stsp const struct got_error *err;
739 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
741 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
742 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
745 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob1, repo, id1, 8192, fd1);
750 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob2, repo, id2, 8192, fd2);
754 a0f32f33 2022-06-13 thomas err = got_diff_blob(line_offsets, nlines, blob1, blob2, f1, f2,
755 25ec7006 2022-07-01 thomas label1, label2, diff_algo, diff_context, ignore_whitespace,
756 25ec7006 2022-07-01 thomas force_text_diff, outfile);
758 cc8021af 2021-10-12 thomas if (blob1)
759 cc8021af 2021-10-12 thomas got_object_blob_close(blob1);
760 cc8021af 2021-10-12 thomas if (blob2)
761 cc8021af 2021-10-12 thomas got_object_blob_close(blob2);
762 cc8021af 2021-10-12 thomas return err;
765 cc8021af 2021-10-12 thomas static const struct got_error *
766 cc8021af 2021-10-12 thomas diff_paths(struct got_tree_object *tree1, struct got_tree_object *tree2,
767 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2, struct got_pathlist_head *paths,
768 a0f32f33 2022-06-13 thomas struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
770 cc8021af 2021-10-12 thomas const struct got_error *err = NULL;
771 cc8021af 2021-10-12 thomas struct got_pathlist_entry *pe;
772 cc8021af 2021-10-12 thomas struct got_object_id *id1 = NULL, *id2 = NULL;
773 cc8021af 2021-10-12 thomas struct got_tree_object *subtree1 = NULL, *subtree2 = NULL;
774 cc8021af 2021-10-12 thomas struct got_blob_object *blob1 = NULL, *blob2 = NULL;
776 cc8021af 2021-10-12 thomas TAILQ_FOREACH(pe, paths, entry) {
777 cc8021af 2021-10-12 thomas int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
778 cc8021af 2021-10-12 thomas mode_t mode1 = 0, mode2 = 0;
780 cc8021af 2021-10-12 thomas free(id1);
781 cc8021af 2021-10-12 thomas id1 = NULL;
782 cc8021af 2021-10-12 thomas free(id2);
783 cc8021af 2021-10-12 thomas id2 = NULL;
784 cc8021af 2021-10-12 thomas if (subtree1) {
785 cc8021af 2021-10-12 thomas got_object_tree_close(subtree1);
786 cc8021af 2021-10-12 thomas subtree1 = NULL;
788 cc8021af 2021-10-12 thomas if (subtree2) {
789 cc8021af 2021-10-12 thomas got_object_tree_close(subtree2);
790 cc8021af 2021-10-12 thomas subtree2 = NULL;
792 cc8021af 2021-10-12 thomas if (blob1) {
793 cc8021af 2021-10-12 thomas got_object_blob_close(blob1);
794 cc8021af 2021-10-12 thomas blob1 = NULL;
796 cc8021af 2021-10-12 thomas if (blob2) {
797 cc8021af 2021-10-12 thomas got_object_blob_close(blob2);
798 cc8021af 2021-10-12 thomas blob2 = NULL;
801 cc8021af 2021-10-12 thomas err = got_object_tree_find_path(&id1, &mode1, repo, tree1,
802 cc8021af 2021-10-12 thomas pe->path);
803 cc8021af 2021-10-12 thomas if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
804 cc8021af 2021-10-12 thomas goto done;
805 cc8021af 2021-10-12 thomas err = got_object_tree_find_path(&id2, &mode2, repo, tree2,
806 cc8021af 2021-10-12 thomas pe->path);
807 cc8021af 2021-10-12 thomas if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
808 cc8021af 2021-10-12 thomas goto done;
809 cc8021af 2021-10-12 thomas if (id1 == NULL && id2 == NULL) {
810 cc8021af 2021-10-12 thomas err = got_error_path(pe->path, GOT_ERR_NO_TREE_ENTRY);
811 cc8021af 2021-10-12 thomas goto done;
813 cc8021af 2021-10-12 thomas if (id1) {
814 cc8021af 2021-10-12 thomas err = got_object_get_type(&type1, repo, id1);
816 cc8021af 2021-10-12 thomas goto done;
818 cc8021af 2021-10-12 thomas if (id2) {
819 cc8021af 2021-10-12 thomas err = got_object_get_type(&type2, repo, id2);
821 cc8021af 2021-10-12 thomas goto done;
823 cc8021af 2021-10-12 thomas if (type1 == GOT_OBJ_TYPE_ANY &&
824 cc8021af 2021-10-12 thomas type2 == GOT_OBJ_TYPE_ANY) {
825 cc8021af 2021-10-12 thomas err = got_error_path(pe->path, GOT_ERR_NO_OBJ);
826 cc8021af 2021-10-12 thomas goto done;
827 cc8021af 2021-10-12 thomas } else if (type1 != GOT_OBJ_TYPE_ANY &&
828 cc8021af 2021-10-12 thomas type2 != GOT_OBJ_TYPE_ANY && type1 != type2) {
829 cc8021af 2021-10-12 thomas err = got_error(GOT_ERR_OBJ_TYPE);
830 cc8021af 2021-10-12 thomas goto done;
833 cc8021af 2021-10-12 thomas if (type1 == GOT_OBJ_TYPE_BLOB ||
834 cc8021af 2021-10-12 thomas type2 == GOT_OBJ_TYPE_BLOB) {
835 cc8021af 2021-10-12 thomas if (id1) {
836 cc8021af 2021-10-12 thomas err = got_object_open_as_blob(&blob1, repo,
837 f4ae6ddb 2022-07-01 thomas id1, 8192, fd1);
839 cc8021af 2021-10-12 thomas goto done;
841 cc8021af 2021-10-12 thomas if (id2) {
842 cc8021af 2021-10-12 thomas err = got_object_open_as_blob(&blob2, repo,
843 f4ae6ddb 2022-07-01 thomas id2, 8192, fd2);
845 cc8021af 2021-10-12 thomas goto done;
847 a0f32f33 2022-06-13 thomas err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2,
848 cc8021af 2021-10-12 thomas id1 ? pe->path : "/dev/null",
849 cc8021af 2021-10-12 thomas id2 ? pe->path : "/dev/null",
850 cc8021af 2021-10-12 thomas mode1, mode2, repo);
852 cc8021af 2021-10-12 thomas goto done;
853 cc8021af 2021-10-12 thomas } else if (type1 == GOT_OBJ_TYPE_TREE ||
854 cc8021af 2021-10-12 thomas type2 == GOT_OBJ_TYPE_TREE) {
855 cc8021af 2021-10-12 thomas if (id1) {
856 cc8021af 2021-10-12 thomas err = got_object_open_as_tree(&subtree1, repo,
859 cc8021af 2021-10-12 thomas goto done;
861 cc8021af 2021-10-12 thomas if (id2) {
862 cc8021af 2021-10-12 thomas err = got_object_open_as_tree(&subtree2, repo,
865 cc8021af 2021-10-12 thomas goto done;
867 a0f32f33 2022-06-13 thomas err = got_diff_tree(subtree1, subtree2, f1, f2,
868 19a6a6b5 2022-07-01 thomas fd1, fd2,
869 cc8021af 2021-10-12 thomas id1 ? pe->path : "/dev/null",
870 cc8021af 2021-10-12 thomas id2 ? pe->path : "/dev/null",
871 cc8021af 2021-10-12 thomas repo, cb, cb_arg, 1);
873 cc8021af 2021-10-12 thomas goto done;
875 cc8021af 2021-10-12 thomas err = got_error(GOT_ERR_OBJ_TYPE);
876 cc8021af 2021-10-12 thomas goto done;
880 cc8021af 2021-10-12 thomas free(id1);
881 cc8021af 2021-10-12 thomas free(id2);
882 cc8021af 2021-10-12 thomas if (subtree1)
883 cc8021af 2021-10-12 thomas got_object_tree_close(subtree1);
884 cc8021af 2021-10-12 thomas if (subtree2)
885 cc8021af 2021-10-12 thomas got_object_tree_close(subtree2);
887 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
889 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
890 474b4f94 2017-11-30 stsp return err;
893 9b4458b4 2022-06-26 thomas static const struct got_error *
894 9b4458b4 2022-06-26 thomas show_object_id(off_t **line_offsets, size_t *nlines, const char *obj_typestr,
895 9b4458b4 2022-06-26 thomas int ch, const char *id_str, FILE *outfile)
897 9b4458b4 2022-06-26 thomas const struct got_error *err;
899 9b4458b4 2022-06-26 thomas off_t outoff = 0;
901 9b4458b4 2022-06-26 thomas n = fprintf(outfile, "%s %c %s\n", obj_typestr, ch, id_str);
902 9b4458b4 2022-06-26 thomas if (line_offsets != NULL && *line_offsets != NULL) {
903 9b4458b4 2022-06-26 thomas if (*nlines == 0) {
904 9b4458b4 2022-06-26 thomas err = add_line_offset(line_offsets, nlines, 0);
906 9b4458b4 2022-06-26 thomas return err;
908 9b4458b4 2022-06-26 thomas outoff = (*line_offsets)[*nlines - 1];
910 9b4458b4 2022-06-26 thomas outoff += n;
911 9b4458b4 2022-06-26 thomas err = add_line_offset(line_offsets, nlines, outoff);
913 9b4458b4 2022-06-26 thomas return err;
916 9b4458b4 2022-06-26 thomas return NULL;
919 9b4458b4 2022-06-26 thomas static const struct got_error *
920 9b4458b4 2022-06-26 thomas diff_objects_as_trees(off_t **line_offsets, size_t *nlines,
921 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
922 19a6a6b5 2022-07-01 thomas struct got_object_id *id1, struct got_object_id *id2,
923 0c6f49ba 2022-07-01 thomas struct got_pathlist_head *paths, const char *label1, const char *label2,
924 0c6f49ba 2022-07-01 thomas int diff_context, int ignore_whitespace, int force_text_diff,
925 25ec7006 2022-07-01 thomas struct got_repository *repo, FILE *outfile,
926 25ec7006 2022-07-01 thomas enum got_diff_algorithm diff_algo)
928 11528a82 2018-05-19 stsp const struct got_error *err;
929 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
930 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
931 fe621944 2020-11-10 stsp int want_lineoffsets = (line_offsets != NULL && *line_offsets != NULL);
933 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
934 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
937 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
942 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
947 25ec7006 2022-07-01 thomas arg.diff_algo = diff_algo;
948 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
949 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
950 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
951 aaa13589 2019-06-01 stsp arg.outfile = outfile;
952 fe621944 2020-11-10 stsp if (want_lineoffsets) {
953 fe621944 2020-11-10 stsp arg.line_offsets = *line_offsets;
954 fe621944 2020-11-10 stsp arg.nlines = *nlines;
956 fe621944 2020-11-10 stsp arg.line_offsets = NULL;
957 fe621944 2020-11-10 stsp arg.nlines = 0;
959 cc8021af 2021-10-12 thomas if (paths == NULL || TAILQ_EMPTY(paths)) {
960 19a6a6b5 2022-07-01 thomas err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2,
961 19a6a6b5 2022-07-01 thomas label1, label2, repo,
962 19a6a6b5 2022-07-01 thomas got_diff_blob_output_unidiff, &arg, 1);
964 19a6a6b5 2022-07-01 thomas err = diff_paths(tree1, tree2, f1, f2, fd1, fd2, paths, repo,
965 cc8021af 2021-10-12 thomas got_diff_blob_output_unidiff, &arg);
967 fe621944 2020-11-10 stsp if (want_lineoffsets) {
968 fe621944 2020-11-10 stsp *line_offsets = arg.line_offsets; /* was likely re-allocated */
969 fe621944 2020-11-10 stsp *nlines = arg.nlines;
973 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
975 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
976 11528a82 2018-05-19 stsp return err;
979 11528a82 2018-05-19 stsp const struct got_error *
980 9b4458b4 2022-06-26 thomas got_diff_objects_as_trees(off_t **line_offsets, size_t *nlines,
981 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
982 19a6a6b5 2022-07-01 thomas struct got_object_id *id1, struct got_object_id *id2,
983 0c6f49ba 2022-07-01 thomas struct got_pathlist_head *paths, const char *label1, const char *label2,
984 25ec7006 2022-07-01 thomas enum got_diff_algorithm diff_algo, int diff_context, int ignore_whitespace,
985 25ec7006 2022-07-01 thomas int force_text_diff, struct got_repository *repo, FILE *outfile)
987 9b4458b4 2022-06-26 thomas const struct got_error *err;
988 9b4458b4 2022-06-26 thomas char *idstr = NULL;
990 9b4458b4 2022-06-26 thomas if (id1 == NULL && id2 == NULL)
991 9b4458b4 2022-06-26 thomas return got_error(GOT_ERR_NO_OBJ);
993 9b4458b4 2022-06-26 thomas if (id1) {
994 9b4458b4 2022-06-26 thomas err = got_object_id_str(&idstr, id1);
996 9b4458b4 2022-06-26 thomas goto done;
997 9b4458b4 2022-06-26 thomas err = show_object_id(line_offsets, nlines, "tree", '-',
998 9b4458b4 2022-06-26 thomas idstr, outfile);
1000 9b4458b4 2022-06-26 thomas goto done;
1001 9b4458b4 2022-06-26 thomas free(idstr);
1002 9b4458b4 2022-06-26 thomas idstr = NULL;
1003 9b4458b4 2022-06-26 thomas } else {
1004 9b4458b4 2022-06-26 thomas err = show_object_id(line_offsets, nlines, "tree", '-',
1005 9b4458b4 2022-06-26 thomas "/dev/null", outfile);
1006 9b4458b4 2022-06-26 thomas if (err)
1007 9b4458b4 2022-06-26 thomas goto done;
1010 9b4458b4 2022-06-26 thomas if (id2) {
1011 9b4458b4 2022-06-26 thomas err = got_object_id_str(&idstr, id2);
1012 9b4458b4 2022-06-26 thomas if (err)
1013 9b4458b4 2022-06-26 thomas goto done;
1014 9b4458b4 2022-06-26 thomas err = show_object_id(line_offsets, nlines, "tree", '+',
1015 9b4458b4 2022-06-26 thomas idstr, outfile);
1016 9b4458b4 2022-06-26 thomas if (err)
1017 9b4458b4 2022-06-26 thomas goto done;
1018 9b4458b4 2022-06-26 thomas free(idstr);
1019 9b4458b4 2022-06-26 thomas idstr = NULL;
1020 9b4458b4 2022-06-26 thomas } else {
1021 9b4458b4 2022-06-26 thomas err = show_object_id(line_offsets, nlines, "tree", '+',
1022 9b4458b4 2022-06-26 thomas "/dev/null", outfile);
1023 9b4458b4 2022-06-26 thomas if (err)
1024 9b4458b4 2022-06-26 thomas goto done;
1027 19a6a6b5 2022-07-01 thomas err = diff_objects_as_trees(line_offsets, nlines, f1, f2, fd1, fd2,
1028 19a6a6b5 2022-07-01 thomas id1, id2, paths, label1, label2, diff_context, ignore_whitespace,
1029 25ec7006 2022-07-01 thomas force_text_diff, repo, outfile, diff_algo);
1031 9b4458b4 2022-06-26 thomas free(idstr);
1032 9b4458b4 2022-06-26 thomas return err;
1035 9b4458b4 2022-06-26 thomas const struct got_error *
1036 fe621944 2020-11-10 stsp got_diff_objects_as_commits(off_t **line_offsets, size_t *nlines,
1037 19a6a6b5 2022-07-01 thomas FILE *f1, FILE *f2, int fd1, int fd2,
1038 19a6a6b5 2022-07-01 thomas struct got_object_id *id1, struct got_object_id *id2,
1039 25ec7006 2022-07-01 thomas struct got_pathlist_head *paths, enum got_diff_algorithm diff_algo,
1040 64453f7e 2020-11-21 stsp int diff_context, int ignore_whitespace, int force_text_diff,
1041 15a94983 2018-12-23 stsp struct got_repository *repo, FILE *outfile)
1043 11528a82 2018-05-19 stsp const struct got_error *err;
1044 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
1045 9b4458b4 2022-06-26 thomas char *idstr = NULL;
1047 15a94983 2018-12-23 stsp if (id2 == NULL)
1048 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
1050 15a94983 2018-12-23 stsp if (id1) {
1051 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
1053 cd0acaa7 2018-05-20 stsp goto done;
1054 9b4458b4 2022-06-26 thomas err = got_object_id_str(&idstr, id1);
1055 9b4458b4 2022-06-26 thomas if (err)
1056 9b4458b4 2022-06-26 thomas goto done;
1057 9b4458b4 2022-06-26 thomas err = show_object_id(line_offsets, nlines, "commit", '-',
1058 9b4458b4 2022-06-26 thomas idstr, outfile);
1059 9b4458b4 2022-06-26 thomas if (err)
1060 9b4458b4 2022-06-26 thomas goto done;
1061 9b4458b4 2022-06-26 thomas free(idstr);
1062 9b4458b4 2022-06-26 thomas idstr = NULL;
1063 9b4458b4 2022-06-26 thomas } else {
1064 9b4458b4 2022-06-26 thomas err = show_object_id(line_offsets, nlines, "commit", '-',
1065 9b4458b4 2022-06-26 thomas "/dev/null", outfile);
1066 9b4458b4 2022-06-26 thomas if (err)
1067 9b4458b4 2022-06-26 thomas goto done;
1070 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
1072 9b697879 2018-05-20 stsp goto done;
1074 9b4458b4 2022-06-26 thomas err = got_object_id_str(&idstr, id2);
1075 9b4458b4 2022-06-26 thomas if (err)
1076 9b4458b4 2022-06-26 thomas goto done;
1077 9b4458b4 2022-06-26 thomas err = show_object_id(line_offsets, nlines, "commit", '+',
1078 9b4458b4 2022-06-26 thomas idstr, outfile);
1079 9b4458b4 2022-06-26 thomas if (err)
1080 9b4458b4 2022-06-26 thomas goto done;
1082 19a6a6b5 2022-07-01 thomas err = diff_objects_as_trees(line_offsets, nlines, f1, f2, fd1, fd2,
1083 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
1084 cc8021af 2021-10-12 thomas got_object_commit_get_tree_id(commit2), paths, "", "",
1085 25ec7006 2022-07-01 thomas diff_context, ignore_whitespace, force_text_diff, repo, outfile,
1086 25ec7006 2022-07-01 thomas diff_algo);
1088 11528a82 2018-05-19 stsp if (commit1)
1089 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
1090 11528a82 2018-05-19 stsp if (commit2)
1091 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
1092 9b4458b4 2022-06-26 thomas free(idstr);
1093 11528a82 2018-05-19 stsp return err;
1096 dc424a06 2019-08-07 stsp const struct got_error *
1097 fe621944 2020-11-10 stsp got_diff_files(struct got_diffreg_result **resultp,
1098 dd2e2f52 2022-07-01 thomas FILE *f1, int f1_exists, const char *label1, FILE *f2, int f2_exists,
1099 dd2e2f52 2022-07-01 thomas const char *label2, int diff_context, int ignore_whitespace,
1100 25ec7006 2022-07-01 thomas int force_text_diff, FILE *outfile, enum got_diff_algorithm diff_algo)
1102 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
1103 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
1105 fe621944 2020-11-10 stsp if (resultp)
1106 fe621944 2020-11-10 stsp *resultp = NULL;
1108 dc424a06 2019-08-07 stsp if (outfile) {
1109 dc424a06 2019-08-07 stsp fprintf(outfile, "file - %s\n",
1110 dd2e2f52 2022-07-01 thomas f1_exists ? label1 : "/dev/null");
1111 dc424a06 2019-08-07 stsp fprintf(outfile, "file + %s\n",
1112 dd2e2f52 2022-07-01 thomas f2_exists ? label2 : "/dev/null");
1115 25ec7006 2022-07-01 thomas err = got_diffreg(&diffreg_result, f1, f2, diff_algo,
1116 64453f7e 2020-11-21 stsp ignore_whitespace, force_text_diff);
1118 fe621944 2020-11-10 stsp goto done;
1120 fe621944 2020-11-10 stsp if (outfile) {
1121 fe621944 2020-11-10 stsp err = got_diffreg_output(NULL, NULL, diffreg_result,
1122 dd2e2f52 2022-07-01 thomas f1_exists, f2_exists, label1, label2,
1123 1cb46f00 2020-11-21 stsp GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
1125 dc424a06 2019-08-07 stsp goto done;
1129 fe621944 2020-11-10 stsp if (resultp && err == NULL)
1130 fe621944 2020-11-10 stsp *resultp = diffreg_result;
1131 fe621944 2020-11-10 stsp else if (diffreg_result) {
1132 fe621944 2020-11-10 stsp const struct got_error *free_err;
1133 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
1134 fe621944 2020-11-10 stsp if (free_err && err == NULL)
1135 fe621944 2020-11-10 stsp err = free_err;
1138 dc424a06 2019-08-07 stsp return err;
