2 * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 #include <sys/queue.h>
27 #include "got_object.h"
28 #include "got_repository.h"
29 #include "got_error.h"
31 #include "got_opentemp.h"
34 #include "got_lib_diff.h"
35 #include "got_lib_delta.h"
36 #include "got_lib_inflate.h"
37 #include "got_lib_object.h"
39 static const struct got_error *
40 diff_blobs(struct got_blob_object *blob1, struct got_blob_object *blob2,
41 const char *label1, const char *label2, int diff_context, FILE *outfile,
42 struct got_diff_changes *changes)
44 struct got_diff_state ds;
45 struct got_diff_args args;
46 const struct got_error *err = NULL;
47 FILE *f1 = NULL, *f2 = NULL;
48 char hex1[SHA1_DIGEST_STRING_LENGTH];
49 char hex2[SHA1_DIGEST_STRING_LENGTH];
50 char *idstr1 = NULL, *idstr2 = NULL;
57 return got_error_from_errno("got_opentemp");
64 err = got_error_from_errno("got_opentemp");
73 idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
74 err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
83 idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
84 err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
91 memset(&ds, 0, sizeof(ds));
92 /* XXX should stat buffers be passed in args instead of ds? */
93 ds.stb1.st_mode = S_IFREG;
95 ds.stb1.st_size = size1;
96 ds.stb1.st_mtime = 0; /* XXX */
98 ds.stb2.st_mode = S_IFREG;
100 ds.stb2.st_size = size2;
101 ds.stb2.st_mtime = 0; /* XXX */
103 memset(&args, 0, sizeof(args));
104 args.diff_format = D_UNIFIED;
105 args.label[0] = label1 ? label1 : idstr1;
106 args.label[1] = label2 ? label2 : idstr2;
107 args.diff_context = diff_context;
108 flags |= D_PROTOTYPE;
111 fprintf(outfile, "blob - %s\n", idstr1);
112 fprintf(outfile, "blob + %s\n", idstr2);
114 err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
115 got_diff_state_free(&ds);
117 if (f1 && fclose(f1) != 0 && err == NULL)
118 err = got_error_from_errno("fclose");
119 if (f2 && fclose(f2) != 0 && err == NULL)
120 err = got_error_from_errno("fclose");
124 const struct got_error *
125 got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
126 struct got_blob_object *blob2, struct got_object_id *id1,
127 struct got_object_id *id2, const char *label1, const char *label2,
128 struct got_repository *repo)
130 struct got_diff_blob_output_unidiff_arg *a = arg;
132 return diff_blobs(blob1, blob2, label1, label2, a->diff_context,
136 const struct got_error *
137 got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
138 const char *label1, const char *label2, int diff_context, FILE *outfile)
140 return diff_blobs(blob1, blob2, label1, label2, diff_context, outfile,
144 static const struct got_error *
145 alloc_changes(struct got_diff_changes **changes)
147 *changes = calloc(1, sizeof(**changes));
148 if (*changes == NULL)
149 return got_error_from_errno("calloc");
150 SIMPLEQ_INIT(&(*changes)->entries);
154 static const struct got_error *
155 diff_blob_file(struct got_diff_changes **changes,
156 struct got_blob_object *blob1, const char *label1, FILE *f2, size_t size2,
157 const char *label2, int diff_context, FILE *outfile)
159 struct got_diff_state ds;
160 struct got_diff_args args;
161 const struct got_error *err = NULL;
163 char hex1[SHA1_DIGEST_STRING_LENGTH];
175 return got_error_from_errno("got_opentemp");
176 idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
177 err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
183 idstr1 = "/dev/null";
189 memset(&ds, 0, sizeof(ds));
190 /* XXX should stat buffers be passed in args instead of ds? */
191 ds.stb1.st_mode = S_IFREG;
193 ds.stb1.st_size = size1;
194 ds.stb1.st_mtime = 0; /* XXX */
196 ds.stb2.st_mode = S_IFREG;
197 ds.stb2.st_size = size2;
198 ds.stb2.st_mtime = 0; /* XXX */
200 memset(&args, 0, sizeof(args));
201 args.diff_format = D_UNIFIED;
202 args.label[0] = label2;
203 args.label[1] = label2;
204 args.diff_context = diff_context;
205 flags |= D_PROTOTYPE;
208 fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
209 fprintf(outfile, "file + %s\n",
210 f2 == NULL ? "/dev/null" : label2);
213 err = alloc_changes(changes);
217 err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile,
218 changes ? *changes : NULL);
219 got_diff_state_free(&ds);
221 if (f1 && fclose(f1) != 0 && err == NULL)
222 err = got_error_from_errno("fclose");
226 const struct got_error *
227 got_diff_blob_file(struct got_blob_object *blob1, const char *label1,
228 FILE *f2, size_t size2, const char *label2, int diff_context,
231 return diff_blob_file(NULL, blob1, label1, f2, size2, label2,
232 diff_context, outfile);
235 const struct got_error *
236 got_diff_blob_lines_changed(struct got_diff_changes **changes,
237 struct got_blob_object *blob1, struct got_blob_object *blob2)
239 const struct got_error *err = NULL;
241 err = alloc_changes(changes);
245 err = diff_blobs(blob1, blob2, NULL, NULL, 3, NULL, *changes);
247 got_diff_free_changes(*changes);
254 got_diff_free_changes(struct got_diff_changes *changes)
256 struct got_diff_change *change;
257 while (!SIMPLEQ_EMPTY(&changes->entries)) {
258 change = SIMPLEQ_FIRST(&changes->entries);
259 SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
265 static const struct got_error *
266 diff_added_blob(struct got_object_id *id, const char *label,
267 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
269 const struct got_error *err;
270 struct got_blob_object *blob = NULL;
271 struct got_object *obj = NULL;
273 err = got_object_open(&obj, repo, id);
277 err = got_object_blob_open(&blob, repo, obj, 8192);
280 err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, repo);
282 got_object_close(obj);
284 got_object_blob_close(blob);
288 static const struct got_error *
289 diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
290 const char *label1, const char *label2, struct got_repository *repo,
291 got_diff_blob_cb cb, void *cb_arg)
293 const struct got_error *err;
294 struct got_object *obj1 = NULL;
295 struct got_object *obj2 = NULL;
296 struct got_blob_object *blob1 = NULL;
297 struct got_blob_object *blob2 = NULL;
299 err = got_object_open(&obj1, repo, id1);
302 if (obj1->type != GOT_OBJ_TYPE_BLOB) {
303 err = got_error(GOT_ERR_OBJ_TYPE);
307 err = got_object_open(&obj2, repo, id2);
310 if (obj2->type != GOT_OBJ_TYPE_BLOB) {
311 err = got_error(GOT_ERR_BAD_OBJ_DATA);
315 err = got_object_blob_open(&blob1, repo, obj1, 8192);
319 err = got_object_blob_open(&blob2, repo, obj2, 8192);
323 err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, repo);
326 got_object_close(obj1);
328 got_object_close(obj2);
330 got_object_blob_close(blob1);
332 got_object_blob_close(blob2);
336 static const struct got_error *
337 diff_deleted_blob(struct got_object_id *id, const char *label,
338 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
340 const struct got_error *err;
341 struct got_blob_object *blob = NULL;
342 struct got_object *obj = NULL;
344 err = got_object_open(&obj, repo, id);
348 err = got_object_blob_open(&blob, repo, obj, 8192);
351 err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, repo);
353 got_object_close(obj);
355 got_object_blob_close(blob);
359 static const struct got_error *
360 diff_added_tree(struct got_object_id *id, const char *label,
361 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
364 const struct got_error *err = NULL;
365 struct got_object *treeobj = NULL;
366 struct got_tree_object *tree = NULL;
368 err = got_object_open(&treeobj, repo, id);
372 if (treeobj->type != GOT_OBJ_TYPE_TREE) {
373 err = got_error(GOT_ERR_OBJ_TYPE);
377 err = got_object_tree_open(&tree, repo, treeobj);
381 err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg,
385 got_object_tree_close(tree);
387 got_object_close(treeobj);
391 static const struct got_error *
392 diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
393 const char *label1, const char *label2, struct got_repository *repo,
394 got_diff_blob_cb cb, void *cb_arg, int diff_content)
396 const struct got_error *err;
397 struct got_object *treeobj1 = NULL;
398 struct got_object *treeobj2 = NULL;
399 struct got_tree_object *tree1 = NULL;
400 struct got_tree_object *tree2 = NULL;
402 err = got_object_open(&treeobj1, repo, id1);
406 if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
407 err = got_error(GOT_ERR_OBJ_TYPE);
411 err = got_object_open(&treeobj2, repo, id2);
415 if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
416 err = got_error(GOT_ERR_OBJ_TYPE);
420 err = got_object_tree_open(&tree1, repo, treeobj1);
424 err = got_object_tree_open(&tree2, repo, treeobj2);
428 err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg,
433 got_object_tree_close(tree1);
435 got_object_tree_close(tree2);
437 got_object_close(treeobj1);
439 got_object_close(treeobj2);
443 static const struct got_error *
444 diff_deleted_tree(struct got_object_id *id, const char *label,
445 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
448 const struct got_error *err;
449 struct got_object *treeobj = NULL;
450 struct got_tree_object *tree = NULL;
452 err = got_object_open(&treeobj, repo, id);
456 if (treeobj->type != GOT_OBJ_TYPE_TREE) {
457 err = got_error(GOT_ERR_OBJ_TYPE);
461 err = got_object_tree_open(&tree, repo, treeobj);
465 err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg,
469 got_object_tree_close(tree);
471 got_object_close(treeobj);
475 static const struct got_error *
476 diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
477 const char *label1, const char *label2, struct got_repository *repo,
478 got_diff_blob_cb cb, void *cb_arg)
484 static const struct got_error *
485 diff_entry_old_new(const struct got_tree_entry *te1,
486 const struct got_tree_entry *te2, const char *label1, const char *label2,
487 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
490 const struct got_error *err = NULL;
494 if (S_ISDIR(te1->mode))
495 err = diff_deleted_tree(te1->id, label1, repo,
496 cb, cb_arg, diff_content);
499 err = diff_deleted_blob(te1->id, label1, repo,
502 err = cb(cb_arg, NULL, NULL, te1->id, NULL,
508 id_match = (got_object_id_cmp(te1->id, te2->id) == 0);
509 if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
511 return diff_modified_tree(te1->id, te2->id,
512 label1, label2, repo, cb, cb_arg, diff_content);
513 } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
516 return diff_modified_blob(te1->id, te2->id,
517 label1, label2, repo, cb, cb_arg);
519 return cb(cb_arg, NULL, NULL, te1->id,
520 te2->id, label1, label2, repo);
527 return diff_kind_mismatch(te1->id, te2->id, label1, label2, repo,
531 static const struct got_error *
532 diff_entry_new_old(const struct got_tree_entry *te2,
533 const struct got_tree_entry *te1, const char *label2,
534 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
537 if (te1 != NULL) /* handled by diff_entry_old_new() */
540 if (S_ISDIR(te2->mode))
541 return diff_added_tree(te2->id, label2, repo, cb, cb_arg,
545 return diff_added_blob(te2->id, label2, repo, cb, cb_arg);
547 return cb(cb_arg, NULL, NULL, NULL, te2->id, NULL, label2, repo);
550 const struct got_error *
551 got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
552 const char *label1, const char *label2, struct got_repository *repo,
553 got_diff_blob_cb cb, void *cb_arg, int diff_content)
555 const struct got_error *err = NULL;
556 struct got_tree_entry *te1 = NULL;
557 struct got_tree_entry *te2 = NULL;
558 char *l1 = NULL, *l2 = NULL;
561 const struct got_tree_entries *entries;
562 entries = got_object_tree_get_entries(tree1);
563 te1 = SIMPLEQ_FIRST(&entries->head);
564 if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
566 return got_error_from_errno("asprintf");
569 const struct got_tree_entries *entries;
570 entries = got_object_tree_get_entries(tree2);
571 te2 = SIMPLEQ_FIRST(&entries->head);
572 if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
574 return got_error_from_errno("asprintf");
579 const struct got_tree_entry *te = NULL;
581 te = got_object_tree_find_entry(tree2,
586 if (te && asprintf(&l2, "%s%s%s", label2,
587 label2[0] ? "/" : "", te->name) == -1)
589 got_error_from_errno("asprintf");
591 err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
592 cb_arg, diff_content);
598 const struct got_tree_entry *te = NULL;
600 te = got_object_tree_find_entry(tree1,
604 if (asprintf(&l2, "%s%s%s", label2,
605 label2[0] ? "/" : "", te->name) == -1)
607 got_error_from_errno("asprintf");
609 if (asprintf(&l2, "%s%s%s", label2,
610 label2[0] ? "/" : "", te2->name) == -1)
612 got_error_from_errno("asprintf");
614 err = diff_entry_new_old(te2, te, l2, repo,
615 cb, cb_arg, diff_content);
623 te1 = SIMPLEQ_NEXT(te1, entry);
625 asprintf(&l1, "%s%s%s", label1,
626 label1[0] ? "/" : "", te1->name) == -1)
627 return got_error_from_errno("asprintf");
632 te2 = SIMPLEQ_NEXT(te2, entry);
634 asprintf(&l2, "%s%s%s", label2,
635 label2[0] ? "/" : "", te2->name) == -1)
636 return got_error_from_errno("asprintf");
638 } while (te1 || te2);
643 const struct got_error *
644 got_diff_objects_as_blobs(struct got_object_id *id1, struct got_object_id *id2,
645 const char *label1, const char *label2, int diff_context,
646 struct got_repository *repo, FILE *outfile)
648 const struct got_error *err;
649 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
651 if (id1 == NULL && id2 == NULL)
652 return got_error(GOT_ERR_NO_OBJ);
655 err = got_object_open_as_blob(&blob1, repo, id1, 8192);
660 err = got_object_open_as_blob(&blob2, repo, id2, 8192);
664 err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
668 got_object_blob_close(blob1);
670 got_object_blob_close(blob2);
674 const struct got_error *
675 got_diff_objects_as_trees(struct got_object_id *id1, struct got_object_id *id2,
676 char *label1, char *label2, int diff_context, struct got_repository *repo,
679 const struct got_error *err;
680 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
681 struct got_diff_blob_output_unidiff_arg arg;
683 if (id1 == NULL && id2 == NULL)
684 return got_error(GOT_ERR_NO_OBJ);
687 err = got_object_open_as_tree(&tree1, repo, id1);
692 err = got_object_open_as_tree(&tree2, repo, id2);
696 arg.diff_context = diff_context;
697 arg.outfile = outfile;
698 err = got_diff_tree(tree1, tree2, label1, label2, repo,
699 got_diff_blob_output_unidiff, &arg, 1);
702 got_object_tree_close(tree1);
704 got_object_tree_close(tree2);
708 const struct got_error *
709 got_diff_objects_as_commits(struct got_object_id *id1,
710 struct got_object_id *id2, int diff_context,
711 struct got_repository *repo, FILE *outfile)
713 const struct got_error *err;
714 struct got_commit_object *commit1 = NULL, *commit2 = NULL;
717 return got_error(GOT_ERR_NO_OBJ);
720 err = got_object_open_as_commit(&commit1, repo, id1);
725 err = got_object_open_as_commit(&commit2, repo, id2);
729 err = got_diff_objects_as_trees(
730 commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
731 got_object_commit_get_tree_id(commit2), "", "", diff_context, repo,
735 got_object_commit_close(commit1);
737 got_object_commit_close(commit2);
741 const struct got_error *
742 got_diff_files(struct got_diff_changes **changes,
743 struct got_diff_state **ds,
744 struct got_diff_args **args,
746 FILE *f1, size_t size1, const char *label1,
747 FILE *f2, size_t size2, const char *label2,
748 int diff_context, FILE *outfile)
750 const struct got_error *err = NULL;
754 *ds = calloc(1, sizeof(**ds));
756 return got_error_from_errno("calloc");
757 *args = calloc(1, sizeof(**args));
759 err = got_error_from_errno("calloc");
772 /* XXX should stat buffers be passed in args instead of ds? */
773 (*ds)->stb1.st_mode = S_IFREG;
774 (*ds)->stb1.st_size = size1;
775 (*ds)->stb1.st_mtime = 0; /* XXX */
777 (*ds)->stb2.st_mode = S_IFREG;
778 (*ds)->stb2.st_size = size2;
779 (*ds)->stb2.st_mtime = 0; /* XXX */
781 (*args)->diff_format = D_UNIFIED;
782 (*args)->label[0] = label1;
783 (*args)->label[1] = label2;
784 (*args)->diff_context = diff_context;
785 *flags |= D_PROTOTYPE;
788 fprintf(outfile, "file - %s\n",
789 f1 == NULL ? "/dev/null" : label1);
790 fprintf(outfile, "file + %s\n",
791 f2 == NULL ? "/dev/null" : label2);
794 err = alloc_changes(changes);
798 err = got_diffreg(&res, f1, f2, *flags, *args, *ds, outfile,
799 changes ? *changes : NULL);
803 got_diff_state_free(*ds);
813 got_diff_free_changes(*changes);