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 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 <sha1.h>
25 7d283eee 2017-11-29 stsp #include <zlib.h>
27 7d283eee 2017-11-29 stsp #include "got_object.h"
28 e09a504c 2019-06-28 stsp #include "got_repository.h"
29 7d283eee 2017-11-29 stsp #include "got_error.h"
30 789689b5 2017-11-30 stsp #include "got_diff.h"
31 324d37e7 2019-05-11 stsp #include "got_path.h"
32 0208f208 2020-05-05 stsp #include "got_cancel.h"
33 0208f208 2020-05-05 stsp #include "got_worktree.h"
34 a558dd1b 2022-06-08 stsp #include "got_opentemp.h"
36 718b3ab0 2018-03-17 stsp #include "got_lib_diff.h"
37 15a94983 2018-12-23 stsp #include "got_lib_delta.h"
38 15a94983 2018-12-23 stsp #include "got_lib_inflate.h"
39 15a94983 2018-12-23 stsp #include "got_lib_object.h"
42 5191b70b 2023-01-07 mark #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
45 404c43c4 2018-06-21 stsp static const struct got_error *
46 c7d5c43c 2022-08-04 mark add_line_metadata(struct got_diff_line **lines, size_t *nlines,
47 c7d5c43c 2022-08-04 mark off_t off, uint8_t type)
49 c7d5c43c 2022-08-04 mark struct got_diff_line *p;
51 c7d5c43c 2022-08-04 mark p = reallocarray(*lines, *nlines + 1, sizeof(**lines));
52 fe621944 2020-11-10 stsp if (p == NULL)
53 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
55 c7d5c43c 2022-08-04 mark (*lines)[*nlines].offset = off;
56 c7d5c43c 2022-08-04 mark (*lines)[*nlines].type = type;
57 fe621944 2020-11-10 stsp (*nlines)++;
59 fe621944 2020-11-10 stsp return NULL;
62 fe621944 2020-11-10 stsp static const struct got_error *
63 c7d5c43c 2022-08-04 mark diff_blobs(struct got_diff_line **lines, size_t *nlines,
64 fe621944 2020-11-10 stsp struct got_diffreg_result **resultp, struct got_blob_object *blob1,
65 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
66 46f68b20 2019-10-19 stsp const char *label1, const char *label2, mode_t mode1, mode_t mode2,
67 4b752015 2022-06-30 stsp int diff_context, int ignore_whitespace, int force_text_diff, FILE *outfile,
68 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo)
70 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
71 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
72 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
73 58e31a80 2022-06-27 op const char *idstr1 = NULL, *idstr2 = NULL;
74 be659d10 2020-11-18 stsp off_t size1, size2;
75 3846622f 2023-01-07 mark struct got_diffreg_result *result = NULL;
76 fe621944 2020-11-10 stsp off_t outoff = 0;
79 2d61e381 2022-08-30 mark if (lines && *lines && *nlines > 0)
80 c7d5c43c 2022-08-04 mark outoff = (*lines)[*nlines - 1].offset;
81 c7d5c43c 2022-08-04 mark else if (lines) {
82 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, 0, GOT_DIFF_LINE_NONE);
87 fe621944 2020-11-10 stsp if (resultp)
88 fe621944 2020-11-10 stsp *resultp = NULL;
91 a558dd1b 2022-06-08 stsp err = got_opentemp_truncate(f1);
96 a558dd1b 2022-06-08 stsp err = got_opentemp_truncate(f2);
102 98abbc84 2017-11-30 stsp if (blob1) {
103 f934cf2c 2018-02-12 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
104 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
109 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
112 98abbc84 2017-11-30 stsp if (blob2) {
113 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
114 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
119 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
121 09de383e 2018-12-24 stsp if (outfile) {
122 46f68b20 2019-10-19 stsp char *modestr1 = NULL, *modestr2 = NULL;
123 40dde666 2020-07-23 stsp int modebits;
124 46f68b20 2019-10-19 stsp if (mode1 && mode1 != mode2) {
125 40dde666 2020-07-23 stsp if (S_ISLNK(mode1))
126 40dde666 2020-07-23 stsp modebits = S_IFLNK;
128 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
129 46f68b20 2019-10-19 stsp if (asprintf(&modestr1, " (mode %o)",
130 40dde666 2020-07-23 stsp mode1 & modebits) == -1) {
131 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
135 46f68b20 2019-10-19 stsp if (mode2 && mode1 != mode2) {
136 40dde666 2020-07-23 stsp if (S_ISLNK(mode2))
137 40dde666 2020-07-23 stsp modebits = S_IFLNK;
139 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
140 46f68b20 2019-10-19 stsp if (asprintf(&modestr2, " (mode %o)",
141 40dde666 2020-07-23 stsp mode2 & modebits) == -1) {
142 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
146 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob - %s%s\n", idstr1,
147 46f68b20 2019-10-19 stsp modestr1 ? modestr1 : "");
150 fe621944 2020-11-10 stsp outoff += n;
151 c7d5c43c 2022-08-04 mark if (lines) {
152 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, outoff,
153 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_BLOB_MIN);
158 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob + %s%s\n", idstr2,
159 46f68b20 2019-10-19 stsp modestr2 ? modestr2 : "");
162 fe621944 2020-11-10 stsp outoff += n;
163 c7d5c43c 2022-08-04 mark if (lines) {
164 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, outoff,
165 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_BLOB_PLUS);
170 46f68b20 2019-10-19 stsp free(modestr1);
171 46f68b20 2019-10-19 stsp free(modestr2);
173 4b752015 2022-06-30 stsp err = got_diffreg(&result, f1, f2, diff_algo, ignore_whitespace,
174 4b752015 2022-06-30 stsp force_text_diff);
178 fe621944 2020-11-10 stsp if (outfile) {
179 c7d5c43c 2022-08-04 mark err = got_diffreg_output(lines, nlines, result,
180 1cb46f00 2020-11-21 stsp blob1 != NULL, blob2 != NULL,
181 fe621944 2020-11-10 stsp label1 ? label1 : idstr1,
182 fe621944 2020-11-10 stsp label2 ? label2 : idstr2,
183 fe621944 2020-11-10 stsp GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
189 fe621944 2020-11-10 stsp if (resultp && err == NULL)
190 fe621944 2020-11-10 stsp *resultp = result;
191 3846622f 2023-01-07 mark else if (result) {
192 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
193 fe621944 2020-11-10 stsp if (free_err && err == NULL)
194 fe621944 2020-11-10 stsp err = free_err;
197 7d283eee 2017-11-29 stsp return err;
200 aaa13589 2019-06-01 stsp const struct got_error *
201 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
202 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
203 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
204 b72706c3 2022-06-01 stsp const char *label1, const char *label2, mode_t mode1, mode_t mode2,
205 b72706c3 2022-06-01 stsp struct got_repository *repo)
207 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg *a = arg;
209 c7d5c43c 2022-08-04 mark return diff_blobs(&a->lines, &a->nlines, NULL,
210 b72706c3 2022-06-01 stsp blob1, blob2, f1, f2, label1, label2, mode1, mode2, a->diff_context,
211 4b752015 2022-06-30 stsp a->ignore_whitespace, a->force_text_diff, a->outfile, a->diff_algo);
214 404c43c4 2018-06-21 stsp const struct got_error *
215 c7d5c43c 2022-08-04 mark got_diff_blob(struct got_diff_line **lines, size_t*nlines,
216 fe621944 2020-11-10 stsp struct got_blob_object *blob1, struct got_blob_object *blob2,
217 b72706c3 2022-06-01 stsp FILE *f1, FILE *f2, const char *label1, const char *label2,
218 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context,
219 4b752015 2022-06-30 stsp int ignore_whitespace, int force_text_diff, FILE *outfile)
221 c7d5c43c 2022-08-04 mark return diff_blobs(lines, nlines, NULL, blob1, blob2, f1, f2,
222 64453f7e 2020-11-21 stsp label1, label2, 0, 0, diff_context, ignore_whitespace,
223 4b752015 2022-06-30 stsp force_text_diff, outfile, diff_algo);
226 7f1f93af 2019-08-06 stsp static const struct got_error *
227 fe621944 2020-11-10 stsp diff_blob_file(struct got_diffreg_result **resultp,
228 b72706c3 2022-06-01 stsp struct got_blob_object *blob1, FILE *f1, off_t size1, const char *label1,
229 c87842d5 2022-09-23 mark FILE *f2, int f2_exists, struct stat *sb2, const char *label2,
230 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context, int ignore_whitespace,
231 4b752015 2022-06-30 stsp int force_text_diff, FILE *outfile)
233 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
234 b72f483a 2019-02-05 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
235 58e31a80 2022-06-27 op const char *idstr1 = NULL;
236 fe621944 2020-11-10 stsp struct got_diffreg_result *result = NULL;
238 fe621944 2020-11-10 stsp if (resultp)
239 fe621944 2020-11-10 stsp *resultp = NULL;
242 b72f483a 2019-02-05 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
244 b72f483a 2019-02-05 stsp idstr1 = "/dev/null";
246 7f1f93af 2019-08-06 stsp if (outfile) {
247 c87842d5 2022-09-23 mark char *mode = NULL;
249 c87842d5 2022-09-23 mark /* display file mode for new added files only */
250 c87842d5 2022-09-23 mark if (f2_exists && blob1 == NULL) {
251 c87842d5 2022-09-23 mark int mmask = (S_IRWXU | S_IRWXG | S_IRWXO);
253 c87842d5 2022-09-23 mark if (S_ISLNK(sb2->st_mode))
254 c87842d5 2022-09-23 mark mmask = S_IFLNK;
255 c87842d5 2022-09-23 mark if (asprintf(&mode, " (mode %o)",
256 c87842d5 2022-09-23 mark sb2->st_mode & mmask) == -1)
257 c87842d5 2022-09-23 mark return got_error_from_errno("asprintf");
259 4ce46740 2019-08-08 stsp fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
260 c87842d5 2022-09-23 mark fprintf(outfile, "file + %s%s\n",
261 c87842d5 2022-09-23 mark f2_exists ? label2 : "/dev/null", mode ? mode : "");
262 c87842d5 2022-09-23 mark free(mode);
265 4b752015 2022-06-30 stsp err = got_diffreg(&result, f1, f2, diff_algo, ignore_whitespace,
266 4b752015 2022-06-30 stsp force_text_diff);
270 fe621944 2020-11-10 stsp if (outfile) {
271 1cb46f00 2020-11-21 stsp err = got_diffreg_output(NULL, NULL, result,
272 49d4a017 2022-06-30 stsp blob1 != NULL, f2_exists,
273 1cb46f00 2020-11-21 stsp label2, /* show local file's path, not a blob ID */
274 1cb46f00 2020-11-21 stsp label2, GOT_DIFF_OUTPUT_UNIDIFF,
275 1cb46f00 2020-11-21 stsp diff_context, outfile);
281 fe621944 2020-11-10 stsp if (resultp && err == NULL)
282 fe621944 2020-11-10 stsp *resultp = result;
283 fe621944 2020-11-10 stsp else if (result) {
284 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
285 fe621944 2020-11-10 stsp if (free_err && err == NULL)
286 fe621944 2020-11-10 stsp err = free_err;
288 b72f483a 2019-02-05 stsp return err;
291 7f1f93af 2019-08-06 stsp const struct got_error *
292 b72706c3 2022-06-01 stsp got_diff_blob_file(struct got_blob_object *blob1, FILE *f1, off_t size1,
293 c87842d5 2022-09-23 mark const char *label1, FILE *f2, int f2_exists, struct stat *sb2,
294 4b752015 2022-06-30 stsp const char *label2, enum got_diff_algorithm diff_algo, int diff_context,
295 4b752015 2022-06-30 stsp int ignore_whitespace, int force_text_diff, FILE *outfile)
297 49d4a017 2022-06-30 stsp return diff_blob_file(NULL, blob1, f1, size1, label1, f2, f2_exists,
298 c87842d5 2022-09-23 mark sb2, label2, diff_algo, diff_context, ignore_whitespace,
299 c87842d5 2022-09-23 mark force_text_diff, outfile);
302 474b4f94 2017-11-30 stsp static const struct got_error *
303 49d4a017 2022-06-30 stsp diff_added_blob(struct got_object_id *id, FILE *f1, FILE *f2, int fd2,
304 f9d37699 2022-06-28 stsp const char *label, mode_t mode, struct got_repository *repo,
305 b72706c3 2022-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
307 4e22badc 2017-11-30 stsp const struct got_error *err;
308 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
309 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
311 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
313 4e22badc 2017-11-30 stsp return err;
315 49d4a017 2022-06-30 stsp err = got_object_blob_open(&blob, repo, obj, 8192, fd2);
318 49d4a017 2022-06-30 stsp err = cb(cb_arg, NULL, blob, f1, f2, NULL, id,
319 b72706c3 2022-06-01 stsp NULL, label, 0, mode, repo);
321 2acfca77 2018-04-01 stsp got_object_close(obj);
323 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
324 2acfca77 2018-04-01 stsp return err;
327 474b4f94 2017-11-30 stsp static const struct got_error *
328 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
329 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
330 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
331 b72706c3 2022-06-01 stsp mode_t mode1, mode_t mode2, struct got_repository *repo,
332 b72706c3 2022-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
334 6a213ccb 2017-11-30 stsp const struct got_error *err;
335 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
336 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
337 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
338 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
340 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
342 730a8aa0 2018-04-24 stsp return err;
344 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
345 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
349 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
352 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
353 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
357 eb81bc23 2022-06-28 tracey err = got_object_blob_open(&blob1, repo, obj1, 8192, fd1);
361 eb81bc23 2022-06-28 tracey err = got_object_blob_open(&blob2, repo, obj2, 8192, fd2);
365 b72706c3 2022-06-01 stsp err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2, label1, label2,
366 b72706c3 2022-06-01 stsp mode1, mode2, repo);
369 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
371 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
373 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
375 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
376 6a213ccb 2017-11-30 stsp return err;
379 474b4f94 2017-11-30 stsp static const struct got_error *
380 49d4a017 2022-06-30 stsp diff_deleted_blob(struct got_object_id *id, FILE *f1, int fd1,
381 49d4a017 2022-06-30 stsp FILE *f2, const char *label, mode_t mode, struct got_repository *repo,
382 f9d37699 2022-06-28 stsp got_diff_blob_cb cb, void *cb_arg)
384 365fb436 2017-11-30 stsp const struct got_error *err;
385 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
386 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
388 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
390 365fb436 2017-11-30 stsp return err;
392 49d4a017 2022-06-30 stsp err = got_object_blob_open(&blob, repo, obj, 8192, fd1);
395 49d4a017 2022-06-30 stsp err = cb(cb_arg, blob, NULL, f1, f2, id, NULL, label, NULL,
396 b72706c3 2022-06-01 stsp mode, 0, repo);
398 2acfca77 2018-04-01 stsp got_object_close(obj);
400 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
401 2acfca77 2018-04-01 stsp return err;
404 474b4f94 2017-11-30 stsp static const struct got_error *
405 49d4a017 2022-06-30 stsp diff_added_tree(struct got_object_id *id, FILE *f1, FILE *f2, int fd2,
406 49d4a017 2022-06-30 stsp const char *label, struct got_repository *repo, got_diff_blob_cb cb,
407 49d4a017 2022-06-30 stsp void *cb_arg, int diff_content)
409 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
410 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
411 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
413 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
417 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
418 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
422 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
426 49d4a017 2022-06-30 stsp err = got_diff_tree(NULL, tree, f1, f2, -1, fd2, NULL, label,
427 b72706c3 2022-06-01 stsp repo, cb, cb_arg, diff_content);
430 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
431 9c70d4c3 2017-11-30 stsp if (treeobj)
432 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
433 9c70d4c3 2017-11-30 stsp return err;
436 474b4f94 2017-11-30 stsp static const struct got_error *
437 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
438 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
439 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
440 b72706c3 2022-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
441 b72706c3 2022-06-01 stsp int diff_content)
443 f6861a81 2018-09-13 stsp const struct got_error *err;
444 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
445 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
446 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
447 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
449 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
453 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
454 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
458 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
462 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
463 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
467 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
471 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
475 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2,
476 f9d37699 2022-06-28 stsp label1, label2, repo, cb, cb_arg, diff_content);
480 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
482 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
483 789689b5 2017-11-30 stsp if (treeobj1)
484 789689b5 2017-11-30 stsp got_object_close(treeobj1);
485 789689b5 2017-11-30 stsp if (treeobj2)
486 789689b5 2017-11-30 stsp got_object_close(treeobj2);
487 789689b5 2017-11-30 stsp return err;
490 474b4f94 2017-11-30 stsp static const struct got_error *
491 49d4a017 2022-06-30 stsp diff_deleted_tree(struct got_object_id *id, FILE *f1, int fd1,
492 49d4a017 2022-06-30 stsp FILE *f2, const char *label, struct got_repository *repo,
493 f9d37699 2022-06-28 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
495 f6861a81 2018-09-13 stsp const struct got_error *err;
496 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
497 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
499 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
503 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
504 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
508 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
512 49d4a017 2022-06-30 stsp err = got_diff_tree(tree, NULL, f1, f2, fd1, -1, label, NULL,
513 b72706c3 2022-06-01 stsp repo, cb, cb_arg, diff_content);
516 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
517 2c56f2ce 2017-11-30 stsp if (treeobj)
518 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
519 2c56f2ce 2017-11-30 stsp return err;
522 474b4f94 2017-11-30 stsp static const struct got_error *
523 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
524 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
525 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
527 013404a9 2017-11-30 stsp /* XXX TODO */
528 474b4f94 2017-11-30 stsp return NULL;
531 474b4f94 2017-11-30 stsp static const struct got_error *
532 b72706c3 2022-06-01 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_entry *te2,
533 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
534 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
535 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
536 31b4484f 2019-07-27 stsp int diff_content)
538 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
539 19ae6da1 2018-11-05 stsp int id_match;
541 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te1))
542 63c5ca5d 2019-08-24 stsp return NULL;
544 474b4f94 2017-11-30 stsp if (te2 == NULL) {
545 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
546 49d4a017 2022-06-30 stsp err = diff_deleted_tree(&te1->id, f1, fd1, f2,
547 49d4a017 2022-06-30 stsp label1, repo, cb, cb_arg, diff_content);
549 31b4484f 2019-07-27 stsp if (diff_content)
550 f9d37699 2022-06-28 stsp err = diff_deleted_blob(&te1->id, f1, fd1,
551 49d4a017 2022-06-30 stsp f2, label1, te1->mode, repo, cb, cb_arg);
553 b72706c3 2022-06-01 stsp err = cb(cb_arg, NULL, NULL, NULL, NULL,
554 b72706c3 2022-06-01 stsp &te1->id, NULL, label1, NULL,
555 b72706c3 2022-06-01 stsp te1->mode, 0, repo);
557 f6861a81 2018-09-13 stsp return err;
558 63c5ca5d 2019-08-24 stsp } else if (got_object_tree_entry_is_submodule(te2))
559 63c5ca5d 2019-08-24 stsp return NULL;
561 56e0773d 2019-11-28 stsp id_match = (got_object_id_cmp(&te1->id, &te2->id) == 0);
562 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
563 19ae6da1 2018-11-05 stsp if (!id_match)
564 b72706c3 2022-06-01 stsp return diff_modified_tree(&te1->id, &te2->id, f1, f2,
565 f9d37699 2022-06-28 stsp fd1, fd2, label1, label2, repo, cb, cb_arg,
566 f9d37699 2022-06-28 stsp diff_content);
567 40dde666 2020-07-23 stsp } else if ((S_ISREG(te1->mode) || S_ISLNK(te1->mode)) &&
568 40dde666 2020-07-23 stsp (S_ISREG(te2->mode) || S_ISLNK(te2->mode))) {
569 46f68b20 2019-10-19 stsp if (!id_match ||
570 40dde666 2020-07-23 stsp ((te1->mode & (S_IFLNK | S_IXUSR))) !=
571 40dde666 2020-07-23 stsp (te2->mode & (S_IFLNK | S_IXUSR))) {
572 31b4484f 2019-07-27 stsp if (diff_content)
573 56e0773d 2019-11-28 stsp return diff_modified_blob(&te1->id, &te2->id,
574 f9d37699 2022-06-28 stsp f1, f2, fd1, fd2, label1, label2,
575 f9d37699 2022-06-28 stsp te1->mode, te2->mode, repo, cb, cb_arg);
577 b72706c3 2022-06-01 stsp return cb(cb_arg, NULL, NULL, NULL, NULL,
578 b72706c3 2022-06-01 stsp &te1->id, &te2->id, label1, label2,
579 b72706c3 2022-06-01 stsp te1->mode, te2->mode, repo);
583 19ae6da1 2018-11-05 stsp if (id_match)
584 f6861a81 2018-09-13 stsp return NULL;
586 56e0773d 2019-11-28 stsp return diff_kind_mismatch(&te1->id, &te2->id, label1, label2, repo,
587 aaa13589 2019-06-01 stsp cb, cb_arg);
590 474b4f94 2017-11-30 stsp static const struct got_error *
591 56e0773d 2019-11-28 stsp diff_entry_new_old(struct got_tree_entry *te2,
592 49d4a017 2022-06-30 stsp struct got_tree_entry *te1, FILE *f1, FILE *f2, int fd2, const char *label2,
593 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
594 31b4484f 2019-07-27 stsp int diff_content)
596 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
597 63c5ca5d 2019-08-24 stsp return NULL;
599 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te2))
600 f6861a81 2018-09-13 stsp return NULL;
602 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
603 49d4a017 2022-06-30 stsp return diff_added_tree(&te2->id, f1, f2, fd2, label2,
604 b72706c3 2022-06-01 stsp repo, cb, cb_arg, diff_content);
606 31b4484f 2019-07-27 stsp if (diff_content)
607 49d4a017 2022-06-30 stsp return diff_added_blob(&te2->id, f1, f2, fd2,
608 f9d37699 2022-06-28 stsp label2, te2->mode, repo, cb, cb_arg);
610 b72706c3 2022-06-01 stsp return cb(cb_arg, NULL, NULL, NULL, NULL, NULL, &te2->id,
611 b72706c3 2022-06-01 stsp NULL, label2, 0, te2->mode, repo);
614 5191b70b 2023-01-07 mark static void
615 5191b70b 2023-01-07 mark diffstat_field_width(size_t *maxlen, int *add_cols, int *rm_cols, size_t len,
616 5191b70b 2023-01-07 mark uint32_t add, uint32_t rm)
618 5191b70b 2023-01-07 mark int d1 = 1, d2 = 1;
620 5191b70b 2023-01-07 mark *maxlen = MAX(*maxlen, len);
622 5191b70b 2023-01-07 mark while (add /= 10)
624 5191b70b 2023-01-07 mark *add_cols = MAX(*add_cols, d1);
626 5191b70b 2023-01-07 mark while (rm /= 10)
628 5191b70b 2023-01-07 mark *rm_cols = MAX(*rm_cols, d2);
631 0208f208 2020-05-05 stsp const struct got_error *
632 5191b70b 2023-01-07 mark got_diff_tree_compute_diffstat(void *arg, struct got_blob_object *blob1,
633 5191b70b 2023-01-07 mark struct got_blob_object *blob2, FILE *f1, FILE *f2,
634 5191b70b 2023-01-07 mark struct got_object_id *id1, struct got_object_id *id2,
635 5191b70b 2023-01-07 mark const char *label1, const char *label2,
636 5191b70b 2023-01-07 mark mode_t mode1, mode_t mode2, struct got_repository *repo)
638 5191b70b 2023-01-07 mark const struct got_error *err = NULL;
639 5191b70b 2023-01-07 mark struct got_diffreg_result *result = NULL;
640 5191b70b 2023-01-07 mark struct diff_result *r;
641 5191b70b 2023-01-07 mark struct got_diff_changed_path *change = NULL;
642 5191b70b 2023-01-07 mark struct got_diffstat_cb_arg *a = arg;
643 5191b70b 2023-01-07 mark struct got_pathlist_entry *pe;
644 5191b70b 2023-01-07 mark char *path = NULL;
647 5191b70b 2023-01-07 mark path = strdup(label2 ? label2 : label1);
648 5191b70b 2023-01-07 mark if (path == NULL)
649 5191b70b 2023-01-07 mark return got_error_from_errno("malloc");
651 5191b70b 2023-01-07 mark change = malloc(sizeof(*change));
652 5191b70b 2023-01-07 mark if (change == NULL) {
653 5191b70b 2023-01-07 mark err = got_error_from_errno("malloc");
657 5191b70b 2023-01-07 mark change->add = 0;
658 5191b70b 2023-01-07 mark change->rm = 0;
659 5191b70b 2023-01-07 mark change->status = GOT_STATUS_NO_CHANGE;
660 5191b70b 2023-01-07 mark if (id1 == NULL)
661 5191b70b 2023-01-07 mark change->status = GOT_STATUS_ADD;
662 5191b70b 2023-01-07 mark else if (id2 == NULL)
663 5191b70b 2023-01-07 mark change->status = GOT_STATUS_DELETE;
665 5191b70b 2023-01-07 mark if (got_object_id_cmp(id1, id2) != 0)
666 5191b70b 2023-01-07 mark change->status = GOT_STATUS_MODIFY;
667 5191b70b 2023-01-07 mark else if (mode1 != mode2)
668 5191b70b 2023-01-07 mark change->status = GOT_STATUS_MODE_CHANGE;
672 5191b70b 2023-01-07 mark err = got_opentemp_truncate(f1);
677 5191b70b 2023-01-07 mark err = got_opentemp_truncate(f2);
682 5191b70b 2023-01-07 mark if (blob1) {
683 5191b70b 2023-01-07 mark err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1,
688 5191b70b 2023-01-07 mark if (blob2) {
689 5191b70b 2023-01-07 mark err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2,
695 5191b70b 2023-01-07 mark err = got_diffreg(&result, f1, f2, a->diff_algo, a->ignore_ws,
696 5191b70b 2023-01-07 mark a->force_text);
700 5191b70b 2023-01-07 mark for (i = 0, r = result->result; i < r->chunks.len; ++i) {
701 5191b70b 2023-01-07 mark int flags = (r->left->atomizer_flags | r->right->atomizer_flags);
702 5191b70b 2023-01-07 mark int isbin = (flags & DIFF_ATOMIZER_FOUND_BINARY_DATA);
704 5191b70b 2023-01-07 mark if (!isbin || a->force_text) {
705 5191b70b 2023-01-07 mark struct diff_chunk *c;
706 5191b70b 2023-01-07 mark int clc, crc;
708 5191b70b 2023-01-07 mark c = diff_chunk_get(r, i);
709 5191b70b 2023-01-07 mark clc = diff_chunk_get_left_count(c);
710 5191b70b 2023-01-07 mark crc = diff_chunk_get_right_count(c);
712 5191b70b 2023-01-07 mark if (clc && !crc)
713 5191b70b 2023-01-07 mark change->rm += clc;
714 5191b70b 2023-01-07 mark else if (crc && !clc)
715 5191b70b 2023-01-07 mark change->add += crc;
719 5191b70b 2023-01-07 mark err = got_pathlist_append(a->paths, path, change);
723 5191b70b 2023-01-07 mark pe = TAILQ_LAST(a->paths, got_pathlist_head);
724 5191b70b 2023-01-07 mark diffstat_field_width(&a->max_path_len, &a->add_cols, &a->rm_cols,
725 5191b70b 2023-01-07 mark pe->path_len, change->add, change->rm);
726 5191b70b 2023-01-07 mark a->ins += change->add;
727 5191b70b 2023-01-07 mark a->del += change->rm;
728 5191b70b 2023-01-07 mark ++a->nfiles;
731 5191b70b 2023-01-07 mark if (result) {
732 5191b70b 2023-01-07 mark const struct got_error *free_err;
734 5191b70b 2023-01-07 mark free_err = got_diffreg_result_free(result);
735 5191b70b 2023-01-07 mark if (free_err && err == NULL)
736 5191b70b 2023-01-07 mark err = free_err;
739 5191b70b 2023-01-07 mark free(path);
740 5191b70b 2023-01-07 mark free(change);
742 5191b70b 2023-01-07 mark return err;
745 5191b70b 2023-01-07 mark const struct got_error *
746 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths(void *arg, struct got_blob_object *blob1,
747 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
748 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
749 b72706c3 2022-06-01 stsp const char *label1, const char *label2,
750 0208f208 2020-05-05 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
752 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
753 0208f208 2020-05-05 stsp struct got_pathlist_head *paths = arg;
754 0208f208 2020-05-05 stsp struct got_diff_changed_path *change = NULL;
755 0208f208 2020-05-05 stsp char *path = NULL;
757 0208f208 2020-05-05 stsp path = strdup(label2 ? label2 : label1);
758 0208f208 2020-05-05 stsp if (path == NULL)
759 0208f208 2020-05-05 stsp return got_error_from_errno("malloc");
761 0208f208 2020-05-05 stsp change = malloc(sizeof(*change));
762 0208f208 2020-05-05 stsp if (change == NULL) {
763 0208f208 2020-05-05 stsp err = got_error_from_errno("malloc");
767 0208f208 2020-05-05 stsp change->status = GOT_STATUS_NO_CHANGE;
768 0208f208 2020-05-05 stsp if (id1 == NULL)
769 0208f208 2020-05-05 stsp change->status = GOT_STATUS_ADD;
770 0208f208 2020-05-05 stsp else if (id2 == NULL)
771 0208f208 2020-05-05 stsp change->status = GOT_STATUS_DELETE;
773 0208f208 2020-05-05 stsp if (got_object_id_cmp(id1, id2) != 0)
774 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODIFY;
775 0208f208 2020-05-05 stsp else if (mode1 != mode2)
776 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODE_CHANGE;
779 46ea77db 2021-12-20 stsp err = got_pathlist_append(paths, path, change);
782 0208f208 2020-05-05 stsp free(path);
783 0208f208 2020-05-05 stsp free(change);
785 0208f208 2020-05-05 stsp return err;
788 474b4f94 2017-11-30 stsp const struct got_error *
789 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
790 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
791 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
792 b72706c3 2022-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
793 b72706c3 2022-06-01 stsp int diff_content)
795 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
796 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
797 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
798 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
799 56e0773d 2019-11-28 stsp int tidx1 = 0, tidx2 = 0;
801 883f0469 2018-06-23 stsp if (tree1) {
802 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, 0);
803 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
804 f6861a81 2018-09-13 stsp te1->name) == -1)
805 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
807 883f0469 2018-06-23 stsp if (tree2) {
808 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, 0);
809 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
810 f6861a81 2018-09-13 stsp te2->name) == -1)
811 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
816 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
818 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
819 1de5e065 2019-06-01 stsp te1->name);
823 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
824 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
826 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
828 f9d37699 2022-06-28 stsp err = diff_entry_old_new(te1, te, f1, f2, fd1, fd2,
829 f9d37699 2022-06-28 stsp l1, l2, repo, cb, cb_arg, diff_content);
835 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
837 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
838 1de5e065 2019-06-01 stsp te2->name);
841 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
842 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te->name) == -1)
844 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
846 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
847 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te2->name) == -1)
849 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
851 49d4a017 2022-06-30 stsp err = diff_entry_new_old(te2, te, f1, f2, fd2, l2,
852 49d4a017 2022-06-30 stsp repo, cb, cb_arg, diff_content);
861 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, tidx1);
863 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
864 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
865 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
871 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, tidx2);
873 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
874 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
875 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
877 474b4f94 2017-11-30 stsp } while (te1 || te2);
879 11528a82 2018-05-19 stsp return err;
882 11528a82 2018-05-19 stsp const struct got_error *
883 c7d5c43c 2022-08-04 mark got_diff_objects_as_blobs(struct got_diff_line **lines, size_t *nlines,
884 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
885 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
886 4b752015 2022-06-30 stsp const char *label1, const char *label2,
887 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context,
888 64453f7e 2020-11-21 stsp int ignore_whitespace, int force_text_diff,
889 64453f7e 2020-11-21 stsp struct got_repository *repo, FILE *outfile)
891 11528a82 2018-05-19 stsp const struct got_error *err;
892 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
894 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
895 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
898 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob1, repo, id1, 8192, fd1);
903 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob2, repo, id2, 8192, fd2);
907 c7d5c43c 2022-08-04 mark err = got_diff_blob(lines, nlines, blob1, blob2, f1, f2, label1, label2,
908 c7d5c43c 2022-08-04 mark diff_algo, diff_context, ignore_whitespace, force_text_diff,
912 67b631c9 2021-10-10 stsp got_object_blob_close(blob1);
914 67b631c9 2021-10-10 stsp got_object_blob_close(blob2);
915 67b631c9 2021-10-10 stsp return err;
918 67b631c9 2021-10-10 stsp static const struct got_error *
919 67b631c9 2021-10-10 stsp diff_paths(struct got_tree_object *tree1, struct got_tree_object *tree2,
920 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2, struct got_pathlist_head *paths,
921 b72706c3 2022-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
923 67b631c9 2021-10-10 stsp const struct got_error *err = NULL;
924 67b631c9 2021-10-10 stsp struct got_pathlist_entry *pe;
925 67b631c9 2021-10-10 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
926 67b631c9 2021-10-10 stsp struct got_tree_object *subtree1 = NULL, *subtree2 = NULL;
927 67b631c9 2021-10-10 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
929 67b631c9 2021-10-10 stsp TAILQ_FOREACH(pe, paths, entry) {
930 67b631c9 2021-10-10 stsp int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
931 67b631c9 2021-10-10 stsp mode_t mode1 = 0, mode2 = 0;
934 67b631c9 2021-10-10 stsp id1 = NULL;
936 67b631c9 2021-10-10 stsp id2 = NULL;
937 67b631c9 2021-10-10 stsp if (subtree1) {
938 67b631c9 2021-10-10 stsp got_object_tree_close(subtree1);
939 67b631c9 2021-10-10 stsp subtree1 = NULL;
941 67b631c9 2021-10-10 stsp if (subtree2) {
942 67b631c9 2021-10-10 stsp got_object_tree_close(subtree2);
943 67b631c9 2021-10-10 stsp subtree2 = NULL;
945 67b631c9 2021-10-10 stsp if (blob1) {
946 67b631c9 2021-10-10 stsp got_object_blob_close(blob1);
947 67b631c9 2021-10-10 stsp blob1 = NULL;
949 67b631c9 2021-10-10 stsp if (blob2) {
950 67b631c9 2021-10-10 stsp got_object_blob_close(blob2);
951 67b631c9 2021-10-10 stsp blob2 = NULL;
954 67b631c9 2021-10-10 stsp err = got_object_tree_find_path(&id1, &mode1, repo, tree1,
956 67b631c9 2021-10-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
958 67b631c9 2021-10-10 stsp err = got_object_tree_find_path(&id2, &mode2, repo, tree2,
960 67b631c9 2021-10-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
962 67b631c9 2021-10-10 stsp if (id1 == NULL && id2 == NULL) {
963 67b631c9 2021-10-10 stsp err = got_error_path(pe->path, GOT_ERR_NO_TREE_ENTRY);
967 67b631c9 2021-10-10 stsp err = got_object_get_type(&type1, repo, id1);
972 67b631c9 2021-10-10 stsp err = got_object_get_type(&type2, repo, id2);
976 67b631c9 2021-10-10 stsp if (type1 == GOT_OBJ_TYPE_ANY &&
977 67b631c9 2021-10-10 stsp type2 == GOT_OBJ_TYPE_ANY) {
978 67b631c9 2021-10-10 stsp err = got_error_path(pe->path, GOT_ERR_NO_OBJ);
980 67b631c9 2021-10-10 stsp } else if (type1 != GOT_OBJ_TYPE_ANY &&
981 67b631c9 2021-10-10 stsp type2 != GOT_OBJ_TYPE_ANY && type1 != type2) {
982 67b631c9 2021-10-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
986 67b631c9 2021-10-10 stsp if (type1 == GOT_OBJ_TYPE_BLOB ||
987 67b631c9 2021-10-10 stsp type2 == GOT_OBJ_TYPE_BLOB) {
989 67b631c9 2021-10-10 stsp err = got_object_open_as_blob(&blob1, repo,
990 eb81bc23 2022-06-28 tracey id1, 8192, fd1);
995 67b631c9 2021-10-10 stsp err = got_object_open_as_blob(&blob2, repo,
996 eb81bc23 2022-06-28 tracey id2, 8192, fd2);
1000 b72706c3 2022-06-01 stsp err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2,
1001 67b631c9 2021-10-10 stsp id1 ? pe->path : "/dev/null",
1002 67b631c9 2021-10-10 stsp id2 ? pe->path : "/dev/null",
1003 67b631c9 2021-10-10 stsp mode1, mode2, repo);
1005 67b631c9 2021-10-10 stsp goto done;
1006 67b631c9 2021-10-10 stsp } else if (type1 == GOT_OBJ_TYPE_TREE ||
1007 67b631c9 2021-10-10 stsp type2 == GOT_OBJ_TYPE_TREE) {
1008 67b631c9 2021-10-10 stsp if (id1) {
1009 67b631c9 2021-10-10 stsp err = got_object_open_as_tree(&subtree1, repo,
1012 67b631c9 2021-10-10 stsp goto done;
1014 67b631c9 2021-10-10 stsp if (id2) {
1015 67b631c9 2021-10-10 stsp err = got_object_open_as_tree(&subtree2, repo,
1018 67b631c9 2021-10-10 stsp goto done;
1020 b72706c3 2022-06-01 stsp err = got_diff_tree(subtree1, subtree2, f1, f2,
1022 67b631c9 2021-10-10 stsp id1 ? pe->path : "/dev/null",
1023 67b631c9 2021-10-10 stsp id2 ? pe->path : "/dev/null",
1024 67b631c9 2021-10-10 stsp repo, cb, cb_arg, 1);
1026 67b631c9 2021-10-10 stsp goto done;
1028 67b631c9 2021-10-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1029 67b631c9 2021-10-10 stsp goto done;
1033 67b631c9 2021-10-10 stsp free(id1);
1034 67b631c9 2021-10-10 stsp free(id2);
1035 67b631c9 2021-10-10 stsp if (subtree1)
1036 67b631c9 2021-10-10 stsp got_object_tree_close(subtree1);
1037 67b631c9 2021-10-10 stsp if (subtree2)
1038 67b631c9 2021-10-10 stsp got_object_tree_close(subtree2);
1039 11528a82 2018-05-19 stsp if (blob1)
1040 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
1041 11528a82 2018-05-19 stsp if (blob2)
1042 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
1043 474b4f94 2017-11-30 stsp return err;
1046 8469d821 2022-06-25 stsp static const struct got_error *
1047 c7d5c43c 2022-08-04 mark show_object_id(struct got_diff_line **lines, size_t *nlines,
1048 c7d5c43c 2022-08-04 mark const char *obj_typestr, int ch, const char *id_str, FILE *outfile)
1050 8469d821 2022-06-25 stsp const struct got_error *err;
1052 8469d821 2022-06-25 stsp off_t outoff = 0;
1054 8469d821 2022-06-25 stsp n = fprintf(outfile, "%s %c %s\n", obj_typestr, ch, id_str);
1056 36e83e5e 2022-08-16 op return got_error_from_errno("fprintf");
1058 c7d5c43c 2022-08-04 mark if (lines != NULL && *lines != NULL) {
1059 8469d821 2022-06-25 stsp if (*nlines == 0) {
1060 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, 0,
1061 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_META);
1063 8469d821 2022-06-25 stsp return err;
1065 c7d5c43c 2022-08-04 mark outoff = (*lines)[*nlines - 1].offset;
1067 8469d821 2022-06-25 stsp outoff += n;
1068 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, outoff,
1069 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_META);
1071 8469d821 2022-06-25 stsp return err;
1074 8469d821 2022-06-25 stsp return NULL;
1077 8469d821 2022-06-25 stsp static const struct got_error *
1078 c7d5c43c 2022-08-04 mark diff_objects_as_trees(struct got_diff_line **lines, size_t *nlines,
1079 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
1080 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
1081 58e31a80 2022-06-27 op struct got_pathlist_head *paths, const char *label1, const char *label2,
1082 58e31a80 2022-06-27 op int diff_context, int ignore_whitespace, int force_text_diff,
1083 4b752015 2022-06-30 stsp struct got_repository *repo, FILE *outfile,
1084 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo)
1086 11528a82 2018-05-19 stsp const struct got_error *err;
1087 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1088 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1089 c7d5c43c 2022-08-04 mark int want_linemeta = (lines != NULL && *lines != NULL);
1091 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
1092 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
1094 15a94983 2018-12-23 stsp if (id1) {
1095 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
1097 cd0acaa7 2018-05-20 stsp goto done;
1099 15a94983 2018-12-23 stsp if (id2) {
1100 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
1102 cd0acaa7 2018-05-20 stsp goto done;
1105 4b752015 2022-06-30 stsp arg.diff_algo = diff_algo;
1106 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1107 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1108 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
1109 aaa13589 2019-06-01 stsp arg.outfile = outfile;
1110 c7d5c43c 2022-08-04 mark if (want_linemeta) {
1111 c7d5c43c 2022-08-04 mark arg.lines = *lines;
1112 fe621944 2020-11-10 stsp arg.nlines = *nlines;
1114 c7d5c43c 2022-08-04 mark arg.lines = NULL;
1115 fe621944 2020-11-10 stsp arg.nlines = 0;
1117 67b631c9 2021-10-10 stsp if (paths == NULL || TAILQ_EMPTY(paths)) {
1118 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2,
1119 f9d37699 2022-06-28 stsp label1, label2, repo,
1120 f9d37699 2022-06-28 stsp got_diff_blob_output_unidiff, &arg, 1);
1122 f9d37699 2022-06-28 stsp err = diff_paths(tree1, tree2, f1, f2, fd1, fd2, paths, repo,
1123 67b631c9 2021-10-10 stsp got_diff_blob_output_unidiff, &arg);
1125 c7d5c43c 2022-08-04 mark if (want_linemeta) {
1126 c7d5c43c 2022-08-04 mark *lines = arg.lines; /* was likely re-allocated */
1127 fe621944 2020-11-10 stsp *nlines = arg.nlines;
1130 11528a82 2018-05-19 stsp if (tree1)
1131 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
1132 11528a82 2018-05-19 stsp if (tree2)
1133 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
1134 11528a82 2018-05-19 stsp return err;
1137 11528a82 2018-05-19 stsp const struct got_error *
1138 c7d5c43c 2022-08-04 mark got_diff_objects_as_trees(struct got_diff_line **lines, size_t *nlines,
1139 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
1140 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
1141 58e31a80 2022-06-27 op struct got_pathlist_head *paths, const char *label1, const char *label2,
1142 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context, int ignore_whitespace,
1143 4b752015 2022-06-30 stsp int force_text_diff, struct got_repository *repo, FILE *outfile)
1145 8469d821 2022-06-25 stsp const struct got_error *err;
1146 8469d821 2022-06-25 stsp char *idstr = NULL;
1148 8469d821 2022-06-25 stsp if (id1 == NULL && id2 == NULL)
1149 8469d821 2022-06-25 stsp return got_error(GOT_ERR_NO_OBJ);
1151 8469d821 2022-06-25 stsp if (id1) {
1152 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id1);
1154 8469d821 2022-06-25 stsp goto done;
1155 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '-', idstr, outfile);
1157 8469d821 2022-06-25 stsp goto done;
1158 8469d821 2022-06-25 stsp free(idstr);
1159 8469d821 2022-06-25 stsp idstr = NULL;
1161 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '-', "/dev/null",
1164 8469d821 2022-06-25 stsp goto done;
1167 8469d821 2022-06-25 stsp if (id2) {
1168 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id2);
1170 8469d821 2022-06-25 stsp goto done;
1171 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '+', idstr, outfile);
1173 8469d821 2022-06-25 stsp goto done;
1174 8469d821 2022-06-25 stsp free(idstr);
1175 8469d821 2022-06-25 stsp idstr = NULL;
1177 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '+', "/dev/null",
1180 8469d821 2022-06-25 stsp goto done;
1183 c7d5c43c 2022-08-04 mark err = diff_objects_as_trees(lines, nlines, f1, f2, fd1, fd2, id1, id2,
1184 c7d5c43c 2022-08-04 mark paths, label1, label2, diff_context, ignore_whitespace,
1185 4b752015 2022-06-30 stsp force_text_diff, repo, outfile, diff_algo);
1187 8469d821 2022-06-25 stsp free(idstr);
1188 8469d821 2022-06-25 stsp return err;
1191 8469d821 2022-06-25 stsp const struct got_error *
1192 c7d5c43c 2022-08-04 mark got_diff_objects_as_commits(struct got_diff_line **lines, size_t *nlines,
1193 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
1194 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
1195 4b752015 2022-06-30 stsp struct got_pathlist_head *paths, enum got_diff_algorithm diff_algo,
1196 64453f7e 2020-11-21 stsp int diff_context, int ignore_whitespace, int force_text_diff,
1197 15a94983 2018-12-23 stsp struct got_repository *repo, FILE *outfile)
1199 11528a82 2018-05-19 stsp const struct got_error *err;
1200 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
1201 8469d821 2022-06-25 stsp char *idstr = NULL;
1203 15a94983 2018-12-23 stsp if (id2 == NULL)
1204 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
1206 15a94983 2018-12-23 stsp if (id1) {
1207 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
1209 cd0acaa7 2018-05-20 stsp goto done;
1210 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id1);
1212 8469d821 2022-06-25 stsp goto done;
1213 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "commit", '-', idstr,
1216 8469d821 2022-06-25 stsp goto done;
1217 8469d821 2022-06-25 stsp free(idstr);
1218 8469d821 2022-06-25 stsp idstr = NULL;
1220 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "commit", '-', "/dev/null",
1223 8469d821 2022-06-25 stsp goto done;
1226 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
1228 9b697879 2018-05-20 stsp goto done;
1230 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id2);
1232 8469d821 2022-06-25 stsp goto done;
1233 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "commit", '+', idstr, outfile);
1235 8469d821 2022-06-25 stsp goto done;
1237 c7d5c43c 2022-08-04 mark err = diff_objects_as_trees(lines, nlines, f1, f2, fd1, fd2,
1238 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
1239 67b631c9 2021-10-10 stsp got_object_commit_get_tree_id(commit2), paths, "", "",
1240 4b752015 2022-06-30 stsp diff_context, ignore_whitespace, force_text_diff, repo, outfile,
1241 4b752015 2022-06-30 stsp diff_algo);
1243 11528a82 2018-05-19 stsp if (commit1)
1244 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
1245 11528a82 2018-05-19 stsp if (commit2)
1246 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
1247 8469d821 2022-06-25 stsp free(idstr);
1248 11528a82 2018-05-19 stsp return err;
1251 dc424a06 2019-08-07 stsp const struct got_error *
1252 fe621944 2020-11-10 stsp got_diff_files(struct got_diffreg_result **resultp,
1253 49d4a017 2022-06-30 stsp FILE *f1, int f1_exists, const char *label1, FILE *f2, int f2_exists,
1254 49d4a017 2022-06-30 stsp const char *label2, int diff_context, int ignore_whitespace,
1255 4b752015 2022-06-30 stsp int force_text_diff, FILE *outfile, enum got_diff_algorithm diff_algo)
1257 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
1258 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
1260 fe621944 2020-11-10 stsp if (resultp)
1261 fe621944 2020-11-10 stsp *resultp = NULL;
1263 dc424a06 2019-08-07 stsp if (outfile) {
1264 dc424a06 2019-08-07 stsp fprintf(outfile, "file - %s\n",
1265 49d4a017 2022-06-30 stsp f1_exists ? label1 : "/dev/null");
1266 dc424a06 2019-08-07 stsp fprintf(outfile, "file + %s\n",
1267 49d4a017 2022-06-30 stsp f2_exists ? label2 : "/dev/null");
1270 4b752015 2022-06-30 stsp err = got_diffreg(&diffreg_result, f1, f2, diff_algo,
1271 64453f7e 2020-11-21 stsp ignore_whitespace, force_text_diff);
1273 fe621944 2020-11-10 stsp goto done;
1275 fe621944 2020-11-10 stsp if (outfile) {
1276 fe621944 2020-11-10 stsp err = got_diffreg_output(NULL, NULL, diffreg_result,
1277 49d4a017 2022-06-30 stsp f1_exists, f2_exists, label1, label2,
1278 1cb46f00 2020-11-21 stsp GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
1280 dc424a06 2019-08-07 stsp goto done;
1284 fe621944 2020-11-10 stsp if (resultp && err == NULL)
1285 fe621944 2020-11-10 stsp *resultp = diffreg_result;
1286 fe621944 2020-11-10 stsp else if (diffreg_result) {
1287 fe621944 2020-11-10 stsp const struct got_error *free_err;
1288 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
1289 fe621944 2020-11-10 stsp if (free_err && err == NULL)
1290 fe621944 2020-11-10 stsp err = free_err;
1293 dc424a06 2019-08-07 stsp return err;
