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 5822e79e 2023-02-23 op #include <sha2.h>
26 7d283eee 2017-11-29 stsp #include <zlib.h>
28 7d283eee 2017-11-29 stsp #include "got_object.h"
29 e09a504c 2019-06-28 stsp #include "got_repository.h"
30 7d283eee 2017-11-29 stsp #include "got_error.h"
31 789689b5 2017-11-30 stsp #include "got_diff.h"
32 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 a558dd1b 2022-06-08 stsp #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"
43 5191b70b 2023-01-07 mark #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
46 404c43c4 2018-06-21 stsp static const struct got_error *
47 c7d5c43c 2022-08-04 mark add_line_metadata(struct got_diff_line **lines, size_t *nlines,
48 c7d5c43c 2022-08-04 mark off_t off, uint8_t type)
50 c7d5c43c 2022-08-04 mark struct got_diff_line *p;
52 c7d5c43c 2022-08-04 mark p = reallocarray(*lines, *nlines + 1, sizeof(**lines));
53 fe621944 2020-11-10 stsp if (p == NULL)
54 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
56 c7d5c43c 2022-08-04 mark (*lines)[*nlines].offset = off;
57 c7d5c43c 2022-08-04 mark (*lines)[*nlines].type = type;
58 fe621944 2020-11-10 stsp (*nlines)++;
60 fe621944 2020-11-10 stsp return NULL;
64 a76e88e5 2023-01-10 mark diffstat_field_width(size_t *maxlen, int *add_cols, int *rm_cols, size_t len,
65 a76e88e5 2023-01-10 mark uint32_t add, uint32_t rm)
67 a76e88e5 2023-01-10 mark int d1 = 1, d2 = 1;
70 a76e88e5 2023-01-10 mark *maxlen = MAX(*maxlen, len);
72 a76e88e5 2023-01-10 mark while (add /= 10)
74 a76e88e5 2023-01-10 mark *add_cols = MAX(*add_cols, d1);
76 a76e88e5 2023-01-10 mark while (rm /= 10)
78 a76e88e5 2023-01-10 mark *rm_cols = MAX(*rm_cols, d2);
81 fe621944 2020-11-10 stsp static const struct got_error *
82 a76e88e5 2023-01-10 mark get_diffstat(struct got_diffstat_cb_arg *ds, const char *path,
83 a76e88e5 2023-01-10 mark struct diff_result *r, int force_text, int status)
85 a76e88e5 2023-01-10 mark const struct got_error *err;
86 a76e88e5 2023-01-10 mark struct got_pathlist_entry *pe;
87 a76e88e5 2023-01-10 mark struct got_diff_changed_path *change = NULL;
88 a76e88e5 2023-01-10 mark int flags = (r->left->atomizer_flags | r->right->atomizer_flags);
89 a76e88e5 2023-01-10 mark int isbin = (flags & DIFF_ATOMIZER_FOUND_BINARY_DATA);
92 a76e88e5 2023-01-10 mark change = calloc(1, sizeof(*change));
93 a76e88e5 2023-01-10 mark if (change == NULL)
94 6b37f13a 2023-01-10 mark return got_error_from_errno("calloc");
96 a76e88e5 2023-01-10 mark if (!isbin || force_text) {
97 a76e88e5 2023-01-10 mark for (i = 0; i < r->chunks.len; ++i) {
98 a76e88e5 2023-01-10 mark struct diff_chunk *c;
99 a76e88e5 2023-01-10 mark int clc, crc;
101 a76e88e5 2023-01-10 mark c = diff_chunk_get(r, i);
102 a76e88e5 2023-01-10 mark clc = diff_chunk_get_left_count(c);
103 a76e88e5 2023-01-10 mark crc = diff_chunk_get_right_count(c);
105 a76e88e5 2023-01-10 mark if (crc && !clc)
106 a76e88e5 2023-01-10 mark change->add += crc;
107 a76e88e5 2023-01-10 mark if (clc && !crc)
108 a76e88e5 2023-01-10 mark change->rm += clc;
112 a76e88e5 2023-01-10 mark change->status = status;
113 a76e88e5 2023-01-10 mark ds->ins += change->add;
114 a76e88e5 2023-01-10 mark ds->del += change->rm;
115 a76e88e5 2023-01-10 mark ++ds->nfiles;
117 a76e88e5 2023-01-10 mark err = got_pathlist_append(ds->paths, path, change);
119 5fa52d6c 2023-01-11 mark free(change);
120 a76e88e5 2023-01-10 mark return err;
123 a76e88e5 2023-01-10 mark pe = TAILQ_LAST(ds->paths, got_pathlist_head);
124 a76e88e5 2023-01-10 mark diffstat_field_width(&ds->max_path_len, &ds->add_cols, &ds->rm_cols,
125 a76e88e5 2023-01-10 mark pe->path_len, change->add, change->rm);
127 a76e88e5 2023-01-10 mark return NULL;
130 a76e88e5 2023-01-10 mark static const struct got_error *
131 c7d5c43c 2022-08-04 mark diff_blobs(struct got_diff_line **lines, size_t *nlines,
132 fe621944 2020-11-10 stsp struct got_diffreg_result **resultp, struct got_blob_object *blob1,
133 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
134 46f68b20 2019-10-19 stsp const char *label1, const char *label2, mode_t mode1, mode_t mode2,
135 a76e88e5 2023-01-10 mark int diff_context, int ignore_whitespace, int force_text_diff,
136 1f3405c9 2023-01-17 mark struct got_diffstat_cb_arg *diffstat, FILE *outfile,
137 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo)
139 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
140 bbc740ac 2023-02-04 op char hex1[GOT_OBJECT_ID_HEX_MAXLEN];
141 bbc740ac 2023-02-04 op char hex2[GOT_OBJECT_ID_HEX_MAXLEN];
142 58e31a80 2022-06-27 op const char *idstr1 = NULL, *idstr2 = NULL;
143 5fa52d6c 2023-01-11 mark char *modestr1 = NULL, *modestr2 = NULL;
144 be659d10 2020-11-18 stsp off_t size1, size2;
145 3846622f 2023-01-07 mark struct got_diffreg_result *result = NULL;
146 fe621944 2020-11-10 stsp off_t outoff = 0;
149 f9723081 2024-06-01 mark if (lines && *lines) {
150 f9723081 2024-06-01 mark if (*nlines > 0)
151 f9723081 2024-06-01 mark outoff = (*lines)[*nlines - 1].offset;
153 f9723081 2024-06-01 mark err = add_line_metadata(lines, nlines,
154 f9723081 2024-06-01 mark 0, GOT_DIFF_LINE_NONE);
155 f9723081 2024-06-01 mark if (err != NULL)
160 fe621944 2020-11-10 stsp if (resultp)
161 fe621944 2020-11-10 stsp *resultp = NULL;
164 a558dd1b 2022-06-08 stsp err = got_opentemp_truncate(f1);
169 a558dd1b 2022-06-08 stsp err = got_opentemp_truncate(f2);
175 98abbc84 2017-11-30 stsp if (blob1) {
176 f934cf2c 2018-02-12 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
177 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
182 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
185 98abbc84 2017-11-30 stsp if (blob2) {
186 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
187 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
192 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
194 09de383e 2018-12-24 stsp if (outfile) {
195 40dde666 2020-07-23 stsp int modebits;
197 46f68b20 2019-10-19 stsp if (mode1 && mode1 != mode2) {
198 40dde666 2020-07-23 stsp if (S_ISLNK(mode1))
199 40dde666 2020-07-23 stsp modebits = S_IFLNK;
201 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
202 46f68b20 2019-10-19 stsp if (asprintf(&modestr1, " (mode %o)",
203 40dde666 2020-07-23 stsp mode1 & modebits) == -1) {
204 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
208 46f68b20 2019-10-19 stsp if (mode2 && mode1 != mode2) {
209 40dde666 2020-07-23 stsp if (S_ISLNK(mode2))
210 40dde666 2020-07-23 stsp modebits = S_IFLNK;
212 40dde666 2020-07-23 stsp modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
213 46f68b20 2019-10-19 stsp if (asprintf(&modestr2, " (mode %o)",
214 40dde666 2020-07-23 stsp mode2 & modebits) == -1) {
215 46f68b20 2019-10-19 stsp err = got_error_from_errno("asprintf");
219 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob - %s%s\n", idstr1,
220 46f68b20 2019-10-19 stsp modestr1 ? modestr1 : "");
223 fe621944 2020-11-10 stsp outoff += n;
224 f9723081 2024-06-01 mark if (lines && *lines) {
225 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, outoff,
226 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_BLOB_MIN);
231 fe621944 2020-11-10 stsp n = fprintf(outfile, "blob + %s%s\n", idstr2,
232 46f68b20 2019-10-19 stsp modestr2 ? modestr2 : "");
235 fe621944 2020-11-10 stsp outoff += n;
236 f9723081 2024-06-01 mark if (lines && *lines) {
237 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, outoff,
238 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_BLOB_PLUS);
244 4b752015 2022-06-30 stsp err = got_diffreg(&result, f1, f2, diff_algo, ignore_whitespace,
245 4b752015 2022-06-30 stsp force_text_diff);
249 1f3405c9 2023-01-17 mark if (diffstat) {
250 a76e88e5 2023-01-10 mark char *path = NULL;
251 a76e88e5 2023-01-10 mark int status = GOT_STATUS_NO_CHANGE;
253 6b37f13a 2023-01-10 mark if (blob1 == NULL)
254 6b37f13a 2023-01-10 mark status = GOT_STATUS_ADD;
255 6b37f13a 2023-01-10 mark else if (blob2 == NULL)
256 6b37f13a 2023-01-10 mark status = GOT_STATUS_DELETE;
258 1f3405c9 2023-01-17 mark if (strcmp(idstr1, idstr2) != 0)
259 1f3405c9 2023-01-17 mark status = GOT_STATUS_MODIFY;
260 1f3405c9 2023-01-17 mark else if (mode1 != mode2)
261 1f3405c9 2023-01-17 mark status = GOT_STATUS_MODE_CHANGE;
264 a76e88e5 2023-01-10 mark if (label1 == NULL && label2 == NULL) {
265 a76e88e5 2023-01-10 mark /* diffstat of blobs, show hash instead of path */
266 a76e88e5 2023-01-10 mark if (asprintf(&path, "%.10s -> %.10s",
267 a76e88e5 2023-01-10 mark idstr1, idstr2) == -1) {
268 a76e88e5 2023-01-10 mark err = got_error_from_errno("asprintf");
272 6b37f13a 2023-01-10 mark if (label2 != NULL &&
273 6b37f13a 2023-01-10 mark (status != GOT_STATUS_DELETE || label1 == NULL))
274 6b37f13a 2023-01-10 mark path = strdup(label2);
276 6b37f13a 2023-01-10 mark path = strdup(label1);
277 a76e88e5 2023-01-10 mark if (path == NULL) {
278 6b37f13a 2023-01-10 mark err = got_error_from_errno("strdup");
283 1f3405c9 2023-01-17 mark err = get_diffstat(diffstat, path, result->result,
284 1f3405c9 2023-01-17 mark force_text_diff, status);
286 a76e88e5 2023-01-10 mark free(path);
291 fe621944 2020-11-10 stsp if (outfile) {
292 c7d5c43c 2022-08-04 mark err = got_diffreg_output(lines, nlines, result,
293 1cb46f00 2020-11-21 stsp blob1 != NULL, blob2 != NULL,
294 fe621944 2020-11-10 stsp label1 ? label1 : idstr1,
295 fe621944 2020-11-10 stsp label2 ? label2 : idstr2,
296 fe621944 2020-11-10 stsp GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
302 5fa52d6c 2023-01-11 mark free(modestr1);
303 5fa52d6c 2023-01-11 mark free(modestr2);
304 fe621944 2020-11-10 stsp if (resultp && err == NULL)
305 fe621944 2020-11-10 stsp *resultp = result;
306 3846622f 2023-01-07 mark else if (result) {
307 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
308 fe621944 2020-11-10 stsp if (free_err && err == NULL)
309 fe621944 2020-11-10 stsp err = free_err;
312 7d283eee 2017-11-29 stsp return err;
315 aaa13589 2019-06-01 stsp const struct got_error *
316 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
317 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
318 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
319 b72706c3 2022-06-01 stsp const char *label1, const char *label2, mode_t mode1, mode_t mode2,
320 b72706c3 2022-06-01 stsp struct got_repository *repo)
322 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg *a = arg;
324 c7d5c43c 2022-08-04 mark return diff_blobs(&a->lines, &a->nlines, NULL,
325 b72706c3 2022-06-01 stsp blob1, blob2, f1, f2, label1, label2, mode1, mode2, a->diff_context,
326 1f3405c9 2023-01-17 mark a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile,
327 1f3405c9 2023-01-17 mark a->diff_algo);
330 404c43c4 2018-06-21 stsp const struct got_error *
331 c7d5c43c 2022-08-04 mark got_diff_blob(struct got_diff_line **lines, size_t*nlines,
332 fe621944 2020-11-10 stsp struct got_blob_object *blob1, struct got_blob_object *blob2,
333 b72706c3 2022-06-01 stsp FILE *f1, FILE *f2, const char *label1, const char *label2,
334 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context,
335 1f3405c9 2023-01-17 mark int ignore_whitespace, int force_text_diff,
336 a76e88e5 2023-01-10 mark struct got_diffstat_cb_arg *ds, FILE *outfile)
338 c7d5c43c 2022-08-04 mark return diff_blobs(lines, nlines, NULL, blob1, blob2, f1, f2,
339 64453f7e 2020-11-21 stsp label1, label2, 0, 0, diff_context, ignore_whitespace,
340 1f3405c9 2023-01-17 mark force_text_diff, ds, outfile, diff_algo);
343 7f1f93af 2019-08-06 stsp static const struct got_error *
344 fe621944 2020-11-10 stsp diff_blob_file(struct got_diffreg_result **resultp,
345 b72706c3 2022-06-01 stsp struct got_blob_object *blob1, FILE *f1, off_t size1, const char *label1,
346 c87842d5 2022-09-23 mark FILE *f2, int f2_exists, struct stat *sb2, const char *label2,
347 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context, int ignore_whitespace,
348 1f3405c9 2023-01-17 mark int force_text_diff, struct got_diffstat_cb_arg *diffstat, FILE *outfile)
350 fe621944 2020-11-10 stsp const struct got_error *err = NULL, *free_err;
351 bbc740ac 2023-02-04 op char hex1[GOT_OBJECT_ID_HEX_MAXLEN];
352 58e31a80 2022-06-27 op const char *idstr1 = NULL;
353 fe621944 2020-11-10 stsp struct got_diffreg_result *result = NULL;
355 fe621944 2020-11-10 stsp if (resultp)
356 fe621944 2020-11-10 stsp *resultp = NULL;
359 b72f483a 2019-02-05 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
361 b72f483a 2019-02-05 stsp idstr1 = "/dev/null";
363 7f1f93af 2019-08-06 stsp if (outfile) {
364 c87842d5 2022-09-23 mark char *mode = NULL;
366 c87842d5 2022-09-23 mark /* display file mode for new added files only */
367 c87842d5 2022-09-23 mark if (f2_exists && blob1 == NULL) {
368 c87842d5 2022-09-23 mark int mmask = (S_IRWXU | S_IRWXG | S_IRWXO);
370 c87842d5 2022-09-23 mark if (S_ISLNK(sb2->st_mode))
371 c87842d5 2022-09-23 mark mmask = S_IFLNK;
372 c87842d5 2022-09-23 mark if (asprintf(&mode, " (mode %o)",
373 c87842d5 2022-09-23 mark sb2->st_mode & mmask) == -1)
374 c87842d5 2022-09-23 mark return got_error_from_errno("asprintf");
376 4ce46740 2019-08-08 stsp fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
377 c87842d5 2022-09-23 mark fprintf(outfile, "file + %s%s\n",
378 c87842d5 2022-09-23 mark f2_exists ? label2 : "/dev/null", mode ? mode : "");
379 c87842d5 2022-09-23 mark free(mode);
382 4b752015 2022-06-30 stsp err = got_diffreg(&result, f1, f2, diff_algo, ignore_whitespace,
383 4b752015 2022-06-30 stsp force_text_diff);
384 1eb651da 2023-09-19 falsifian if (err) {
385 1eb651da 2023-09-19 falsifian char msg[GOT_ERR_MAX_MSG_SIZE];
386 1eb651da 2023-09-19 falsifian if (snprintf(msg, sizeof(msg), "%s vs %s: %s",
387 1eb651da 2023-09-19 falsifian label1 ? label1 : idstr1,
388 1eb651da 2023-09-19 falsifian f2_exists ? label2 : "/dev/null", err->msg) >= 0) {
389 1eb651da 2023-09-19 falsifian err = got_error_msg(err->code, msg);
394 fe621944 2020-11-10 stsp if (outfile) {
395 1cb46f00 2020-11-21 stsp err = got_diffreg_output(NULL, NULL, result,
396 49d4a017 2022-06-30 stsp blob1 != NULL, f2_exists,
397 1cb46f00 2020-11-21 stsp label2, /* show local file's path, not a blob ID */
398 1cb46f00 2020-11-21 stsp label2, GOT_DIFF_OUTPUT_UNIDIFF,
399 1cb46f00 2020-11-21 stsp diff_context, outfile);
404 1f3405c9 2023-01-17 mark if (diffstat) {
405 a76e88e5 2023-01-10 mark char *path = NULL;
406 a76e88e5 2023-01-10 mark int status = GOT_STATUS_NO_CHANGE;
409 a76e88e5 2023-01-10 mark * Ignore 'm'ode status change: if there's no accompanying
410 a76e88e5 2023-01-10 mark * content change, there'll be no diffstat, and if there
411 a76e88e5 2023-01-10 mark * are actual changes, 'M'odified takes precedence.
413 a76e88e5 2023-01-10 mark if (blob1 == NULL)
414 a76e88e5 2023-01-10 mark status = GOT_STATUS_ADD;
415 a76e88e5 2023-01-10 mark else if (!f2_exists)
416 a76e88e5 2023-01-10 mark status = GOT_STATUS_DELETE;
418 a76e88e5 2023-01-10 mark status = GOT_STATUS_MODIFY;
420 6b37f13a 2023-01-10 mark if (label2 != NULL &&
421 6b37f13a 2023-01-10 mark (status != GOT_STATUS_DELETE || label1 == NULL))
422 6b37f13a 2023-01-10 mark path = strdup(label2);
424 6b37f13a 2023-01-10 mark path = strdup(label1);
425 6b37f13a 2023-01-10 mark if (path == NULL) {
426 6b37f13a 2023-01-10 mark err = got_error_from_errno("strdup");
430 1f3405c9 2023-01-17 mark err = get_diffstat(diffstat, path, result->result,
431 1f3405c9 2023-01-17 mark force_text_diff, status);
433 a76e88e5 2023-01-10 mark free(path);
439 fe621944 2020-11-10 stsp if (resultp && err == NULL)
440 fe621944 2020-11-10 stsp *resultp = result;
441 fe621944 2020-11-10 stsp else if (result) {
442 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(result);
443 fe621944 2020-11-10 stsp if (free_err && err == NULL)
444 fe621944 2020-11-10 stsp err = free_err;
446 b72f483a 2019-02-05 stsp return err;
449 7f1f93af 2019-08-06 stsp const struct got_error *
450 b72706c3 2022-06-01 stsp got_diff_blob_file(struct got_blob_object *blob1, FILE *f1, off_t size1,
451 c87842d5 2022-09-23 mark const char *label1, FILE *f2, int f2_exists, struct stat *sb2,
452 4b752015 2022-06-30 stsp const char *label2, enum got_diff_algorithm diff_algo, int diff_context,
453 1f3405c9 2023-01-17 mark int ignore_whitespace, int force_text_diff,
454 a76e88e5 2023-01-10 mark struct got_diffstat_cb_arg *ds, FILE *outfile)
456 49d4a017 2022-06-30 stsp return diff_blob_file(NULL, blob1, f1, size1, label1, f2, f2_exists,
457 c87842d5 2022-09-23 mark sb2, label2, diff_algo, diff_context, ignore_whitespace,
458 1f3405c9 2023-01-17 mark force_text_diff, ds, outfile);
461 474b4f94 2017-11-30 stsp static const struct got_error *
462 49d4a017 2022-06-30 stsp diff_added_blob(struct got_object_id *id, FILE *f1, FILE *f2, int fd2,
463 f9d37699 2022-06-28 stsp const char *label, mode_t mode, struct got_repository *repo,
464 b72706c3 2022-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
466 4e22badc 2017-11-30 stsp const struct got_error *err;
467 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
468 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
470 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
472 4e22badc 2017-11-30 stsp return err;
474 49d4a017 2022-06-30 stsp err = got_object_blob_open(&blob, repo, obj, 8192, fd2);
477 49d4a017 2022-06-30 stsp err = cb(cb_arg, NULL, blob, f1, f2, NULL, id,
478 b72706c3 2022-06-01 stsp NULL, label, 0, mode, repo);
480 2acfca77 2018-04-01 stsp got_object_close(obj);
482 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
483 2acfca77 2018-04-01 stsp return err;
486 474b4f94 2017-11-30 stsp static const struct got_error *
487 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
488 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
489 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
490 b72706c3 2022-06-01 stsp mode_t mode1, mode_t mode2, struct got_repository *repo,
491 b72706c3 2022-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
493 6a213ccb 2017-11-30 stsp const struct got_error *err;
494 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
495 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
496 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
497 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
499 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
501 730a8aa0 2018-04-24 stsp return err;
503 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
504 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
508 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
511 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
512 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
516 eb81bc23 2022-06-28 tracey err = got_object_blob_open(&blob1, repo, obj1, 8192, fd1);
520 eb81bc23 2022-06-28 tracey err = got_object_blob_open(&blob2, repo, obj2, 8192, fd2);
524 b72706c3 2022-06-01 stsp err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2, label1, label2,
525 b72706c3 2022-06-01 stsp mode1, mode2, repo);
528 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
530 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
532 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
534 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
535 6a213ccb 2017-11-30 stsp return err;
538 474b4f94 2017-11-30 stsp static const struct got_error *
539 49d4a017 2022-06-30 stsp diff_deleted_blob(struct got_object_id *id, FILE *f1, int fd1,
540 49d4a017 2022-06-30 stsp FILE *f2, const char *label, mode_t mode, struct got_repository *repo,
541 f9d37699 2022-06-28 stsp got_diff_blob_cb cb, void *cb_arg)
543 365fb436 2017-11-30 stsp const struct got_error *err;
544 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
545 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
547 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
549 365fb436 2017-11-30 stsp return err;
551 49d4a017 2022-06-30 stsp err = got_object_blob_open(&blob, repo, obj, 8192, fd1);
554 49d4a017 2022-06-30 stsp err = cb(cb_arg, blob, NULL, f1, f2, id, NULL, label, NULL,
555 b72706c3 2022-06-01 stsp mode, 0, repo);
557 2acfca77 2018-04-01 stsp got_object_close(obj);
559 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
560 2acfca77 2018-04-01 stsp return err;
563 474b4f94 2017-11-30 stsp static const struct got_error *
564 49d4a017 2022-06-30 stsp diff_added_tree(struct got_object_id *id, FILE *f1, FILE *f2, int fd2,
565 49d4a017 2022-06-30 stsp const char *label, struct got_repository *repo, got_diff_blob_cb cb,
566 49d4a017 2022-06-30 stsp void *cb_arg, int diff_content)
568 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
569 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
570 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
572 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
576 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
577 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
581 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
585 49d4a017 2022-06-30 stsp err = got_diff_tree(NULL, tree, f1, f2, -1, fd2, NULL, label,
586 b72706c3 2022-06-01 stsp repo, cb, cb_arg, diff_content);
589 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
590 9c70d4c3 2017-11-30 stsp if (treeobj)
591 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
592 9c70d4c3 2017-11-30 stsp return err;
595 474b4f94 2017-11-30 stsp static const struct got_error *
596 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
597 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
598 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
599 b72706c3 2022-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
600 b72706c3 2022-06-01 stsp int diff_content)
602 f6861a81 2018-09-13 stsp const struct got_error *err;
603 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
604 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
605 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
606 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
608 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
612 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
613 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
617 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
621 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
622 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
626 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
630 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
634 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2,
635 f9d37699 2022-06-28 stsp label1, label2, repo, cb, cb_arg, diff_content);
639 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
641 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
642 789689b5 2017-11-30 stsp if (treeobj1)
643 789689b5 2017-11-30 stsp got_object_close(treeobj1);
644 789689b5 2017-11-30 stsp if (treeobj2)
645 789689b5 2017-11-30 stsp got_object_close(treeobj2);
646 789689b5 2017-11-30 stsp return err;
649 474b4f94 2017-11-30 stsp static const struct got_error *
650 49d4a017 2022-06-30 stsp diff_deleted_tree(struct got_object_id *id, FILE *f1, int fd1,
651 49d4a017 2022-06-30 stsp FILE *f2, const char *label, struct got_repository *repo,
652 f9d37699 2022-06-28 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
654 f6861a81 2018-09-13 stsp const struct got_error *err;
655 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
656 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
658 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
662 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
663 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
667 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
671 49d4a017 2022-06-30 stsp err = got_diff_tree(tree, NULL, f1, f2, fd1, -1, label, NULL,
672 b72706c3 2022-06-01 stsp repo, cb, cb_arg, diff_content);
675 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
676 2c56f2ce 2017-11-30 stsp if (treeobj)
677 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
678 2c56f2ce 2017-11-30 stsp return err;
681 474b4f94 2017-11-30 stsp static const struct got_error *
682 760a1ec3 2023-03-10 stsp diff_kind_mismatch(struct got_tree_entry *te1, struct got_tree_entry *te2,
683 760a1ec3 2023-03-10 stsp FILE *f1, FILE *f2, int fd1, int fd2,
684 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
685 760a1ec3 2023-03-10 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
687 760a1ec3 2023-03-10 stsp const struct got_error *err = NULL;
690 760a1ec3 2023-03-10 stsp * Handle files changing into directories and vice-versa.
691 760a1ec3 2023-03-10 stsp * Disregard edge cases with FIFOs, device nodes, etc for now.
693 760a1ec3 2023-03-10 stsp if (!S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
694 760a1ec3 2023-03-10 stsp if (S_ISREG(te1->mode)) {
695 760a1ec3 2023-03-10 stsp if (diff_content) {
696 760a1ec3 2023-03-10 stsp err = diff_deleted_blob(&te1->id, f1, fd1,
697 760a1ec3 2023-03-10 stsp f2, label1, te1->mode, repo, cb, cb_arg);
699 760a1ec3 2023-03-10 stsp err = cb(cb_arg, NULL, NULL, NULL, NULL,
700 760a1ec3 2023-03-10 stsp &te1->id, NULL, label1, NULL,
701 760a1ec3 2023-03-10 stsp te1->mode, 0, repo);
704 760a1ec3 2023-03-10 stsp return err;
706 760a1ec3 2023-03-10 stsp return diff_added_tree(&te2->id, f1, f2, fd2, label2,
707 760a1ec3 2023-03-10 stsp repo, cb, cb_arg, diff_content);
708 760a1ec3 2023-03-10 stsp } else if (S_ISDIR(te1->mode) && !S_ISDIR(te2->mode)) {
709 760a1ec3 2023-03-10 stsp err = diff_deleted_tree(&te1->id, f1, fd1, f2,
710 760a1ec3 2023-03-10 stsp label1, repo, cb, cb_arg, diff_content);
712 760a1ec3 2023-03-10 stsp return err;
713 760a1ec3 2023-03-10 stsp if (S_ISREG(te2->mode)) {
714 760a1ec3 2023-03-10 stsp if (diff_content) {
715 760a1ec3 2023-03-10 stsp err = diff_added_blob(&te2->id, f1, f2, fd2,
716 760a1ec3 2023-03-10 stsp label2, te2->mode, repo, cb, cb_arg);
718 760a1ec3 2023-03-10 stsp err = cb(cb_arg, NULL, NULL, NULL, NULL, NULL,
719 760a1ec3 2023-03-10 stsp &te2->id, NULL, label2, 0, te2->mode, repo);
722 760a1ec3 2023-03-10 stsp return err;
726 474b4f94 2017-11-30 stsp return NULL;
729 474b4f94 2017-11-30 stsp static const struct got_error *
730 b72706c3 2022-06-01 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_entry *te2,
731 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
732 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
733 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
734 31b4484f 2019-07-27 stsp int diff_content)
736 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
737 19ae6da1 2018-11-05 stsp int id_match;
739 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te1))
740 63c5ca5d 2019-08-24 stsp return NULL;
742 474b4f94 2017-11-30 stsp if (te2 == NULL) {
743 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
744 49d4a017 2022-06-30 stsp err = diff_deleted_tree(&te1->id, f1, fd1, f2,
745 49d4a017 2022-06-30 stsp label1, repo, cb, cb_arg, diff_content);
747 31b4484f 2019-07-27 stsp if (diff_content)
748 f9d37699 2022-06-28 stsp err = diff_deleted_blob(&te1->id, f1, fd1,
749 49d4a017 2022-06-30 stsp f2, label1, te1->mode, repo, cb, cb_arg);
751 b72706c3 2022-06-01 stsp err = cb(cb_arg, NULL, NULL, NULL, NULL,
752 b72706c3 2022-06-01 stsp &te1->id, NULL, label1, NULL,
753 b72706c3 2022-06-01 stsp te1->mode, 0, repo);
755 f6861a81 2018-09-13 stsp return err;
756 63c5ca5d 2019-08-24 stsp } else if (got_object_tree_entry_is_submodule(te2))
757 63c5ca5d 2019-08-24 stsp return NULL;
759 56e0773d 2019-11-28 stsp id_match = (got_object_id_cmp(&te1->id, &te2->id) == 0);
760 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
761 19ae6da1 2018-11-05 stsp if (!id_match)
762 b72706c3 2022-06-01 stsp return diff_modified_tree(&te1->id, &te2->id, f1, f2,
763 f9d37699 2022-06-28 stsp fd1, fd2, label1, label2, repo, cb, cb_arg,
764 f9d37699 2022-06-28 stsp diff_content);
765 40dde666 2020-07-23 stsp } else if ((S_ISREG(te1->mode) || S_ISLNK(te1->mode)) &&
766 40dde666 2020-07-23 stsp (S_ISREG(te2->mode) || S_ISLNK(te2->mode))) {
767 46f68b20 2019-10-19 stsp if (!id_match ||
768 40dde666 2020-07-23 stsp ((te1->mode & (S_IFLNK | S_IXUSR))) !=
769 40dde666 2020-07-23 stsp (te2->mode & (S_IFLNK | S_IXUSR))) {
770 31b4484f 2019-07-27 stsp if (diff_content)
771 56e0773d 2019-11-28 stsp return diff_modified_blob(&te1->id, &te2->id,
772 f9d37699 2022-06-28 stsp f1, f2, fd1, fd2, label1, label2,
773 f9d37699 2022-06-28 stsp te1->mode, te2->mode, repo, cb, cb_arg);
775 b72706c3 2022-06-01 stsp return cb(cb_arg, NULL, NULL, NULL, NULL,
776 b72706c3 2022-06-01 stsp &te1->id, &te2->id, label1, label2,
777 b72706c3 2022-06-01 stsp te1->mode, te2->mode, repo);
781 19ae6da1 2018-11-05 stsp if (id_match)
782 f6861a81 2018-09-13 stsp return NULL;
784 760a1ec3 2023-03-10 stsp return diff_kind_mismatch(te1, te2, f1, f2, fd1, fd2,
785 760a1ec3 2023-03-10 stsp label1, label2, repo, cb, cb_arg, diff_content);
788 474b4f94 2017-11-30 stsp static const struct got_error *
789 56e0773d 2019-11-28 stsp diff_entry_new_old(struct got_tree_entry *te2,
790 49d4a017 2022-06-30 stsp struct got_tree_entry *te1, FILE *f1, FILE *f2, int fd2, const char *label2,
791 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
792 31b4484f 2019-07-27 stsp int diff_content)
794 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
795 63c5ca5d 2019-08-24 stsp return NULL;
797 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te2))
798 f6861a81 2018-09-13 stsp return NULL;
800 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
801 49d4a017 2022-06-30 stsp return diff_added_tree(&te2->id, f1, f2, fd2, label2,
802 b72706c3 2022-06-01 stsp repo, cb, cb_arg, diff_content);
804 31b4484f 2019-07-27 stsp if (diff_content)
805 49d4a017 2022-06-30 stsp return diff_added_blob(&te2->id, f1, f2, fd2,
806 f9d37699 2022-06-28 stsp label2, te2->mode, repo, cb, cb_arg);
808 b72706c3 2022-06-01 stsp return cb(cb_arg, NULL, NULL, NULL, NULL, NULL, &te2->id,
809 b72706c3 2022-06-01 stsp NULL, label2, 0, te2->mode, repo);
812 0208f208 2020-05-05 stsp const struct got_error *
813 5191b70b 2023-01-07 mark got_diff_tree_compute_diffstat(void *arg, struct got_blob_object *blob1,
814 5191b70b 2023-01-07 mark struct got_blob_object *blob2, FILE *f1, FILE *f2,
815 5191b70b 2023-01-07 mark struct got_object_id *id1, struct got_object_id *id2,
816 5191b70b 2023-01-07 mark const char *label1, const char *label2,
817 5191b70b 2023-01-07 mark mode_t mode1, mode_t mode2, struct got_repository *repo)
819 5191b70b 2023-01-07 mark const struct got_error *err = NULL;
820 5191b70b 2023-01-07 mark struct got_diffreg_result *result = NULL;
821 5191b70b 2023-01-07 mark struct got_diffstat_cb_arg *a = arg;
822 5191b70b 2023-01-07 mark char *path = NULL;
823 a76e88e5 2023-01-10 mark int status = GOT_STATUS_NO_CHANGE;
825 5191b70b 2023-01-07 mark path = strdup(label2 ? label2 : label1);
826 5191b70b 2023-01-07 mark if (path == NULL)
827 6b37f13a 2023-01-10 mark return got_error_from_errno("strdup");
829 5191b70b 2023-01-07 mark if (id1 == NULL)
830 a76e88e5 2023-01-10 mark status = GOT_STATUS_ADD;
831 5191b70b 2023-01-07 mark else if (id2 == NULL)
832 a76e88e5 2023-01-10 mark status = GOT_STATUS_DELETE;
834 5191b70b 2023-01-07 mark if (got_object_id_cmp(id1, id2) != 0)
835 a76e88e5 2023-01-10 mark status = GOT_STATUS_MODIFY;
836 5191b70b 2023-01-07 mark else if (mode1 != mode2)
837 a76e88e5 2023-01-10 mark status = GOT_STATUS_MODE_CHANGE;
841 5191b70b 2023-01-07 mark err = got_opentemp_truncate(f1);
846 5191b70b 2023-01-07 mark err = got_opentemp_truncate(f2);
851 5191b70b 2023-01-07 mark if (blob1) {
852 5191b70b 2023-01-07 mark err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1,
857 5191b70b 2023-01-07 mark if (blob2) {
858 5191b70b 2023-01-07 mark err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2,
864 5191b70b 2023-01-07 mark err = got_diffreg(&result, f1, f2, a->diff_algo, a->ignore_ws,
865 5191b70b 2023-01-07 mark a->force_text);
869 a76e88e5 2023-01-10 mark err = get_diffstat(a, path, result->result, a->force_text, status);
872 5191b70b 2023-01-07 mark if (result) {
873 5191b70b 2023-01-07 mark const struct got_error *free_err;
875 5191b70b 2023-01-07 mark free_err = got_diffreg_result_free(result);
876 5191b70b 2023-01-07 mark if (free_err && err == NULL)
877 5191b70b 2023-01-07 mark err = free_err;
880 5191b70b 2023-01-07 mark free(path);
881 5191b70b 2023-01-07 mark return err;
884 5191b70b 2023-01-07 mark const struct got_error *
885 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths(void *arg, struct got_blob_object *blob1,
886 b72706c3 2022-06-01 stsp struct got_blob_object *blob2, FILE *f1, FILE *f2,
887 b72706c3 2022-06-01 stsp struct got_object_id *id1, struct got_object_id *id2,
888 b72706c3 2022-06-01 stsp const char *label1, const char *label2,
889 0208f208 2020-05-05 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
891 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
892 0208f208 2020-05-05 stsp struct got_pathlist_head *paths = arg;
893 0208f208 2020-05-05 stsp struct got_diff_changed_path *change = NULL;
894 0208f208 2020-05-05 stsp char *path = NULL;
896 0208f208 2020-05-05 stsp path = strdup(label2 ? label2 : label1);
897 0208f208 2020-05-05 stsp if (path == NULL)
898 6b37f13a 2023-01-10 mark return got_error_from_errno("strdup");
900 0208f208 2020-05-05 stsp change = malloc(sizeof(*change));
901 0208f208 2020-05-05 stsp if (change == NULL) {
902 0208f208 2020-05-05 stsp err = got_error_from_errno("malloc");
906 0208f208 2020-05-05 stsp change->status = GOT_STATUS_NO_CHANGE;
907 0208f208 2020-05-05 stsp if (id1 == NULL)
908 0208f208 2020-05-05 stsp change->status = GOT_STATUS_ADD;
909 0208f208 2020-05-05 stsp else if (id2 == NULL)
910 0208f208 2020-05-05 stsp change->status = GOT_STATUS_DELETE;
912 0208f208 2020-05-05 stsp if (got_object_id_cmp(id1, id2) != 0)
913 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODIFY;
914 0208f208 2020-05-05 stsp else if (mode1 != mode2)
915 0208f208 2020-05-05 stsp change->status = GOT_STATUS_MODE_CHANGE;
918 46ea77db 2021-12-20 stsp err = got_pathlist_append(paths, path, change);
921 0208f208 2020-05-05 stsp free(path);
922 0208f208 2020-05-05 stsp free(change);
924 0208f208 2020-05-05 stsp return err;
927 474b4f94 2017-11-30 stsp const struct got_error *
928 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
929 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
930 f9d37699 2022-06-28 stsp const char *label1, const char *label2,
931 b72706c3 2022-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
932 b72706c3 2022-06-01 stsp int diff_content)
934 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
935 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
936 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
937 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
938 56e0773d 2019-11-28 stsp int tidx1 = 0, tidx2 = 0;
940 883f0469 2018-06-23 stsp if (tree1) {
941 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, 0);
942 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
943 f6861a81 2018-09-13 stsp te1->name) == -1)
944 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
946 883f0469 2018-06-23 stsp if (tree2) {
947 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, 0);
948 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
949 5fa52d6c 2023-01-11 mark te2->name) == -1) {
950 5fa52d6c 2023-01-11 mark err = got_error_from_errno("asprintf");
957 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
960 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
961 1de5e065 2019-06-01 stsp te1->name);
965 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
966 5fa52d6c 2023-01-11 mark label2[0] ? "/" : "", te->name) == -1) {
967 5fa52d6c 2023-01-11 mark err = got_error_from_errno("asprintf");
972 f9d37699 2022-06-28 stsp err = diff_entry_old_new(te1, te, f1, f2, fd1, fd2,
973 f9d37699 2022-06-28 stsp l1, l2, repo, cb, cb_arg, diff_content);
979 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
982 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
983 1de5e065 2019-06-01 stsp te2->name);
988 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
989 5fa52d6c 2023-01-11 mark label2[0] ? "/" : "", te->name) == -1) {
990 5fa52d6c 2023-01-11 mark err = got_error_from_errno("asprintf");
994 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
995 5fa52d6c 2023-01-11 mark label2[0] ? "/" : "", te2->name) == -1) {
996 5fa52d6c 2023-01-11 mark err = got_error_from_errno("asprintf");
1001 49d4a017 2022-06-30 stsp err = diff_entry_new_old(te2, te, f1, f2, fd2, l2,
1002 49d4a017 2022-06-30 stsp repo, cb, cb_arg, diff_content);
1008 f6861a81 2018-09-13 stsp l1 = NULL;
1009 f6861a81 2018-09-13 stsp if (te1) {
1011 56e0773d 2019-11-28 stsp te1 = got_object_tree_get_entry(tree1, tidx1);
1012 f6861a81 2018-09-13 stsp if (te1 &&
1013 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
1014 5fa52d6c 2023-01-11 mark label1[0] ? "/" : "", te1->name) == -1) {
1015 5fa52d6c 2023-01-11 mark err = got_error_from_errno("asprintf");
1016 5fa52d6c 2023-01-11 mark goto done;
1021 f6861a81 2018-09-13 stsp l2 = NULL;
1022 f6861a81 2018-09-13 stsp if (te2) {
1024 56e0773d 2019-11-28 stsp te2 = got_object_tree_get_entry(tree2, tidx2);
1025 f6861a81 2018-09-13 stsp if (te2 &&
1026 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
1027 5fa52d6c 2023-01-11 mark label2[0] ? "/" : "", te2->name) == -1) {
1028 5fa52d6c 2023-01-11 mark err = got_error_from_errno("asprintf");
1029 5fa52d6c 2023-01-11 mark goto done;
1032 474b4f94 2017-11-30 stsp } while (te1 || te2);
1037 11528a82 2018-05-19 stsp return err;
1040 11528a82 2018-05-19 stsp const struct got_error *
1041 c7d5c43c 2022-08-04 mark got_diff_objects_as_blobs(struct got_diff_line **lines, size_t *nlines,
1042 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
1043 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
1044 4b752015 2022-06-30 stsp const char *label1, const char *label2,
1045 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context,
1046 1f3405c9 2023-01-17 mark int ignore_whitespace, int force_text_diff, struct got_diffstat_cb_arg *ds,
1047 1f3405c9 2023-01-17 mark struct got_repository *repo, FILE *outfile)
1049 11528a82 2018-05-19 stsp const struct got_error *err;
1050 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1052 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
1053 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
1055 15a94983 2018-12-23 stsp if (id1) {
1056 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob1, repo, id1, 8192, fd1);
1058 cd0acaa7 2018-05-20 stsp goto done;
1060 15a94983 2018-12-23 stsp if (id2) {
1061 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob2, repo, id2, 8192, fd2);
1063 cd0acaa7 2018-05-20 stsp goto done;
1065 c7d5c43c 2022-08-04 mark err = got_diff_blob(lines, nlines, blob1, blob2, f1, f2, label1, label2,
1066 c7d5c43c 2022-08-04 mark diff_algo, diff_context, ignore_whitespace, force_text_diff,
1067 1f3405c9 2023-01-17 mark ds, outfile);
1069 67b631c9 2021-10-10 stsp if (blob1)
1070 67b631c9 2021-10-10 stsp got_object_blob_close(blob1);
1071 67b631c9 2021-10-10 stsp if (blob2)
1072 67b631c9 2021-10-10 stsp got_object_blob_close(blob2);
1073 67b631c9 2021-10-10 stsp return err;
1076 67b631c9 2021-10-10 stsp static const struct got_error *
1077 67b631c9 2021-10-10 stsp diff_paths(struct got_tree_object *tree1, struct got_tree_object *tree2,
1078 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2, struct got_pathlist_head *paths,
1079 b72706c3 2022-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
1081 67b631c9 2021-10-10 stsp const struct got_error *err = NULL;
1082 67b631c9 2021-10-10 stsp struct got_pathlist_entry *pe;
1083 67b631c9 2021-10-10 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
1084 67b631c9 2021-10-10 stsp struct got_tree_object *subtree1 = NULL, *subtree2 = NULL;
1085 67b631c9 2021-10-10 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1087 67b631c9 2021-10-10 stsp TAILQ_FOREACH(pe, paths, entry) {
1088 67b631c9 2021-10-10 stsp int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
1089 67b631c9 2021-10-10 stsp mode_t mode1 = 0, mode2 = 0;
1091 67b631c9 2021-10-10 stsp free(id1);
1092 67b631c9 2021-10-10 stsp id1 = NULL;
1093 67b631c9 2021-10-10 stsp free(id2);
1094 67b631c9 2021-10-10 stsp id2 = NULL;
1095 67b631c9 2021-10-10 stsp if (subtree1) {
1096 67b631c9 2021-10-10 stsp got_object_tree_close(subtree1);
1097 67b631c9 2021-10-10 stsp subtree1 = NULL;
1099 67b631c9 2021-10-10 stsp if (subtree2) {
1100 67b631c9 2021-10-10 stsp got_object_tree_close(subtree2);
1101 67b631c9 2021-10-10 stsp subtree2 = NULL;
1103 67b631c9 2021-10-10 stsp if (blob1) {
1104 67b631c9 2021-10-10 stsp got_object_blob_close(blob1);
1105 67b631c9 2021-10-10 stsp blob1 = NULL;
1107 67b631c9 2021-10-10 stsp if (blob2) {
1108 67b631c9 2021-10-10 stsp got_object_blob_close(blob2);
1109 67b631c9 2021-10-10 stsp blob2 = NULL;
1111 cf31b474 2023-06-06 stsp if (tree1) {
1112 cf31b474 2023-06-06 stsp err = got_object_tree_find_path(&id1, &mode1, repo,
1113 cf31b474 2023-06-06 stsp tree1, pe->path);
1114 cf31b474 2023-06-06 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
1115 cf31b474 2023-06-06 stsp goto done;
1117 cf31b474 2023-06-06 stsp if (tree2) {
1118 cf31b474 2023-06-06 stsp err = got_object_tree_find_path(&id2, &mode2, repo,
1119 cf31b474 2023-06-06 stsp tree2, pe->path);
1120 cf31b474 2023-06-06 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
1121 cf31b474 2023-06-06 stsp goto done;
1123 67b631c9 2021-10-10 stsp if (id1 == NULL && id2 == NULL) {
1124 67b631c9 2021-10-10 stsp err = got_error_path(pe->path, GOT_ERR_NO_TREE_ENTRY);
1125 67b631c9 2021-10-10 stsp goto done;
1127 67b631c9 2021-10-10 stsp if (id1) {
1128 67b631c9 2021-10-10 stsp err = got_object_get_type(&type1, repo, id1);
1130 67b631c9 2021-10-10 stsp goto done;
1132 67b631c9 2021-10-10 stsp if (id2) {
1133 67b631c9 2021-10-10 stsp err = got_object_get_type(&type2, repo, id2);
1135 67b631c9 2021-10-10 stsp goto done;
1137 67b631c9 2021-10-10 stsp if (type1 == GOT_OBJ_TYPE_ANY &&
1138 67b631c9 2021-10-10 stsp type2 == GOT_OBJ_TYPE_ANY) {
1139 67b631c9 2021-10-10 stsp err = got_error_path(pe->path, GOT_ERR_NO_OBJ);
1140 67b631c9 2021-10-10 stsp goto done;
1141 67b631c9 2021-10-10 stsp } else if (type1 != GOT_OBJ_TYPE_ANY &&
1142 67b631c9 2021-10-10 stsp type2 != GOT_OBJ_TYPE_ANY && type1 != type2) {
1143 67b631c9 2021-10-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1144 67b631c9 2021-10-10 stsp goto done;
1147 67b631c9 2021-10-10 stsp if (type1 == GOT_OBJ_TYPE_BLOB ||
1148 67b631c9 2021-10-10 stsp type2 == GOT_OBJ_TYPE_BLOB) {
1149 67b631c9 2021-10-10 stsp if (id1) {
1150 67b631c9 2021-10-10 stsp err = got_object_open_as_blob(&blob1, repo,
1151 eb81bc23 2022-06-28 tracey id1, 8192, fd1);
1153 67b631c9 2021-10-10 stsp goto done;
1155 67b631c9 2021-10-10 stsp if (id2) {
1156 67b631c9 2021-10-10 stsp err = got_object_open_as_blob(&blob2, repo,
1157 eb81bc23 2022-06-28 tracey id2, 8192, fd2);
1159 67b631c9 2021-10-10 stsp goto done;
1161 b72706c3 2022-06-01 stsp err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2,
1162 67b631c9 2021-10-10 stsp id1 ? pe->path : "/dev/null",
1163 67b631c9 2021-10-10 stsp id2 ? pe->path : "/dev/null",
1164 67b631c9 2021-10-10 stsp mode1, mode2, repo);
1166 67b631c9 2021-10-10 stsp goto done;
1167 67b631c9 2021-10-10 stsp } else if (type1 == GOT_OBJ_TYPE_TREE ||
1168 67b631c9 2021-10-10 stsp type2 == GOT_OBJ_TYPE_TREE) {
1169 67b631c9 2021-10-10 stsp if (id1) {
1170 67b631c9 2021-10-10 stsp err = got_object_open_as_tree(&subtree1, repo,
1173 67b631c9 2021-10-10 stsp goto done;
1175 67b631c9 2021-10-10 stsp if (id2) {
1176 67b631c9 2021-10-10 stsp err = got_object_open_as_tree(&subtree2, repo,
1179 67b631c9 2021-10-10 stsp goto done;
1181 b72706c3 2022-06-01 stsp err = got_diff_tree(subtree1, subtree2, f1, f2,
1183 67b631c9 2021-10-10 stsp id1 ? pe->path : "/dev/null",
1184 67b631c9 2021-10-10 stsp id2 ? pe->path : "/dev/null",
1185 67b631c9 2021-10-10 stsp repo, cb, cb_arg, 1);
1187 67b631c9 2021-10-10 stsp goto done;
1189 67b631c9 2021-10-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1190 67b631c9 2021-10-10 stsp goto done;
1194 67b631c9 2021-10-10 stsp free(id1);
1195 67b631c9 2021-10-10 stsp free(id2);
1196 67b631c9 2021-10-10 stsp if (subtree1)
1197 67b631c9 2021-10-10 stsp got_object_tree_close(subtree1);
1198 67b631c9 2021-10-10 stsp if (subtree2)
1199 67b631c9 2021-10-10 stsp got_object_tree_close(subtree2);
1200 11528a82 2018-05-19 stsp if (blob1)
1201 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
1202 11528a82 2018-05-19 stsp if (blob2)
1203 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
1204 474b4f94 2017-11-30 stsp return err;
1207 8469d821 2022-06-25 stsp static const struct got_error *
1208 c7d5c43c 2022-08-04 mark show_object_id(struct got_diff_line **lines, size_t *nlines,
1209 c7d5c43c 2022-08-04 mark const char *obj_typestr, int ch, const char *id_str, FILE *outfile)
1211 8469d821 2022-06-25 stsp const struct got_error *err;
1213 8469d821 2022-06-25 stsp off_t outoff = 0;
1215 8469d821 2022-06-25 stsp n = fprintf(outfile, "%s %c %s\n", obj_typestr, ch, id_str);
1217 36e83e5e 2022-08-16 op return got_error_from_errno("fprintf");
1219 c7d5c43c 2022-08-04 mark if (lines != NULL && *lines != NULL) {
1220 8469d821 2022-06-25 stsp if (*nlines == 0) {
1221 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, 0,
1222 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_META);
1224 8469d821 2022-06-25 stsp return err;
1226 c7d5c43c 2022-08-04 mark outoff = (*lines)[*nlines - 1].offset;
1228 8469d821 2022-06-25 stsp outoff += n;
1229 c7d5c43c 2022-08-04 mark err = add_line_metadata(lines, nlines, outoff,
1230 c7d5c43c 2022-08-04 mark GOT_DIFF_LINE_META);
1232 8469d821 2022-06-25 stsp return err;
1235 8469d821 2022-06-25 stsp return NULL;
1238 8469d821 2022-06-25 stsp static const struct got_error *
1239 c7d5c43c 2022-08-04 mark diff_objects_as_trees(struct got_diff_line **lines, size_t *nlines,
1240 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
1241 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
1242 58e31a80 2022-06-27 op struct got_pathlist_head *paths, const char *label1, const char *label2,
1243 58e31a80 2022-06-27 op int diff_context, int ignore_whitespace, int force_text_diff,
1244 1f3405c9 2023-01-17 mark struct got_diffstat_cb_arg *dsa, struct got_repository *repo,
1245 1f3405c9 2023-01-17 mark FILE *outfile, enum got_diff_algorithm diff_algo)
1247 11528a82 2018-05-19 stsp const struct got_error *err;
1248 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1249 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
1250 c7d5c43c 2022-08-04 mark int want_linemeta = (lines != NULL && *lines != NULL);
1252 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
1253 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
1255 15a94983 2018-12-23 stsp if (id1) {
1256 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
1258 cd0acaa7 2018-05-20 stsp goto done;
1260 15a94983 2018-12-23 stsp if (id2) {
1261 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
1263 cd0acaa7 2018-05-20 stsp goto done;
1266 4b752015 2022-06-30 stsp arg.diff_algo = diff_algo;
1267 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
1268 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
1269 64453f7e 2020-11-21 stsp arg.force_text_diff = force_text_diff;
1270 a76e88e5 2023-01-10 mark arg.diffstat = dsa;
1271 aaa13589 2019-06-01 stsp arg.outfile = outfile;
1272 c7d5c43c 2022-08-04 mark if (want_linemeta) {
1273 c7d5c43c 2022-08-04 mark arg.lines = *lines;
1274 fe621944 2020-11-10 stsp arg.nlines = *nlines;
1276 c7d5c43c 2022-08-04 mark arg.lines = NULL;
1277 fe621944 2020-11-10 stsp arg.nlines = 0;
1279 a76e88e5 2023-01-10 mark if (paths == NULL || TAILQ_EMPTY(paths))
1280 a76e88e5 2023-01-10 mark err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, label1,
1281 a76e88e5 2023-01-10 mark label2, repo, got_diff_blob_output_unidiff, &arg, 1);
1283 f9d37699 2022-06-28 stsp err = diff_paths(tree1, tree2, f1, f2, fd1, fd2, paths, repo,
1284 67b631c9 2021-10-10 stsp got_diff_blob_output_unidiff, &arg);
1285 c7d5c43c 2022-08-04 mark if (want_linemeta) {
1286 c7d5c43c 2022-08-04 mark *lines = arg.lines; /* was likely re-allocated */
1287 fe621944 2020-11-10 stsp *nlines = arg.nlines;
1290 11528a82 2018-05-19 stsp if (tree1)
1291 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
1292 11528a82 2018-05-19 stsp if (tree2)
1293 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
1294 11528a82 2018-05-19 stsp return err;
1297 11528a82 2018-05-19 stsp const struct got_error *
1298 c7d5c43c 2022-08-04 mark got_diff_objects_as_trees(struct got_diff_line **lines, size_t *nlines,
1299 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
1300 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
1301 58e31a80 2022-06-27 op struct got_pathlist_head *paths, const char *label1, const char *label2,
1302 4b752015 2022-06-30 stsp enum got_diff_algorithm diff_algo, int diff_context, int ignore_whitespace,
1303 1f3405c9 2023-01-17 mark int force_text_diff, struct got_diffstat_cb_arg *dsa,
1304 a76e88e5 2023-01-10 mark struct got_repository *repo, FILE *outfile)
1306 8469d821 2022-06-25 stsp const struct got_error *err;
1307 8469d821 2022-06-25 stsp char *idstr = NULL;
1309 8469d821 2022-06-25 stsp if (id1 == NULL && id2 == NULL)
1310 8469d821 2022-06-25 stsp return got_error(GOT_ERR_NO_OBJ);
1312 8469d821 2022-06-25 stsp if (id1) {
1313 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id1);
1315 8469d821 2022-06-25 stsp goto done;
1316 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '-', idstr, outfile);
1318 8469d821 2022-06-25 stsp goto done;
1319 8469d821 2022-06-25 stsp free(idstr);
1320 8469d821 2022-06-25 stsp idstr = NULL;
1322 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '-', "/dev/null",
1325 8469d821 2022-06-25 stsp goto done;
1328 8469d821 2022-06-25 stsp if (id2) {
1329 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id2);
1331 8469d821 2022-06-25 stsp goto done;
1332 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '+', idstr, outfile);
1334 8469d821 2022-06-25 stsp goto done;
1335 8469d821 2022-06-25 stsp free(idstr);
1336 8469d821 2022-06-25 stsp idstr = NULL;
1338 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "tree", '+', "/dev/null",
1341 8469d821 2022-06-25 stsp goto done;
1344 c7d5c43c 2022-08-04 mark err = diff_objects_as_trees(lines, nlines, f1, f2, fd1, fd2, id1, id2,
1345 c7d5c43c 2022-08-04 mark paths, label1, label2, diff_context, ignore_whitespace,
1346 1f3405c9 2023-01-17 mark force_text_diff, dsa, repo, outfile, diff_algo);
1348 8469d821 2022-06-25 stsp free(idstr);
1349 8469d821 2022-06-25 stsp return err;
1352 8469d821 2022-06-25 stsp const struct got_error *
1353 c7d5c43c 2022-08-04 mark got_diff_objects_as_commits(struct got_diff_line **lines, size_t *nlines,
1354 f9d37699 2022-06-28 stsp FILE *f1, FILE *f2, int fd1, int fd2,
1355 f9d37699 2022-06-28 stsp struct got_object_id *id1, struct got_object_id *id2,
1356 4b752015 2022-06-30 stsp struct got_pathlist_head *paths, enum got_diff_algorithm diff_algo,
1357 64453f7e 2020-11-21 stsp int diff_context, int ignore_whitespace, int force_text_diff,
1358 1f3405c9 2023-01-17 mark struct got_diffstat_cb_arg *dsa, struct got_repository *repo, FILE *outfile)
1360 11528a82 2018-05-19 stsp const struct got_error *err;
1361 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
1362 8469d821 2022-06-25 stsp char *idstr = NULL;
1364 15a94983 2018-12-23 stsp if (id2 == NULL)
1365 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
1367 15a94983 2018-12-23 stsp if (id1) {
1368 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
1370 cd0acaa7 2018-05-20 stsp goto done;
1371 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id1);
1373 8469d821 2022-06-25 stsp goto done;
1374 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "commit", '-', idstr,
1377 8469d821 2022-06-25 stsp goto done;
1378 8469d821 2022-06-25 stsp free(idstr);
1379 8469d821 2022-06-25 stsp idstr = NULL;
1381 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "commit", '-', "/dev/null",
1384 8469d821 2022-06-25 stsp goto done;
1387 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
1389 9b697879 2018-05-20 stsp goto done;
1391 8469d821 2022-06-25 stsp err = got_object_id_str(&idstr, id2);
1393 8469d821 2022-06-25 stsp goto done;
1394 c7d5c43c 2022-08-04 mark err = show_object_id(lines, nlines, "commit", '+', idstr, outfile);
1396 8469d821 2022-06-25 stsp goto done;
1398 c7d5c43c 2022-08-04 mark err = diff_objects_as_trees(lines, nlines, f1, f2, fd1, fd2,
1399 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
1400 67b631c9 2021-10-10 stsp got_object_commit_get_tree_id(commit2), paths, "", "",
1401 1f3405c9 2023-01-17 mark diff_context, ignore_whitespace, force_text_diff, dsa, repo,
1402 1f3405c9 2023-01-17 mark outfile, diff_algo);
1404 11528a82 2018-05-19 stsp if (commit1)
1405 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
1406 11528a82 2018-05-19 stsp if (commit2)
1407 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
1408 8469d821 2022-06-25 stsp free(idstr);
1409 11528a82 2018-05-19 stsp return err;
1412 dc424a06 2019-08-07 stsp const struct got_error *
1413 fe621944 2020-11-10 stsp got_diff_files(struct got_diffreg_result **resultp,
1414 49d4a017 2022-06-30 stsp FILE *f1, int f1_exists, const char *label1, FILE *f2, int f2_exists,
1415 49d4a017 2022-06-30 stsp const char *label2, int diff_context, int ignore_whitespace,
1416 4b752015 2022-06-30 stsp int force_text_diff, FILE *outfile, enum got_diff_algorithm diff_algo)
1418 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
1419 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
1421 fe621944 2020-11-10 stsp if (resultp)
1422 fe621944 2020-11-10 stsp *resultp = NULL;
1424 dc424a06 2019-08-07 stsp if (outfile) {
1425 dc424a06 2019-08-07 stsp fprintf(outfile, "file - %s\n",
1426 49d4a017 2022-06-30 stsp f1_exists ? label1 : "/dev/null");
1427 dc424a06 2019-08-07 stsp fprintf(outfile, "file + %s\n",
1428 49d4a017 2022-06-30 stsp f2_exists ? label2 : "/dev/null");
1431 4b752015 2022-06-30 stsp err = got_diffreg(&diffreg_result, f1, f2, diff_algo,
1432 64453f7e 2020-11-21 stsp ignore_whitespace, force_text_diff);
1434 fe621944 2020-11-10 stsp goto done;
1436 fe621944 2020-11-10 stsp if (outfile) {
1437 fe621944 2020-11-10 stsp err = got_diffreg_output(NULL, NULL, diffreg_result,
1438 49d4a017 2022-06-30 stsp f1_exists, f2_exists, label1, label2,
1439 1cb46f00 2020-11-21 stsp GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
1441 dc424a06 2019-08-07 stsp goto done;
1445 fe621944 2020-11-10 stsp if (resultp && err == NULL)
1446 fe621944 2020-11-10 stsp *resultp = diffreg_result;
1447 fe621944 2020-11-10 stsp else if (diffreg_result) {
1448 fe621944 2020-11-10 stsp const struct got_error *free_err;
1450 fe621944 2020-11-10 stsp free_err = got_diffreg_result_free(diffreg_result);
1451 fe621944 2020-11-10 stsp if (free_err && err == NULL)
1452 fe621944 2020-11-10 stsp err = free_err;
1455 dc424a06 2019-08-07 stsp return err;
