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.
25 #include "got_compat.h"
27 #include "got_object.h"
28 #include "got_repository.h"
29 #include "got_error.h"
32 #include "got_cancel.h"
33 #include "got_worktree.h"
34 #include "got_opentemp.h"
36 #include "got_lib_diff.h"
37 #include "got_lib_delta.h"
38 #include "got_lib_inflate.h"
39 #include "got_lib_object.h"
41 static const struct got_error *
42 add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
46 p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
48 return got_error_from_errno("reallocarray");
50 (*line_offsets)[*nlines] = off;
55 static const struct got_error *
56 diff_blobs(off_t **line_offsets, size_t *nlines,
57 struct got_diffreg_result **resultp, struct got_blob_object *blob1,
58 struct got_blob_object *blob2, FILE *f1, FILE *f2,
59 const char *label1, const char *label2, mode_t mode1, mode_t mode2,
60 int diff_context, int ignore_whitespace, int force_text_diff, FILE *outfile)
62 const struct got_error *err = NULL, *free_err;
63 char hex1[SHA1_DIGEST_STRING_LENGTH];
64 char hex2[SHA1_DIGEST_STRING_LENGTH];
65 char *idstr1 = NULL, *idstr2 = NULL;
67 struct got_diffreg_result *result;
71 if (line_offsets && *line_offsets && *nlines > 0)
72 outoff = (*line_offsets)[*nlines - 1];
73 else if (line_offsets) {
74 err = add_line_offset(line_offsets, nlines, 0);
83 err = got_opentemp_truncate(f1);
88 err = got_opentemp_truncate(f2);
95 idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
96 err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
101 idstr1 = "/dev/null";
105 idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
106 err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
111 idstr2 = "/dev/null";
114 char *modestr1 = NULL, *modestr2 = NULL;
116 if (mode1 && mode1 != mode2) {
120 modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
121 if (asprintf(&modestr1, " (mode %o)",
122 mode1 & modebits) == -1) {
123 err = got_error_from_errno("asprintf");
127 if (mode2 && mode1 != mode2) {
131 modebits = (S_IRWXU | S_IRWXG | S_IRWXO);
132 if (asprintf(&modestr2, " (mode %o)",
133 mode2 & modebits) == -1) {
134 err = got_error_from_errno("asprintf");
138 n = fprintf(outfile, "blob - %s%s\n", idstr1,
139 modestr1 ? modestr1 : "");
144 err = add_line_offset(line_offsets, nlines, outoff);
149 n = fprintf(outfile, "blob + %s%s\n", idstr2,
150 modestr2 ? modestr2 : "");
155 err = add_line_offset(line_offsets, nlines, outoff);
163 err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_PATIENCE,
164 ignore_whitespace, force_text_diff);
169 err = got_diffreg_output(line_offsets, nlines, result,
170 blob1 != NULL, blob2 != NULL,
171 label1 ? label1 : idstr1,
172 label2 ? label2 : idstr2,
173 GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
178 if (resultp && err == NULL)
181 free_err = got_diffreg_result_free(result);
182 if (free_err && err == NULL)
189 const struct got_error *
190 got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
191 struct got_blob_object *blob2, FILE *f1, FILE *f2,
192 struct got_object_id *id1, struct got_object_id *id2,
193 const char *label1, const char *label2, mode_t mode1, mode_t mode2,
194 struct got_repository *repo)
196 struct got_diff_blob_output_unidiff_arg *a = arg;
198 return diff_blobs(&a->line_offsets, &a->nlines, NULL,
199 blob1, blob2, f1, f2, label1, label2, mode1, mode2, a->diff_context,
200 a->ignore_whitespace, a->force_text_diff, a->outfile);
203 const struct got_error *
204 got_diff_blob(off_t **line_offsets, size_t *nlines,
205 struct got_blob_object *blob1, struct got_blob_object *blob2,
206 FILE *f1, FILE *f2, const char *label1, const char *label2,
207 int diff_context, int ignore_whitespace, int force_text_diff,
210 return diff_blobs(line_offsets, nlines, NULL, blob1, blob2, f1, f2,
211 label1, label2, 0, 0, diff_context, ignore_whitespace,
212 force_text_diff, outfile);
215 static const struct got_error *
216 diff_blob_file(struct got_diffreg_result **resultp,
217 struct got_blob_object *blob1, FILE *f1, off_t size1, const char *label1,
218 FILE *f2, size_t size2, const char *label2, int diff_context,
219 int ignore_whitespace, int force_text_diff, FILE *outfile)
221 const struct got_error *err = NULL, *free_err;
222 char hex1[SHA1_DIGEST_STRING_LENGTH];
224 struct got_diffreg_result *result = NULL;
230 idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
232 idstr1 = "/dev/null";
235 fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
236 fprintf(outfile, "file + %s\n",
237 f2 == NULL ? "/dev/null" : label2);
240 err = got_diffreg(&result, f1, f2, GOT_DIFF_ALGORITHM_PATIENCE,
241 ignore_whitespace, force_text_diff);
246 err = got_diffreg_output(NULL, NULL, result,
247 f1 != NULL, f2 != NULL,
248 label2, /* show local file's path, not a blob ID */
249 label2, GOT_DIFF_OUTPUT_UNIDIFF,
250 diff_context, outfile);
255 if (resultp && err == NULL)
258 free_err = got_diffreg_result_free(result);
259 if (free_err && err == NULL)
266 const struct got_error *
267 got_diff_blob_file(struct got_blob_object *blob1, FILE *f1, off_t size1,
268 const char *label1, FILE *f2, size_t size2, const char *label2,
269 int diff_context, int ignore_whitespace, int force_text_diff, FILE *outfile)
271 return diff_blob_file(NULL, blob1, f1, size1, label1, f2, size2, label2,
272 diff_context, ignore_whitespace, force_text_diff, outfile);
275 static const struct got_error *
276 diff_added_blob(struct got_object_id *id, FILE *f, const char *label,
277 mode_t mode, struct got_repository *repo,
278 got_diff_blob_cb cb, void *cb_arg)
280 const struct got_error *err;
281 struct got_blob_object *blob = NULL;
282 struct got_object *obj = NULL;
284 err = got_object_open(&obj, repo, id);
288 err = got_object_blob_open(&blob, repo, obj, 8192);
291 err = cb(cb_arg, NULL, blob, NULL, f, NULL, id,
292 NULL, label, 0, mode, repo);
294 got_object_close(obj);
296 got_object_blob_close(blob);
300 static const struct got_error *
301 diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
302 FILE *f1, FILE *f2, const char *label1, const char *label2,
303 mode_t mode1, mode_t mode2, struct got_repository *repo,
304 got_diff_blob_cb cb, void *cb_arg)
306 const struct got_error *err;
307 struct got_object *obj1 = NULL;
308 struct got_object *obj2 = NULL;
309 struct got_blob_object *blob1 = NULL;
310 struct got_blob_object *blob2 = NULL;
312 err = got_object_open(&obj1, repo, id1);
315 if (obj1->type != GOT_OBJ_TYPE_BLOB) {
316 err = got_error(GOT_ERR_OBJ_TYPE);
320 err = got_object_open(&obj2, repo, id2);
323 if (obj2->type != GOT_OBJ_TYPE_BLOB) {
324 err = got_error(GOT_ERR_BAD_OBJ_DATA);
328 err = got_object_blob_open(&blob1, repo, obj1, 8192);
332 err = got_object_blob_open(&blob2, repo, obj2, 8192);
336 err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2, label1, label2,
340 got_object_close(obj1);
342 got_object_close(obj2);
344 got_object_blob_close(blob1);
346 got_object_blob_close(blob2);
350 static const struct got_error *
351 diff_deleted_blob(struct got_object_id *id, FILE *f, const char *label,
352 mode_t mode, struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
354 const struct got_error *err;
355 struct got_blob_object *blob = NULL;
356 struct got_object *obj = NULL;
358 err = got_object_open(&obj, repo, id);
362 err = got_object_blob_open(&blob, repo, obj, 8192);
365 err = cb(cb_arg, blob, NULL, f, NULL, id, NULL, label, NULL,
368 got_object_close(obj);
370 got_object_blob_close(blob);
374 static const struct got_error *
375 diff_added_tree(struct got_object_id *id, FILE *f, const char *label,
376 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
379 const struct got_error *err = NULL;
380 struct got_object *treeobj = NULL;
381 struct got_tree_object *tree = NULL;
383 err = got_object_open(&treeobj, repo, id);
387 if (treeobj->type != GOT_OBJ_TYPE_TREE) {
388 err = got_error(GOT_ERR_OBJ_TYPE);
392 err = got_object_tree_open(&tree, repo, treeobj);
396 err = got_diff_tree(NULL, tree, NULL, f, NULL, label,
397 repo, cb, cb_arg, diff_content);
400 got_object_tree_close(tree);
402 got_object_close(treeobj);
406 static const struct got_error *
407 diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
408 FILE *f1, FILE *f2, const char *label1, const char *label2,
409 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
412 const struct got_error *err;
413 struct got_object *treeobj1 = NULL;
414 struct got_object *treeobj2 = NULL;
415 struct got_tree_object *tree1 = NULL;
416 struct got_tree_object *tree2 = NULL;
418 err = got_object_open(&treeobj1, repo, id1);
422 if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
423 err = got_error(GOT_ERR_OBJ_TYPE);
427 err = got_object_open(&treeobj2, repo, id2);
431 if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
432 err = got_error(GOT_ERR_OBJ_TYPE);
436 err = got_object_tree_open(&tree1, repo, treeobj1);
440 err = got_object_tree_open(&tree2, repo, treeobj2);
444 err = got_diff_tree(tree1, tree2, f1, f2, label1, label2,
445 repo, cb, cb_arg, diff_content);
449 got_object_tree_close(tree1);
451 got_object_tree_close(tree2);
453 got_object_close(treeobj1);
455 got_object_close(treeobj2);
459 static const struct got_error *
460 diff_deleted_tree(struct got_object_id *id, FILE *f, const char *label,
461 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
464 const struct got_error *err;
465 struct got_object *treeobj = NULL;
466 struct got_tree_object *tree = NULL;
468 err = got_object_open(&treeobj, repo, id);
472 if (treeobj->type != GOT_OBJ_TYPE_TREE) {
473 err = got_error(GOT_ERR_OBJ_TYPE);
477 err = got_object_tree_open(&tree, repo, treeobj);
481 err = got_diff_tree(tree, NULL, f, NULL, label, NULL,
482 repo, cb, cb_arg, diff_content);
485 got_object_tree_close(tree);
487 got_object_close(treeobj);
491 static const struct got_error *
492 diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
493 const char *label1, const char *label2, struct got_repository *repo,
494 got_diff_blob_cb cb, void *cb_arg)
500 static const struct got_error *
501 diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_entry *te2,
502 FILE *f1, FILE *f2, const char *label1, const char *label2,
503 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
506 const struct got_error *err = NULL;
509 if (got_object_tree_entry_is_submodule(te1))
513 if (S_ISDIR(te1->mode))
514 err = diff_deleted_tree(&te1->id, f1, label1, repo,
515 cb, cb_arg, diff_content);
518 err = diff_deleted_blob(&te1->id, f1, label1,
519 te1->mode, repo, cb, cb_arg);
521 err = cb(cb_arg, NULL, NULL, NULL, NULL,
522 &te1->id, NULL, label1, NULL,
526 } else if (got_object_tree_entry_is_submodule(te2))
529 id_match = (got_object_id_cmp(&te1->id, &te2->id) == 0);
530 if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
532 return diff_modified_tree(&te1->id, &te2->id, f1, f2,
533 label1, label2, repo, cb, cb_arg, diff_content);
534 } else if ((S_ISREG(te1->mode) || S_ISLNK(te1->mode)) &&
535 (S_ISREG(te2->mode) || S_ISLNK(te2->mode))) {
537 ((te1->mode & (S_IFLNK | S_IXUSR))) !=
538 (te2->mode & (S_IFLNK | S_IXUSR))) {
540 return diff_modified_blob(&te1->id, &te2->id,
541 f1, f2, label1, label2, te1->mode,
542 te2->mode, repo, cb, cb_arg);
544 return cb(cb_arg, NULL, NULL, NULL, NULL,
545 &te1->id, &te2->id, label1, label2,
546 te1->mode, te2->mode, repo);
553 return diff_kind_mismatch(&te1->id, &te2->id, label1, label2, repo,
557 static const struct got_error *
558 diff_entry_new_old(struct got_tree_entry *te2,
559 struct got_tree_entry *te1, FILE *f2, const char *label2,
560 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
563 if (te1 != NULL) /* handled by diff_entry_old_new() */
566 if (got_object_tree_entry_is_submodule(te2))
569 if (S_ISDIR(te2->mode))
570 return diff_added_tree(&te2->id, f2, label2,
571 repo, cb, cb_arg, diff_content);
574 return diff_added_blob(&te2->id, f2, label2, te2->mode,
577 return cb(cb_arg, NULL, NULL, NULL, NULL, NULL, &te2->id,
578 NULL, label2, 0, te2->mode, repo);
581 const struct got_error *
582 got_diff_tree_collect_changed_paths(void *arg, struct got_blob_object *blob1,
583 struct got_blob_object *blob2, FILE *f1, FILE *f2,
584 struct got_object_id *id1, struct got_object_id *id2,
585 const char *label1, const char *label2,
586 mode_t mode1, mode_t mode2, struct got_repository *repo)
588 const struct got_error *err = NULL;
589 struct got_pathlist_head *paths = arg;
590 struct got_diff_changed_path *change = NULL;
593 path = strdup(label2 ? label2 : label1);
595 return got_error_from_errno("malloc");
597 change = malloc(sizeof(*change));
598 if (change == NULL) {
599 err = got_error_from_errno("malloc");
603 change->status = GOT_STATUS_NO_CHANGE;
605 change->status = GOT_STATUS_ADD;
606 else if (id2 == NULL)
607 change->status = GOT_STATUS_DELETE;
609 if (got_object_id_cmp(id1, id2) != 0)
610 change->status = GOT_STATUS_MODIFY;
611 else if (mode1 != mode2)
612 change->status = GOT_STATUS_MODE_CHANGE;
615 err = got_pathlist_append(paths, path, change);
624 const struct got_error *
625 got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
626 FILE *f1, FILE *f2, const char *label1, const char *label2,
627 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
630 const struct got_error *err = NULL;
631 struct got_tree_entry *te1 = NULL;
632 struct got_tree_entry *te2 = NULL;
633 char *l1 = NULL, *l2 = NULL;
634 int tidx1 = 0, tidx2 = 0;
637 te1 = got_object_tree_get_entry(tree1, 0);
638 if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
640 return got_error_from_errno("asprintf");
643 te2 = got_object_tree_get_entry(tree2, 0);
644 if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
646 return got_error_from_errno("asprintf");
651 struct got_tree_entry *te = NULL;
653 te = got_object_tree_find_entry(tree2,
658 if (te && asprintf(&l2, "%s%s%s", label2,
659 label2[0] ? "/" : "", te->name) == -1)
661 got_error_from_errno("asprintf");
663 err = diff_entry_old_new(te1, te, f1, f2, l1, l2,
664 repo, cb, cb_arg, diff_content);
670 struct got_tree_entry *te = NULL;
672 te = got_object_tree_find_entry(tree1,
676 if (asprintf(&l2, "%s%s%s", label2,
677 label2[0] ? "/" : "", te->name) == -1)
679 got_error_from_errno("asprintf");
681 if (asprintf(&l2, "%s%s%s", label2,
682 label2[0] ? "/" : "", te2->name) == -1)
684 got_error_from_errno("asprintf");
686 err = diff_entry_new_old(te2, te, f2, l2, repo,
687 cb, cb_arg, diff_content);
696 te1 = got_object_tree_get_entry(tree1, tidx1);
698 asprintf(&l1, "%s%s%s", label1,
699 label1[0] ? "/" : "", te1->name) == -1)
700 return got_error_from_errno("asprintf");
706 te2 = got_object_tree_get_entry(tree2, tidx2);
708 asprintf(&l2, "%s%s%s", label2,
709 label2[0] ? "/" : "", te2->name) == -1)
710 return got_error_from_errno("asprintf");
712 } while (te1 || te2);
717 const struct got_error *
718 got_diff_objects_as_blobs(off_t **line_offsets, size_t *nlines,
719 FILE *f1, FILE *f2, struct got_object_id *id1, struct got_object_id *id2,
720 const char *label1, const char *label2, int diff_context,
721 int ignore_whitespace, int force_text_diff,
722 struct got_repository *repo, FILE *outfile)
724 const struct got_error *err;
725 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
727 if (id1 == NULL && id2 == NULL)
728 return got_error(GOT_ERR_NO_OBJ);
731 err = got_object_open_as_blob(&blob1, repo, id1, 8192);
736 err = got_object_open_as_blob(&blob2, repo, id2, 8192);
740 err = got_diff_blob(line_offsets, nlines, blob1, blob2, f1, f2,
741 label1, label2, diff_context, ignore_whitespace, force_text_diff,
745 got_object_blob_close(blob1);
747 got_object_blob_close(blob2);
751 static const struct got_error *
752 diff_paths(struct got_tree_object *tree1, struct got_tree_object *tree2,
753 FILE *f1, FILE *f2, struct got_pathlist_head *paths,
754 struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
756 const struct got_error *err = NULL;
757 struct got_pathlist_entry *pe;
758 struct got_object_id *id1 = NULL, *id2 = NULL;
759 struct got_tree_object *subtree1 = NULL, *subtree2 = NULL;
760 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
762 TAILQ_FOREACH(pe, paths, entry) {
763 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
764 mode_t mode1 = 0, mode2 = 0;
771 got_object_tree_close(subtree1);
775 got_object_tree_close(subtree2);
779 got_object_blob_close(blob1);
783 got_object_blob_close(blob2);
787 err = got_object_tree_find_path(&id1, &mode1, repo, tree1,
789 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
791 err = got_object_tree_find_path(&id2, &mode2, repo, tree2,
793 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
795 if (id1 == NULL && id2 == NULL) {
796 err = got_error_path(pe->path, GOT_ERR_NO_TREE_ENTRY);
800 err = got_object_get_type(&type1, repo, id1);
805 err = got_object_get_type(&type2, repo, id2);
809 if (type1 == GOT_OBJ_TYPE_ANY &&
810 type2 == GOT_OBJ_TYPE_ANY) {
811 err = got_error_path(pe->path, GOT_ERR_NO_OBJ);
813 } else if (type1 != GOT_OBJ_TYPE_ANY &&
814 type2 != GOT_OBJ_TYPE_ANY && type1 != type2) {
815 err = got_error(GOT_ERR_OBJ_TYPE);
819 if (type1 == GOT_OBJ_TYPE_BLOB ||
820 type2 == GOT_OBJ_TYPE_BLOB) {
822 err = got_object_open_as_blob(&blob1, repo,
828 err = got_object_open_as_blob(&blob2, repo,
833 err = cb(cb_arg, blob1, blob2, f1, f2, id1, id2,
834 id1 ? pe->path : "/dev/null",
835 id2 ? pe->path : "/dev/null",
839 } else if (type1 == GOT_OBJ_TYPE_TREE ||
840 type2 == GOT_OBJ_TYPE_TREE) {
842 err = got_object_open_as_tree(&subtree1, repo,
848 err = got_object_open_as_tree(&subtree2, repo,
853 err = got_diff_tree(subtree1, subtree2, f1, f2,
854 id1 ? pe->path : "/dev/null",
855 id2 ? pe->path : "/dev/null",
856 repo, cb, cb_arg, 1);
860 err = got_error(GOT_ERR_OBJ_TYPE);
868 got_object_tree_close(subtree1);
870 got_object_tree_close(subtree2);
872 got_object_blob_close(blob1);
874 got_object_blob_close(blob2);
878 const struct got_error *
879 got_diff_objects_as_trees(off_t **line_offsets, size_t *nlines,
880 FILE *f1, FILE *f2, struct got_object_id *id1, struct got_object_id *id2,
881 struct got_pathlist_head *paths,
882 char *label1, char *label2, int diff_context, int ignore_whitespace,
883 int force_text_diff, struct got_repository *repo, FILE *outfile)
885 const struct got_error *err;
886 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
887 struct got_diff_blob_output_unidiff_arg arg;
888 int want_lineoffsets = (line_offsets != NULL && *line_offsets != NULL);
890 if (id1 == NULL && id2 == NULL)
891 return got_error(GOT_ERR_NO_OBJ);
894 err = got_object_open_as_tree(&tree1, repo, id1);
899 err = got_object_open_as_tree(&tree2, repo, id2);
904 arg.diff_context = diff_context;
905 arg.ignore_whitespace = ignore_whitespace;
906 arg.force_text_diff = force_text_diff;
907 arg.outfile = outfile;
908 if (want_lineoffsets) {
909 arg.line_offsets = *line_offsets;
910 arg.nlines = *nlines;
912 arg.line_offsets = NULL;
915 if (paths == NULL || TAILQ_EMPTY(paths)) {
916 err = got_diff_tree(tree1, tree2, f1, f2, label1, label2,
917 repo, got_diff_blob_output_unidiff, &arg, 1);
919 err = diff_paths(tree1, tree2, f1, f2, paths, repo,
920 got_diff_blob_output_unidiff, &arg);
922 if (want_lineoffsets) {
923 *line_offsets = arg.line_offsets; /* was likely re-allocated */
924 *nlines = arg.nlines;
928 got_object_tree_close(tree1);
930 got_object_tree_close(tree2);
934 const struct got_error *
935 got_diff_objects_as_commits(off_t **line_offsets, size_t *nlines,
936 FILE *f1, FILE *f2, struct got_object_id *id1, struct got_object_id *id2,
937 struct got_pathlist_head *paths,
938 int diff_context, int ignore_whitespace, int force_text_diff,
939 struct got_repository *repo, FILE *outfile)
941 const struct got_error *err;
942 struct got_commit_object *commit1 = NULL, *commit2 = NULL;
945 return got_error(GOT_ERR_NO_OBJ);
948 err = got_object_open_as_commit(&commit1, repo, id1);
953 err = got_object_open_as_commit(&commit2, repo, id2);
957 err = got_diff_objects_as_trees(line_offsets, nlines, f1, f2,
958 commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
959 got_object_commit_get_tree_id(commit2), paths, "", "",
960 diff_context, ignore_whitespace, force_text_diff, repo, outfile);
963 got_object_commit_close(commit1);
965 got_object_commit_close(commit2);
969 const struct got_error *
970 got_diff_files(struct got_diffreg_result **resultp,
971 FILE *f1, const char *label1, FILE *f2, const char *label2,
972 int diff_context, int ignore_whitespace, int force_text_diff,
975 const struct got_error *err = NULL;
976 struct got_diffreg_result *diffreg_result = NULL;
982 fprintf(outfile, "file - %s\n",
983 f1 == NULL ? "/dev/null" : label1);
984 fprintf(outfile, "file + %s\n",
985 f2 == NULL ? "/dev/null" : label2);
988 err = got_diffreg(&diffreg_result, f1, f2, GOT_DIFF_ALGORITHM_PATIENCE,
989 ignore_whitespace, force_text_diff);
994 err = got_diffreg_output(NULL, NULL, diffreg_result,
995 f1 != NULL, f2 != NULL, label1, label2,
996 GOT_DIFF_OUTPUT_UNIDIFF, diff_context, outfile);
1002 if (resultp && err == NULL)
1003 *resultp = diffreg_result;
1004 else if (diffreg_result) {
1005 const struct got_error *free_err;
1006 free_err = got_diffreg_result_free(diffreg_result);
1007 if (free_err && err == NULL)