2 40fa9110 2020-10-20 neels * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 40fa9110 2020-10-20 neels * Permission to use, copy, modify, and distribute this software for any
5 40fa9110 2020-10-20 neels * purpose with or without fee is hereby granted, provided that the above
6 40fa9110 2020-10-20 neels * copyright notice and this permission notice appear in all copies.
8 40fa9110 2020-10-20 neels * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 40fa9110 2020-10-20 neels * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 40fa9110 2020-10-20 neels * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 40fa9110 2020-10-20 neels * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 40fa9110 2020-10-20 neels * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 40fa9110 2020-10-20 neels * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 40fa9110 2020-10-20 neels * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 40fa9110 2020-10-20 neels #include <sys/queue.h>
18 40fa9110 2020-10-20 neels #include <sys/stat.h>
20 40fa9110 2020-10-20 neels #include <stdbool.h>
21 40fa9110 2020-10-20 neels #include <stdio.h>
22 40fa9110 2020-10-20 neels #include <stdlib.h>
23 40fa9110 2020-10-20 neels #include <string.h>
24 40fa9110 2020-10-20 neels #include <limits.h>
25 40fa9110 2020-10-20 neels #include <sha1.h>
26 40fa9110 2020-10-20 neels #include <zlib.h>
28 40fa9110 2020-10-20 neels #include "got_object.h"
29 40fa9110 2020-10-20 neels #include "got_repository.h"
30 40fa9110 2020-10-20 neels #include "got_error.h"
31 40fa9110 2020-10-20 neels #include "got_diff.h"
32 40fa9110 2020-10-20 neels #include "got_opentemp.h"
33 40fa9110 2020-10-20 neels #include "got_path.h"
34 40fa9110 2020-10-20 neels #include "got_cancel.h"
35 40fa9110 2020-10-20 neels #include "got_worktree.h"
37 40fa9110 2020-10-20 neels #include "got_lib_diff.h"
38 40fa9110 2020-10-20 neels #include "got_lib_delta.h"
39 40fa9110 2020-10-20 neels #include "got_lib_inflate.h"
40 40fa9110 2020-10-20 neels #include "got_lib_object.h"
42 40fa9110 2020-10-20 neels static const struct got_error *
43 40fa9110 2020-10-20 neels diff_blobs(struct got_diffreg_result **resultp,
44 40fa9110 2020-10-20 neels struct got_blob_object *blob1, struct got_blob_object *blob2,
45 40fa9110 2020-10-20 neels const char *label1, const char *label2, mode_t mode1, mode_t mode2,
46 40fa9110 2020-10-20 neels int diff_context, int ignore_whitespace, FILE *outfile)
48 40fa9110 2020-10-20 neels const struct got_error *err = NULL, *free_err;
49 40fa9110 2020-10-20 neels FILE *f1 = NULL, *f2 = NULL;
50 40fa9110 2020-10-20 neels char hex1[SHA1_DIGEST_STRING_LENGTH];
51 40fa9110 2020-10-20 neels char hex2[SHA1_DIGEST_STRING_LENGTH];
52 40fa9110 2020-10-20 neels char *idstr1 = NULL, *idstr2 = NULL;
53 40fa9110 2020-10-20 neels size_t size1, size2;
54 40fa9110 2020-10-20 neels struct got_diffreg_result *result;
56 40fa9110 2020-10-20 neels if (resultp)
57 40fa9110 2020-10-20 neels *resultp = NULL;
59 40fa9110 2020-10-20 neels if (blob1) {
60 40fa9110 2020-10-20 neels f1 = got_opentemp();
61 40fa9110 2020-10-20 neels if (f1 == NULL)
62 40fa9110 2020-10-20 neels return got_error_from_errno("got_opentemp");
65 40fa9110 2020-10-20 neels if (blob2) {
66 40fa9110 2020-10-20 neels f2 = got_opentemp();
67 40fa9110 2020-10-20 neels if (f2 == NULL) {
68 40fa9110 2020-10-20 neels err = got_error_from_errno("got_opentemp");
69 40fa9110 2020-10-20 neels fclose(f1);
70 40fa9110 2020-10-20 neels return err;
75 40fa9110 2020-10-20 neels if (blob1) {
76 40fa9110 2020-10-20 neels idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
77 40fa9110 2020-10-20 neels err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
82 40fa9110 2020-10-20 neels idstr1 = "/dev/null";
85 40fa9110 2020-10-20 neels if (blob2) {
86 40fa9110 2020-10-20 neels idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
87 40fa9110 2020-10-20 neels err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
92 40fa9110 2020-10-20 neels idstr2 = "/dev/null";
94 40fa9110 2020-10-20 neels if (outfile) {
95 40fa9110 2020-10-20 neels char *modestr1 = NULL, *modestr2 = NULL;
96 40fa9110 2020-10-20 neels int modebits;
97 40fa9110 2020-10-20 neels if (mode1 && mode1 != mode2) {
98 40fa9110 2020-10-20 neels if (S_ISLNK(mode1))
99 40fa9110 2020-10-20 neels modebits = S_IFLNK;
101 40fa9110 2020-10-20 neels modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
102 40fa9110 2020-10-20 neels if (asprintf(&modestr1, " (mode %o)",
103 40fa9110 2020-10-20 neels mode1 & modebits) == -1) {
104 40fa9110 2020-10-20 neels err = got_error_from_errno("asprintf");
105 40fa9110 2020-10-20 neels goto done;
108 40fa9110 2020-10-20 neels if (mode2 && mode1 != mode2) {
109 40fa9110 2020-10-20 neels if (S_ISLNK(mode2))
110 40fa9110 2020-10-20 neels modebits = S_IFLNK;
112 40fa9110 2020-10-20 neels modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
113 40fa9110 2020-10-20 neels if (asprintf(&modestr2, " (mode %o)",
114 40fa9110 2020-10-20 neels mode2 & modebits) == -1) {
115 40fa9110 2020-10-20 neels err = got_error_from_errno("asprintf");
116 40fa9110 2020-10-20 neels goto done;
119 40fa9110 2020-10-20 neels fprintf(outfile, "blob - %s%s\n", idstr1,
120 40fa9110 2020-10-20 neels modestr1 ? modestr1 : "");
121 40fa9110 2020-10-20 neels fprintf(outfile, "blob + %s%s\n", idstr2,
122 40fa9110 2020-10-20 neels modestr2 ? modestr2 : "");
123 40fa9110 2020-10-20 neels free(modestr1);
124 40fa9110 2020-10-20 neels free(modestr2);
126 40fa9110 2020-10-20 neels err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_MYERS,
127 40fa9110 2020-10-20 neels ignore_whitespace);
129 40fa9110 2020-10-20 neels goto done;
131 40fa9110 2020-10-20 neels if (outfile) {
132 40fa9110 2020-10-20 neels err = got_diffreg_output(NULL, NULL, result, f1, f2,
133 40fa9110 2020-10-20 neels label1 ? label1 : idstr1,
134 40fa9110 2020-10-20 neels label2 ? label2 : idstr2,
135 40fa9110 2020-10-20 neels GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
137 40fa9110 2020-10-20 neels goto done;
140 40fa9110 2020-10-20 neels if (resultp && err == NULL)
141 40fa9110 2020-10-20 neels *resultp = result;
143 40fa9110 2020-10-20 neels free_err = got_diffreg_result_free(result);
144 40fa9110 2020-10-20 neels if (free_err && err == NULL)
145 40fa9110 2020-10-20 neels err = free_err;
148 40fa9110 2020-10-20 neels if (f1 && fclose(f1) != 0 && err == NULL)
149 40fa9110 2020-10-20 neels err = got_error_from_errno("fclose");
150 40fa9110 2020-10-20 neels if (f2 && fclose(f2) != 0 && err == NULL)
151 40fa9110 2020-10-20 neels err = got_error_from_errno("fclose");
152 40fa9110 2020-10-20 neels return err;
155 40fa9110 2020-10-20 neels const struct got_error *
156 40fa9110 2020-10-20 neels got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
157 40fa9110 2020-10-20 neels struct got_blob_object *blob2, struct got_object_id *id1,
158 40fa9110 2020-10-20 neels struct got_object_id *id2, const char *label1, const char *label2,
159 40fa9110 2020-10-20 neels mode_t mode1, mode_t mode2, struct got_repository *repo)
161 40fa9110 2020-10-20 neels const struct got_error *err;
162 40fa9110 2020-10-20 neels struct got_diff_blob_output_unidiff_arg *a = arg;
164 40fa9110 2020-10-20 neels err = diff_blobs(NULL, blob1, blob2, label1, label2, mode1, mode2,
165 40fa9110 2020-10-20 neels a->diff_context, a->ignore_whitespace, a->outfile);
166 40fa9110 2020-10-20 neels return err;
169 40fa9110 2020-10-20 neels const struct got_error *
170 40fa9110 2020-10-20 neels got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
171 40fa9110 2020-10-20 neels const char *label1, const char *label2, int diff_context,
172 40fa9110 2020-10-20 neels int ignore_whitespace, FILE *outfile)
174 40fa9110 2020-10-20 neels return diff_blobs(NULL, blob1, blob2, label1, label2, 0, 0, diff_context,
175 40fa9110 2020-10-20 neels ignore_whitespace, outfile);
178 40fa9110 2020-10-20 neels static const struct got_error *
179 40fa9110 2020-10-20 neels diff_blob_file(struct got_diffreg_result **resultp,
180 40fa9110 2020-10-20 neels struct got_blob_object *blob1, const char *label1, FILE *f2, size_t size2,
181 40fa9110 2020-10-20 neels const char *label2, int diff_context, int ignore_whitespace, FILE *outfile)
183 40fa9110 2020-10-20 neels const struct got_error *err = NULL, *free_err;
184 40fa9110 2020-10-20 neels FILE *f1 = NULL;
185 40fa9110 2020-10-20 neels char hex1[SHA1_DIGEST_STRING_LENGTH];
186 40fa9110 2020-10-20 neels char *idstr1 = NULL;
187 40fa9110 2020-10-20 neels size_t size1;
188 40fa9110 2020-10-20 neels struct got_diffreg_result *result = NULL;
190 40fa9110 2020-10-20 neels if (resultp)
191 40fa9110 2020-10-20 neels *resultp = NULL;
193 40fa9110 2020-10-20 neels size1 = 0;
194 40fa9110 2020-10-20 neels if (blob1) {
195 40fa9110 2020-10-20 neels f1 = got_opentemp();
196 40fa9110 2020-10-20 neels if (f1 == NULL)
197 40fa9110 2020-10-20 neels return got_error_from_errno("got_opentemp");
198 40fa9110 2020-10-20 neels idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
199 40fa9110 2020-10-20 neels err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
202 40fa9110 2020-10-20 neels goto done;
204 40fa9110 2020-10-20 neels idstr1 = "/dev/null";
207 40fa9110 2020-10-20 neels if (outfile) {
208 40fa9110 2020-10-20 neels fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
209 40fa9110 2020-10-20 neels fprintf(outfile, "file + %s\n",
210 40fa9110 2020-10-20 neels f2 == NULL ? "/dev/null" : label2);
213 40fa9110 2020-10-20 neels err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_MYERS,
214 40fa9110 2020-10-20 neels ignore_whitespace);
216 40fa9110 2020-10-20 neels goto done;
218 40fa9110 2020-10-20 neels if (outfile) {
219 40fa9110 2020-10-20 neels err = got_diffreg_output(NULL, NULL, result, f1, f2,
220 40fa9110 2020-10-20 neels label2, label2, GOT_DIFF_OUTPUT_UNIDIFF, diff_context,
223 40fa9110 2020-10-20 neels goto done;
226 40fa9110 2020-10-20 neels if (resultp && err == NULL)
227 40fa9110 2020-10-20 neels *resultp = result;
228 40fa9110 2020-10-20 neels else if (result) {
229 40fa9110 2020-10-20 neels free_err = got_diffreg_result_free(result);
230 40fa9110 2020-10-20 neels if (free_err && err == NULL)
231 40fa9110 2020-10-20 neels err = free_err;
234 40fa9110 2020-10-20 neels if (f1 && fclose(f1) != 0 && err == NULL)
235 40fa9110 2020-10-20 neels err = got_error_from_errno("fclose");
236 40fa9110 2020-10-20 neels return err;
239 40fa9110 2020-10-20 neels const struct got_error *
240 40fa9110 2020-10-20 neels got_diff_blob_file(struct got_blob_object *blob1, const char *label1,
241 40fa9110 2020-10-20 neels FILE *f2, size_t size2, const char *label2, int diff_context,
242 40fa9110 2020-10-20 neels int ignore_whitespace, FILE *outfile)
244 40fa9110 2020-10-20 neels return diff_blob_file(NULL, blob1, label1, f2, size2, label2,
245 40fa9110 2020-10-20 neels diff_context, ignore_whitespace, outfile);
248 40fa9110 2020-10-20 neels const struct got_error *
249 40fa9110 2020-10-20 neels got_diff_blob_file_lines_changed(struct got_diffreg_result **result,
250 40fa9110 2020-10-20 neels struct got_blob_object *blob1, FILE *f2, size_t size2)
252 40fa9110 2020-10-20 neels return diff_blob_file(result, blob1, NULL, f2, size2, NULL,
253 40fa9110 2020-10-20 neels 0, 0, NULL);
256 40fa9110 2020-10-20 neels const struct got_error *
257 40fa9110 2020-10-20 neels got_diff_blob_lines_changed(struct got_diffreg_result **result,
258 40fa9110 2020-10-20 neels struct got_blob_object *blob1, struct got_blob_object *blob2)
260 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
262 40fa9110 2020-10-20 neels err = diff_blobs(result, blob1, blob2, NULL, NULL, 0, 0, 3, 0, NULL);
263 40fa9110 2020-10-20 neels if (err) {
264 40fa9110 2020-10-20 neels got_diffreg_result_free(*result);
265 40fa9110 2020-10-20 neels *result = NULL;
267 40fa9110 2020-10-20 neels return err;
270 40fa9110 2020-10-20 neels static const struct got_error *
271 40fa9110 2020-10-20 neels diff_added_blob(struct got_object_id *id, const char *label, mode_t mode,
272 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
274 40fa9110 2020-10-20 neels const struct got_error *err;
275 40fa9110 2020-10-20 neels struct got_blob_object *blob = NULL;
276 40fa9110 2020-10-20 neels struct got_object *obj = NULL;
278 40fa9110 2020-10-20 neels err = got_object_open(&obj, repo, id);
280 40fa9110 2020-10-20 neels return err;
282 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob, repo, obj, 8192);
284 40fa9110 2020-10-20 neels goto done;
285 40fa9110 2020-10-20 neels err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, 0, mode, repo);
287 40fa9110 2020-10-20 neels got_object_close(obj);
289 40fa9110 2020-10-20 neels got_object_blob_close(blob);
290 40fa9110 2020-10-20 neels return err;
293 40fa9110 2020-10-20 neels static const struct got_error *
294 40fa9110 2020-10-20 neels diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
295 40fa9110 2020-10-20 neels const char *label1, const char *label2, mode_t mode1, mode_t mode2,
296 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
298 40fa9110 2020-10-20 neels const struct got_error *err;
299 40fa9110 2020-10-20 neels struct got_object *obj1 = NULL;
300 40fa9110 2020-10-20 neels struct got_object *obj2 = NULL;
301 40fa9110 2020-10-20 neels struct got_blob_object *blob1 = NULL;
302 40fa9110 2020-10-20 neels struct got_blob_object *blob2 = NULL;
304 40fa9110 2020-10-20 neels err = got_object_open(&obj1, repo, id1);
306 40fa9110 2020-10-20 neels return err;
307 40fa9110 2020-10-20 neels if (obj1->type != GOT_OBJ_TYPE_BLOB) {
308 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
309 40fa9110 2020-10-20 neels goto done;
312 40fa9110 2020-10-20 neels err = got_object_open(&obj2, repo, id2);
314 40fa9110 2020-10-20 neels goto done;
315 40fa9110 2020-10-20 neels if (obj2->type != GOT_OBJ_TYPE_BLOB) {
316 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_BAD_OBJ_DATA);
317 40fa9110 2020-10-20 neels goto done;
320 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob1, repo, obj1, 8192);
322 40fa9110 2020-10-20 neels goto done;
324 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob2, repo, obj2, 8192);
326 40fa9110 2020-10-20 neels goto done;
328 40fa9110 2020-10-20 neels err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, mode1, mode2,
332 40fa9110 2020-10-20 neels got_object_close(obj1);
334 40fa9110 2020-10-20 neels got_object_close(obj2);
335 40fa9110 2020-10-20 neels if (blob1)
336 40fa9110 2020-10-20 neels got_object_blob_close(blob1);
337 40fa9110 2020-10-20 neels if (blob2)
338 40fa9110 2020-10-20 neels got_object_blob_close(blob2);
339 40fa9110 2020-10-20 neels return err;
342 40fa9110 2020-10-20 neels static const struct got_error *
343 40fa9110 2020-10-20 neels diff_deleted_blob(struct got_object_id *id, const char *label, mode_t mode,
344 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
346 40fa9110 2020-10-20 neels const struct got_error *err;
347 40fa9110 2020-10-20 neels struct got_blob_object *blob = NULL;
348 40fa9110 2020-10-20 neels struct got_object *obj = NULL;
350 40fa9110 2020-10-20 neels err = got_object_open(&obj, repo, id);
352 40fa9110 2020-10-20 neels return err;
354 40fa9110 2020-10-20 neels err = got_object_blob_open(&blob, repo, obj, 8192);
356 40fa9110 2020-10-20 neels goto done;
357 40fa9110 2020-10-20 neels err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, mode, 0, repo);
359 40fa9110 2020-10-20 neels got_object_close(obj);
361 40fa9110 2020-10-20 neels got_object_blob_close(blob);
362 40fa9110 2020-10-20 neels return err;
365 40fa9110 2020-10-20 neels static const struct got_error *
366 40fa9110 2020-10-20 neels diff_added_tree(struct got_object_id *id, const char *label,
367 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
368 40fa9110 2020-10-20 neels int diff_content)
370 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
371 40fa9110 2020-10-20 neels struct got_object *treeobj = NULL;
372 40fa9110 2020-10-20 neels struct got_tree_object *tree = NULL;
374 40fa9110 2020-10-20 neels err = got_object_open(&treeobj, repo, id);
376 40fa9110 2020-10-20 neels goto done;
378 40fa9110 2020-10-20 neels if (treeobj->type != GOT_OBJ_TYPE_TREE) {
379 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
380 40fa9110 2020-10-20 neels goto done;
383 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree, repo, treeobj);
385 40fa9110 2020-10-20 neels goto done;
387 40fa9110 2020-10-20 neels err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg,
388 40fa9110 2020-10-20 neels diff_content);
391 40fa9110 2020-10-20 neels got_object_tree_close(tree);
392 40fa9110 2020-10-20 neels if (treeobj)
393 40fa9110 2020-10-20 neels got_object_close(treeobj);
394 40fa9110 2020-10-20 neels return err;
397 40fa9110 2020-10-20 neels static const struct got_error *
398 40fa9110 2020-10-20 neels diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
399 40fa9110 2020-10-20 neels const char *label1, const char *label2, struct got_repository *repo,
400 40fa9110 2020-10-20 neels got_diff_blob_cb cb, void *cb_arg, int diff_content)
402 40fa9110 2020-10-20 neels const struct got_error *err;
403 40fa9110 2020-10-20 neels struct got_object *treeobj1 = NULL;
404 40fa9110 2020-10-20 neels struct got_object *treeobj2 = NULL;
405 40fa9110 2020-10-20 neels struct got_tree_object *tree1 = NULL;
406 40fa9110 2020-10-20 neels struct got_tree_object *tree2 = NULL;
408 40fa9110 2020-10-20 neels err = got_object_open(&treeobj1, repo, id1);
410 40fa9110 2020-10-20 neels goto done;
412 40fa9110 2020-10-20 neels if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
413 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
414 40fa9110 2020-10-20 neels goto done;
417 40fa9110 2020-10-20 neels err = got_object_open(&treeobj2, repo, id2);
419 40fa9110 2020-10-20 neels goto done;
421 40fa9110 2020-10-20 neels if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
422 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
423 40fa9110 2020-10-20 neels goto done;
426 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree1, repo, treeobj1);
428 40fa9110 2020-10-20 neels goto done;
430 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree2, repo, treeobj2);
432 40fa9110 2020-10-20 neels goto done;
434 40fa9110 2020-10-20 neels err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg,
435 40fa9110 2020-10-20 neels diff_content);
438 40fa9110 2020-10-20 neels if (tree1)
439 40fa9110 2020-10-20 neels got_object_tree_close(tree1);
440 40fa9110 2020-10-20 neels if (tree2)
441 40fa9110 2020-10-20 neels got_object_tree_close(tree2);
442 40fa9110 2020-10-20 neels if (treeobj1)
443 40fa9110 2020-10-20 neels got_object_close(treeobj1);
444 40fa9110 2020-10-20 neels if (treeobj2)
445 40fa9110 2020-10-20 neels got_object_close(treeobj2);
446 40fa9110 2020-10-20 neels return err;
449 40fa9110 2020-10-20 neels static const struct got_error *
450 40fa9110 2020-10-20 neels diff_deleted_tree(struct got_object_id *id, const char *label,
451 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
452 40fa9110 2020-10-20 neels int diff_content)
454 40fa9110 2020-10-20 neels const struct got_error *err;
455 40fa9110 2020-10-20 neels struct got_object *treeobj = NULL;
456 40fa9110 2020-10-20 neels struct got_tree_object *tree = NULL;
458 40fa9110 2020-10-20 neels err = got_object_open(&treeobj, repo, id);
460 40fa9110 2020-10-20 neels goto done;
462 40fa9110 2020-10-20 neels if (treeobj->type != GOT_OBJ_TYPE_TREE) {
463 40fa9110 2020-10-20 neels err = got_error(GOT_ERR_OBJ_TYPE);
464 40fa9110 2020-10-20 neels goto done;
467 40fa9110 2020-10-20 neels err = got_object_tree_open(&tree, repo, treeobj);
469 40fa9110 2020-10-20 neels goto done;
471 40fa9110 2020-10-20 neels err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg,
472 40fa9110 2020-10-20 neels diff_content);
475 40fa9110 2020-10-20 neels got_object_tree_close(tree);
476 40fa9110 2020-10-20 neels if (treeobj)
477 40fa9110 2020-10-20 neels got_object_close(treeobj);
478 40fa9110 2020-10-20 neels return err;
481 40fa9110 2020-10-20 neels static const struct got_error *
482 40fa9110 2020-10-20 neels diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
483 40fa9110 2020-10-20 neels const char *label1, const char *label2, struct got_repository *repo,
484 40fa9110 2020-10-20 neels got_diff_blob_cb cb, void *cb_arg)
486 40fa9110 2020-10-20 neels /* XXX TODO */
487 40fa9110 2020-10-20 neels return NULL;
490 40fa9110 2020-10-20 neels static const struct got_error *
491 40fa9110 2020-10-20 neels diff_entry_old_new(struct got_tree_entry *te1,
492 40fa9110 2020-10-20 neels struct got_tree_entry *te2, const char *label1, const char *label2,
493 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
494 40fa9110 2020-10-20 neels int diff_content)
496 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
497 40fa9110 2020-10-20 neels int id_match;
499 40fa9110 2020-10-20 neels if (got_object_tree_entry_is_submodule(te1))
500 40fa9110 2020-10-20 neels return NULL;
502 40fa9110 2020-10-20 neels if (te2 == NULL) {
503 40fa9110 2020-10-20 neels if (S_ISDIR(te1->mode))
504 40fa9110 2020-10-20 neels err = diff_deleted_tree(&te1->id, label1, repo,
505 40fa9110 2020-10-20 neels cb, cb_arg, diff_content);
507 40fa9110 2020-10-20 neels if (diff_content)
508 40fa9110 2020-10-20 neels err = diff_deleted_blob(&te1->id, label1,
509 40fa9110 2020-10-20 neels te1->mode, repo, cb, cb_arg);
511 40fa9110 2020-10-20 neels err = cb(cb_arg, NULL, NULL, &te1->id, NULL,
512 40fa9110 2020-10-20 neels label1, NULL, te1->mode, 0, repo);
514 40fa9110 2020-10-20 neels return err;
515 40fa9110 2020-10-20 neels } else if (got_object_tree_entry_is_submodule(te2))
516 40fa9110 2020-10-20 neels return NULL;
518 40fa9110 2020-10-20 neels id_match = (got_object_id_cmp(&te1->id, &te2->id) == 0);
519 40fa9110 2020-10-20 neels if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
520 40fa9110 2020-10-20 neels if (!id_match)
521 40fa9110 2020-10-20 neels return diff_modified_tree(&te1->id, &te2->id,
522 40fa9110 2020-10-20 neels label1, label2, repo, cb, cb_arg, diff_content);
523 40fa9110 2020-10-20 neels } else if ((S_ISREG(te1->mode) || S_ISLNK(te1->mode)) &&
524 40fa9110 2020-10-20 neels (S_ISREG(te2->mode) || S_ISLNK(te2->mode))) {
525 40fa9110 2020-10-20 neels if (!id_match ||
526 40fa9110 2020-10-20 neels ((te1->mode & (S_IFLNK | S_IXUSR))) !=
527 40fa9110 2020-10-20 neels (te2->mode & (S_IFLNK | S_IXUSR))) {
528 40fa9110 2020-10-20 neels if (diff_content)
529 40fa9110 2020-10-20 neels return diff_modified_blob(&te1->id, &te2->id,
530 40fa9110 2020-10-20 neels label1, label2, te1->mode, te2->mode,
531 40fa9110 2020-10-20 neels repo, cb, cb_arg);
533 40fa9110 2020-10-20 neels return cb(cb_arg, NULL, NULL, &te1->id,
534 40fa9110 2020-10-20 neels &te2->id, label1, label2, te1->mode,
535 40fa9110 2020-10-20 neels te2->mode, repo);
539 40fa9110 2020-10-20 neels if (id_match)
540 40fa9110 2020-10-20 neels return NULL;
542 40fa9110 2020-10-20 neels return diff_kind_mismatch(&te1->id, &te2->id, label1, label2, repo,
543 40fa9110 2020-10-20 neels cb, cb_arg);
546 40fa9110 2020-10-20 neels static const struct got_error *
547 40fa9110 2020-10-20 neels diff_entry_new_old(struct got_tree_entry *te2,
548 40fa9110 2020-10-20 neels struct got_tree_entry *te1, const char *label2,
549 40fa9110 2020-10-20 neels struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
550 40fa9110 2020-10-20 neels int diff_content)
552 40fa9110 2020-10-20 neels if (te1 != NULL) /* handled by diff_entry_old_new() */
553 40fa9110 2020-10-20 neels return NULL;
555 40fa9110 2020-10-20 neels if (got_object_tree_entry_is_submodule(te2))
556 40fa9110 2020-10-20 neels return NULL;
558 40fa9110 2020-10-20 neels if (S_ISDIR(te2->mode))
559 40fa9110 2020-10-20 neels return diff_added_tree(&te2->id, label2, repo, cb, cb_arg,
560 40fa9110 2020-10-20 neels diff_content);
562 40fa9110 2020-10-20 neels if (diff_content)
563 40fa9110 2020-10-20 neels return diff_added_blob(&te2->id, label2, te2->mode, repo, cb,
566 40fa9110 2020-10-20 neels return cb(cb_arg, NULL, NULL, NULL, &te2->id, NULL, label2, 0,
567 40fa9110 2020-10-20 neels te2->mode, repo);
570 40fa9110 2020-10-20 neels const struct got_error *
571 40fa9110 2020-10-20 neels got_diff_tree_collect_changed_paths(void *arg, struct got_blob_object *blob1,
572 40fa9110 2020-10-20 neels struct got_blob_object *blob2, struct got_object_id *id1,
573 40fa9110 2020-10-20 neels struct got_object_id *id2, const char *label1, const char *label2,
574 40fa9110 2020-10-20 neels mode_t mode1, mode_t mode2, struct got_repository *repo)
576 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
577 40fa9110 2020-10-20 neels struct got_pathlist_head *paths = arg;
578 40fa9110 2020-10-20 neels struct got_diff_changed_path *change = NULL;
579 40fa9110 2020-10-20 neels char *path = NULL;
581 40fa9110 2020-10-20 neels path = strdup(label2 ? label2 : label1);
582 40fa9110 2020-10-20 neels if (path == NULL)
583 40fa9110 2020-10-20 neels return got_error_from_errno("malloc");
585 40fa9110 2020-10-20 neels change = malloc(sizeof(*change));
586 40fa9110 2020-10-20 neels if (change == NULL) {
587 40fa9110 2020-10-20 neels err = got_error_from_errno("malloc");
588 40fa9110 2020-10-20 neels goto done;
591 40fa9110 2020-10-20 neels change->status = GOT_STATUS_NO_CHANGE;
592 40fa9110 2020-10-20 neels if (id1 == NULL)
593 40fa9110 2020-10-20 neels change->status = GOT_STATUS_ADD;
594 40fa9110 2020-10-20 neels else if (id2 == NULL)
595 40fa9110 2020-10-20 neels change->status = GOT_STATUS_DELETE;
597 40fa9110 2020-10-20 neels if (got_object_id_cmp(id1, id2) != 0)
598 40fa9110 2020-10-20 neels change->status = GOT_STATUS_MODIFY;
599 40fa9110 2020-10-20 neels else if (mode1 != mode2)
600 40fa9110 2020-10-20 neels change->status = GOT_STATUS_MODE_CHANGE;
603 40fa9110 2020-10-20 neels err = got_pathlist_insert(NULL, paths, path, change);
605 40fa9110 2020-10-20 neels if (err) {
606 40fa9110 2020-10-20 neels free(path);
607 40fa9110 2020-10-20 neels free(change);
609 40fa9110 2020-10-20 neels return err;
612 40fa9110 2020-10-20 neels const struct got_error *
613 40fa9110 2020-10-20 neels got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
614 40fa9110 2020-10-20 neels const char *label1, const char *label2, struct got_repository *repo,
615 40fa9110 2020-10-20 neels got_diff_blob_cb cb, void *cb_arg, int diff_content)
617 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
618 40fa9110 2020-10-20 neels struct got_tree_entry *te1 = NULL;
619 40fa9110 2020-10-20 neels struct got_tree_entry *te2 = NULL;
620 40fa9110 2020-10-20 neels char *l1 = NULL, *l2 = NULL;
621 40fa9110 2020-10-20 neels int tidx1 = 0, tidx2 = 0;
623 40fa9110 2020-10-20 neels if (tree1) {
624 40fa9110 2020-10-20 neels te1 = got_object_tree_get_entry(tree1, 0);
625 40fa9110 2020-10-20 neels if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
626 40fa9110 2020-10-20 neels te1->name) == -1)
627 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
629 40fa9110 2020-10-20 neels if (tree2) {
630 40fa9110 2020-10-20 neels te2 = got_object_tree_get_entry(tree2, 0);
631 40fa9110 2020-10-20 neels if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
632 40fa9110 2020-10-20 neels te2->name) == -1)
633 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
637 40fa9110 2020-10-20 neels if (te1) {
638 40fa9110 2020-10-20 neels struct got_tree_entry *te = NULL;
639 40fa9110 2020-10-20 neels if (tree2)
640 40fa9110 2020-10-20 neels te = got_object_tree_find_entry(tree2,
641 40fa9110 2020-10-20 neels te1->name);
644 40fa9110 2020-10-20 neels l2 = NULL;
645 40fa9110 2020-10-20 neels if (te && asprintf(&l2, "%s%s%s", label2,
646 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te->name) == -1)
648 40fa9110 2020-10-20 neels got_error_from_errno("asprintf");
650 40fa9110 2020-10-20 neels err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
651 40fa9110 2020-10-20 neels cb_arg, diff_content);
656 40fa9110 2020-10-20 neels if (te2) {
657 40fa9110 2020-10-20 neels struct got_tree_entry *te = NULL;
658 40fa9110 2020-10-20 neels if (tree1)
659 40fa9110 2020-10-20 neels te = got_object_tree_find_entry(tree1,
660 40fa9110 2020-10-20 neels te2->name);
663 40fa9110 2020-10-20 neels if (asprintf(&l2, "%s%s%s", label2,
664 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te->name) == -1)
666 40fa9110 2020-10-20 neels got_error_from_errno("asprintf");
668 40fa9110 2020-10-20 neels if (asprintf(&l2, "%s%s%s", label2,
669 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te2->name) == -1)
671 40fa9110 2020-10-20 neels got_error_from_errno("asprintf");
673 40fa9110 2020-10-20 neels err = diff_entry_new_old(te2, te, l2, repo,
674 40fa9110 2020-10-20 neels cb, cb_arg, diff_content);
680 40fa9110 2020-10-20 neels l1 = NULL;
681 40fa9110 2020-10-20 neels if (te1) {
683 40fa9110 2020-10-20 neels te1 = got_object_tree_get_entry(tree1, tidx1);
684 40fa9110 2020-10-20 neels if (te1 &&
685 40fa9110 2020-10-20 neels asprintf(&l1, "%s%s%s", label1,
686 40fa9110 2020-10-20 neels label1[0] ? "/" : "", te1->name) == -1)
687 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
690 40fa9110 2020-10-20 neels l2 = NULL;
691 40fa9110 2020-10-20 neels if (te2) {
693 40fa9110 2020-10-20 neels te2 = got_object_tree_get_entry(tree2, tidx2);
694 40fa9110 2020-10-20 neels if (te2 &&
695 40fa9110 2020-10-20 neels asprintf(&l2, "%s%s%s", label2,
696 40fa9110 2020-10-20 neels label2[0] ? "/" : "", te2->name) == -1)
697 40fa9110 2020-10-20 neels return got_error_from_errno("asprintf");
699 40fa9110 2020-10-20 neels } while (te1 || te2);
701 40fa9110 2020-10-20 neels return err;
704 40fa9110 2020-10-20 neels const struct got_error *
705 40fa9110 2020-10-20 neels got_diff_objects_as_blobs(struct got_object_id *id1, struct got_object_id *id2,
706 40fa9110 2020-10-20 neels const char *label1, const char *label2, int diff_context,
707 40fa9110 2020-10-20 neels int ignore_whitespace, struct got_repository *repo, FILE *outfile)
709 40fa9110 2020-10-20 neels const struct got_error *err;
710 40fa9110 2020-10-20 neels struct got_blob_object *blob1 = NULL, *blob2 = NULL;
712 40fa9110 2020-10-20 neels if (id1 == NULL && id2 == NULL)
713 40fa9110 2020-10-20 neels return got_error(GOT_ERR_NO_OBJ);
715 40fa9110 2020-10-20 neels if (id1) {
716 40fa9110 2020-10-20 neels err = got_object_open_as_blob(&blob1, repo, id1, 8192);
718 40fa9110 2020-10-20 neels goto done;
720 40fa9110 2020-10-20 neels if (id2) {
721 40fa9110 2020-10-20 neels err = got_object_open_as_blob(&blob2, repo, id2, 8192);
723 40fa9110 2020-10-20 neels goto done;
725 40fa9110 2020-10-20 neels err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
726 40fa9110 2020-10-20 neels ignore_whitespace, outfile);
728 40fa9110 2020-10-20 neels if (blob1)
729 40fa9110 2020-10-20 neels got_object_blob_close(blob1);
730 40fa9110 2020-10-20 neels if (blob2)
731 40fa9110 2020-10-20 neels got_object_blob_close(blob2);
732 40fa9110 2020-10-20 neels return err;
735 40fa9110 2020-10-20 neels const struct got_error *
736 40fa9110 2020-10-20 neels got_diff_objects_as_trees(struct got_object_id *id1, struct got_object_id *id2,
737 40fa9110 2020-10-20 neels char *label1, char *label2, int diff_context, int ignore_whitespace,
738 40fa9110 2020-10-20 neels struct got_repository *repo, FILE *outfile)
740 40fa9110 2020-10-20 neels const struct got_error *err;
741 40fa9110 2020-10-20 neels struct got_tree_object *tree1 = NULL, *tree2 = NULL;
742 40fa9110 2020-10-20 neels struct got_diff_blob_output_unidiff_arg arg;
744 40fa9110 2020-10-20 neels if (id1 == NULL && id2 == NULL)
745 40fa9110 2020-10-20 neels return got_error(GOT_ERR_NO_OBJ);
747 40fa9110 2020-10-20 neels if (id1) {
748 40fa9110 2020-10-20 neels err = got_object_open_as_tree(&tree1, repo, id1);
750 40fa9110 2020-10-20 neels goto done;
752 40fa9110 2020-10-20 neels if (id2) {
753 40fa9110 2020-10-20 neels err = got_object_open_as_tree(&tree2, repo, id2);
755 40fa9110 2020-10-20 neels goto done;
757 40fa9110 2020-10-20 neels arg.diff_context = diff_context;
758 40fa9110 2020-10-20 neels arg.ignore_whitespace = ignore_whitespace;
759 40fa9110 2020-10-20 neels arg.outfile = outfile;
760 40fa9110 2020-10-20 neels err = got_diff_tree(tree1, tree2, label1, label2, repo,
761 40fa9110 2020-10-20 neels got_diff_blob_output_unidiff, &arg, 1);
763 40fa9110 2020-10-20 neels if (tree1)
764 40fa9110 2020-10-20 neels got_object_tree_close(tree1);
765 40fa9110 2020-10-20 neels if (tree2)
766 40fa9110 2020-10-20 neels got_object_tree_close(tree2);
767 40fa9110 2020-10-20 neels return err;
770 40fa9110 2020-10-20 neels const struct got_error *
771 40fa9110 2020-10-20 neels got_diff_objects_as_commits(struct got_object_id *id1,
772 40fa9110 2020-10-20 neels struct got_object_id *id2, int diff_context, int ignore_whitespace,
773 40fa9110 2020-10-20 neels struct got_repository *repo, FILE *outfile)
775 40fa9110 2020-10-20 neels const struct got_error *err;
776 40fa9110 2020-10-20 neels struct got_commit_object *commit1 = NULL, *commit2 = NULL;
778 40fa9110 2020-10-20 neels if (id2 == NULL)
779 40fa9110 2020-10-20 neels return got_error(GOT_ERR_NO_OBJ);
781 40fa9110 2020-10-20 neels if (id1) {
782 40fa9110 2020-10-20 neels err = got_object_open_as_commit(&commit1, repo, id1);
784 40fa9110 2020-10-20 neels goto done;
787 40fa9110 2020-10-20 neels err = got_object_open_as_commit(&commit2, repo, id2);
789 40fa9110 2020-10-20 neels goto done;
791 40fa9110 2020-10-20 neels err = got_diff_objects_as_trees(
792 40fa9110 2020-10-20 neels commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
793 40fa9110 2020-10-20 neels got_object_commit_get_tree_id(commit2), "", "", diff_context,
794 40fa9110 2020-10-20 neels ignore_whitespace, repo, outfile);
796 40fa9110 2020-10-20 neels if (commit1)
797 40fa9110 2020-10-20 neels got_object_commit_close(commit1);
798 40fa9110 2020-10-20 neels if (commit2)
799 40fa9110 2020-10-20 neels got_object_commit_close(commit2);
800 40fa9110 2020-10-20 neels return err;
803 40fa9110 2020-10-20 neels const struct got_error *
804 40fa9110 2020-10-20 neels got_diff_files(struct got_diffreg_result **resultp,
805 40fa9110 2020-10-20 neels FILE *f1, const char *label1, FILE *f2, const char *label2,
806 40fa9110 2020-10-20 neels int diff_context, int ignore_whitespace, FILE *outfile)
808 40fa9110 2020-10-20 neels const struct got_error *err = NULL;
809 40fa9110 2020-10-20 neels struct got_diffreg_result *diffreg_result = NULL;
811 40fa9110 2020-10-20 neels if (resultp)
812 40fa9110 2020-10-20 neels *resultp = NULL;
814 40fa9110 2020-10-20 neels if (outfile) {
815 40fa9110 2020-10-20 neels fprintf(outfile, "file - %s\n",
816 40fa9110 2020-10-20 neels f1 == NULL ? "/dev/null" : label1);
817 40fa9110 2020-10-20 neels fprintf(outfile, "file + %s\n",
818 40fa9110 2020-10-20 neels f2 == NULL ? "/dev/null" : label2);
821 40fa9110 2020-10-20 neels err = got_diffreg(&diffreg_result, f1, f2, GOT_DIFF_ALGORITHM_MYERS,
822 40fa9110 2020-10-20 neels ignore_whitespace);
824 40fa9110 2020-10-20 neels goto done;
826 40fa9110 2020-10-20 neels if (outfile) {
827 40fa9110 2020-10-20 neels err = got_diffreg_output(NULL, NULL, diffreg_result,
828 40fa9110 2020-10-20 neels f1, f2, label1, label2, GOT_DIFF_OUTPUT_UNIDIFF,
829 40fa9110 2020-10-20 neels diff_context, outfile);
831 40fa9110 2020-10-20 neels goto done;
835 40fa9110 2020-10-20 neels if (resultp && err == NULL)
836 40fa9110 2020-10-20 neels *resultp = diffreg_result;
837 40fa9110 2020-10-20 neels else if (diffreg_result) {
838 40fa9110 2020-10-20 neels const struct got_error *free_err;
839 40fa9110 2020-10-20 neels free_err = got_diffreg_result_free(diffreg_result);
840 40fa9110 2020-10-20 neels if (free_err && err == NULL)
841 40fa9110 2020-10-20 neels err = free_err;
844 40fa9110 2020-10-20 neels return err;