2 7d283eee 2017-11-29 stsp * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 7d283eee 2017-11-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 7d283eee 2017-11-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 7d283eee 2017-11-29 stsp * copyright notice and this permission notice appear in all copies.
8 7d283eee 2017-11-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 7d283eee 2017-11-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 7d283eee 2017-11-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 7d283eee 2017-11-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 7d283eee 2017-11-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 7d283eee 2017-11-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 7d283eee 2017-11-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 7d283eee 2017-11-29 stsp #include <sys/queue.h>
18 1c7f0520 2017-11-29 stsp #include <sys/stat.h>
20 7d283eee 2017-11-29 stsp #include <stdio.h>
21 7d283eee 2017-11-29 stsp #include <stdlib.h>
22 7d283eee 2017-11-29 stsp #include <string.h>
23 f9d67749 2017-11-30 stsp #include <limits.h>
24 7d283eee 2017-11-29 stsp #include <sha1.h>
25 7d283eee 2017-11-29 stsp #include <zlib.h>
27 7d283eee 2017-11-29 stsp #include "got_repository.h"
28 7d283eee 2017-11-29 stsp #include "got_object.h"
29 7d283eee 2017-11-29 stsp #include "got_error.h"
30 789689b5 2017-11-30 stsp #include "got_diff.h"
31 511a516b 2018-05-19 stsp #include "got_opentemp.h"
33 718b3ab0 2018-03-17 stsp #include "got_lib_diff.h"
34 718b3ab0 2018-03-17 stsp #include "got_lib_path.h"
36 404c43c4 2018-06-21 stsp static const struct got_error *
37 404c43c4 2018-06-21 stsp diff_blobs(struct got_blob_object *blob1, struct got_blob_object *blob2,
38 df2871d2 2018-10-18 stsp const char *label1, const char *label2, int diff_context, FILE *outfile,
39 404c43c4 2018-06-21 stsp struct got_diff_changes *changes)
41 ed9e98a8 2017-11-29 stsp struct got_diff_state ds;
42 8ba9a219 2017-11-29 stsp struct got_diff_args args;
43 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
44 4e22badc 2017-11-30 stsp FILE *f1 = NULL, *f2 = NULL;
45 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
46 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
47 98abbc84 2017-11-30 stsp char *idstr1 = NULL, *idstr2 = NULL;
48 f934cf2c 2018-02-12 stsp size_t size1, size2;
49 4e22badc 2017-11-30 stsp int res, flags = 0;
51 4e22badc 2017-11-30 stsp if (blob1) {
52 a1fd68d8 2018-01-12 stsp f1 = got_opentemp();
53 4e22badc 2017-11-30 stsp if (f1 == NULL)
54 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
56 4e22badc 2017-11-30 stsp flags |= D_EMPTY1;
58 4e22badc 2017-11-30 stsp if (blob2) {
59 a1fd68d8 2018-01-12 stsp f2 = got_opentemp();
60 4e22badc 2017-11-30 stsp if (f2 == NULL) {
62 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
65 4e22badc 2017-11-30 stsp flags |= D_EMPTY2;
68 98abbc84 2017-11-30 stsp if (blob1) {
69 f934cf2c 2018-02-12 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
70 84451b3e 2018-07-10 stsp err = got_object_blob_dump_to_file(&size1, NULL, f1, blob1);
74 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
77 98abbc84 2017-11-30 stsp if (blob2) {
78 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
79 84451b3e 2018-07-10 stsp err = got_object_blob_dump_to_file(&size2, NULL, f2, blob2);
83 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
85 ed9e98a8 2017-11-29 stsp memset(&ds, 0, sizeof(ds));
86 f9d67749 2017-11-30 stsp /* XXX should stat buffers be passed in args instead of ds? */
87 f9d67749 2017-11-30 stsp ds.stb1.st_mode = S_IFREG;
89 f934cf2c 2018-02-12 stsp ds.stb1.st_size = size1;
90 f9d67749 2017-11-30 stsp ds.stb1.st_mtime = 0; /* XXX */
92 f9d67749 2017-11-30 stsp ds.stb2.st_mode = S_IFREG;
94 f934cf2c 2018-02-12 stsp ds.stb2.st_size = size2;
95 f9d67749 2017-11-30 stsp ds.stb2.st_mtime = 0; /* XXX */
97 f9d67749 2017-11-30 stsp memset(&args, 0, sizeof(args));
98 8ba9a219 2017-11-29 stsp args.diff_format = D_UNIFIED;
99 98abbc84 2017-11-30 stsp args.label[0] = label1 ? label1 : idstr1;
100 98abbc84 2017-11-30 stsp args.label[1] = label2 ? label2 : idstr2;
101 df2871d2 2018-10-18 stsp args.diff_context = diff_context;
102 84eb021e 2018-03-27 stsp flags |= D_PROTOTYPE;
104 405a764e 2018-09-13 stsp if (label1 && strcmp(label1, idstr1) != 0)
105 405a764e 2018-09-13 stsp fprintf(outfile, "blob - %s\n", idstr1);
106 405a764e 2018-09-13 stsp if (label2 && strcmp(label2, idstr2) != 0)
107 405a764e 2018-09-13 stsp fprintf(outfile, "blob + %s\n", idstr2);
109 404c43c4 2018-06-21 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
112 98abbc84 2017-11-30 stsp fclose(f1);
114 98abbc84 2017-11-30 stsp fclose(f2);
115 7d283eee 2017-11-29 stsp return err;
118 404c43c4 2018-06-21 stsp const struct got_error *
119 404c43c4 2018-06-21 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
120 df2871d2 2018-10-18 stsp const char *label1, const char *label2, int diff_context, FILE *outfile)
122 df2871d2 2018-10-18 stsp return diff_blobs(blob1, blob2, label1, label2, diff_context, outfile,
126 404c43c4 2018-06-21 stsp const struct got_error *
127 404c43c4 2018-06-21 stsp got_diff_blob_lines_changed(struct got_diff_changes **changes,
128 404c43c4 2018-06-21 stsp struct got_blob_object *blob1, struct got_blob_object *blob2)
130 404c43c4 2018-06-21 stsp const struct got_error *err = NULL;
132 404c43c4 2018-06-21 stsp *changes = calloc(1, sizeof(**changes));
133 404c43c4 2018-06-21 stsp if (*changes == NULL)
134 404c43c4 2018-06-21 stsp return got_error_from_errno();
135 404c43c4 2018-06-21 stsp SIMPLEQ_INIT(&(*changes)->entries);
137 df2871d2 2018-10-18 stsp err = diff_blobs(blob1, blob2, NULL, NULL, 3, NULL, *changes);
139 404c43c4 2018-06-21 stsp got_diff_free_changes(*changes);
140 404c43c4 2018-06-21 stsp *changes = NULL;
142 404c43c4 2018-06-21 stsp return err;
146 404c43c4 2018-06-21 stsp got_diff_free_changes(struct got_diff_changes *changes)
148 404c43c4 2018-06-21 stsp struct got_diff_change *change;
149 404c43c4 2018-06-21 stsp while (!SIMPLEQ_EMPTY(&changes->entries)) {
150 404c43c4 2018-06-21 stsp change = SIMPLEQ_FIRST(&changes->entries);
151 404c43c4 2018-06-21 stsp SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
152 404c43c4 2018-06-21 stsp free(change);
154 404c43c4 2018-06-21 stsp free(changes);
157 a3e2cbea 2017-12-01 stsp struct got_tree_entry *
158 a3e2cbea 2017-12-01 stsp match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
160 a3e2cbea 2017-12-01 stsp struct got_tree_entry *te2;
161 883f0469 2018-06-23 stsp const struct got_tree_entries *entries2;
163 883f0469 2018-06-23 stsp entries2 = got_object_tree_get_entries(tree2);
164 883f0469 2018-06-23 stsp SIMPLEQ_FOREACH(te2, &entries2->head, entry) {
165 a3e2cbea 2017-12-01 stsp if (strcmp(te1->name, te2->name) == 0)
166 a3e2cbea 2017-12-01 stsp return te2;
168 474b4f94 2017-11-30 stsp return NULL;
171 474b4f94 2017-11-30 stsp static const struct got_error *
172 f6861a81 2018-09-13 stsp diff_added_blob(struct got_object_id *id, const char *label,
173 df2871d2 2018-10-18 stsp int diff_context, struct got_repository *repo, FILE *outfile)
175 4e22badc 2017-11-30 stsp const struct got_error *err;
176 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
177 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
179 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
181 4e22badc 2017-11-30 stsp return err;
183 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
186 df2871d2 2018-10-18 stsp err = got_diff_blob(NULL, blob, NULL, label, diff_context, outfile);
188 2acfca77 2018-04-01 stsp got_object_close(obj);
190 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
191 2acfca77 2018-04-01 stsp return err;
194 474b4f94 2017-11-30 stsp static const struct got_error *
195 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
196 df2871d2 2018-10-18 stsp const char *label1, const char *label2, int diff_context,
197 df2871d2 2018-10-18 stsp struct got_repository *repo, FILE *outfile)
199 6a213ccb 2017-11-30 stsp const struct got_error *err;
200 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
201 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
202 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
203 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
205 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
207 730a8aa0 2018-04-24 stsp return err;
208 eef6493a 2018-01-19 stsp if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
209 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
213 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
216 eef6493a 2018-01-19 stsp if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
217 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
221 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
225 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
229 df2871d2 2018-10-18 stsp err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
234 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
236 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
238 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
240 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
241 6a213ccb 2017-11-30 stsp return err;
244 474b4f94 2017-11-30 stsp static const struct got_error *
245 f6861a81 2018-09-13 stsp diff_deleted_blob(struct got_object_id *id, const char *label,
246 df2871d2 2018-10-18 stsp int diff_context, struct got_repository *repo, FILE *outfile)
248 365fb436 2017-11-30 stsp const struct got_error *err;
249 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
250 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
252 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
254 365fb436 2017-11-30 stsp return err;
256 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
259 df2871d2 2018-10-18 stsp err = got_diff_blob(blob, NULL, label, NULL, diff_context, outfile);
261 2acfca77 2018-04-01 stsp got_object_close(obj);
263 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
264 2acfca77 2018-04-01 stsp return err;
267 474b4f94 2017-11-30 stsp static const struct got_error *
268 f6861a81 2018-09-13 stsp diff_added_tree(struct got_object_id *id, const char *label,
269 df2871d2 2018-10-18 stsp int diff_context, struct got_repository *repo, FILE *outfile)
271 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
272 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
273 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
275 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
279 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
280 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
284 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
288 df2871d2 2018-10-18 stsp err = got_diff_tree(NULL, tree, NULL, label, diff_context, repo,
293 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
294 9c70d4c3 2017-11-30 stsp if (treeobj)
295 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
296 9c70d4c3 2017-11-30 stsp return err;
299 474b4f94 2017-11-30 stsp static const struct got_error *
300 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
301 df2871d2 2018-10-18 stsp const char *label1, const char *label2, int diff_context,
302 df2871d2 2018-10-18 stsp struct got_repository *repo, FILE *outfile)
304 f6861a81 2018-09-13 stsp const struct got_error *err;
305 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
306 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
307 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
308 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
310 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
314 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
315 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
319 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
323 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
324 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
328 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
332 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
336 df2871d2 2018-10-18 stsp err = got_diff_tree(tree1, tree2, label1, label2, diff_context, repo,
341 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
343 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
344 789689b5 2017-11-30 stsp if (treeobj1)
345 789689b5 2017-11-30 stsp got_object_close(treeobj1);
346 789689b5 2017-11-30 stsp if (treeobj2)
347 789689b5 2017-11-30 stsp got_object_close(treeobj2);
348 789689b5 2017-11-30 stsp return err;
351 474b4f94 2017-11-30 stsp static const struct got_error *
352 f6861a81 2018-09-13 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
353 df2871d2 2018-10-18 stsp int diff_context, struct got_repository *repo, FILE *outfile)
355 f6861a81 2018-09-13 stsp const struct got_error *err;
356 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
357 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
359 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
363 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
364 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
368 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
372 df2871d2 2018-10-18 stsp err = got_diff_tree(tree, NULL, label, NULL, diff_context, repo,
376 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
377 2c56f2ce 2017-11-30 stsp if (treeobj)
378 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
379 2c56f2ce 2017-11-30 stsp return err;
382 474b4f94 2017-11-30 stsp static const struct got_error *
383 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
384 f6861a81 2018-09-13 stsp const char *label1, const char *label2, FILE *outfile)
386 013404a9 2017-11-30 stsp /* XXX TODO */
387 474b4f94 2017-11-30 stsp return NULL;
390 474b4f94 2017-11-30 stsp static const struct got_error *
391 f6861a81 2018-09-13 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_entry *te2,
392 df2871d2 2018-10-18 stsp const char *label1, const char *label2, int diff_context,
393 df2871d2 2018-10-18 stsp struct got_repository *repo, FILE *outfile)
395 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
396 19ae6da1 2018-11-05 stsp int id_match;
398 474b4f94 2017-11-30 stsp if (te2 == NULL) {
399 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
400 df2871d2 2018-10-18 stsp err = diff_deleted_tree(te1->id, label1, diff_context,
401 df2871d2 2018-10-18 stsp repo, outfile);
403 df2871d2 2018-10-18 stsp err = diff_deleted_blob(te1->id, label1, diff_context,
404 df2871d2 2018-10-18 stsp repo, outfile);
405 f6861a81 2018-09-13 stsp return err;
408 19ae6da1 2018-11-05 stsp id_match = (got_object_id_cmp(te1->id, te2->id) == 0);
409 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
410 19ae6da1 2018-11-05 stsp if (!id_match)
411 f6861a81 2018-09-13 stsp return diff_modified_tree(te1->id, te2->id,
412 df2871d2 2018-10-18 stsp label1, label2, diff_context, repo, outfile);
413 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
414 19ae6da1 2018-11-05 stsp if (!id_match)
415 f6861a81 2018-09-13 stsp return diff_modified_blob(te1->id, te2->id,
416 df2871d2 2018-10-18 stsp label1, label2, diff_context, repo, outfile);
419 19ae6da1 2018-11-05 stsp if (id_match)
420 f6861a81 2018-09-13 stsp return NULL;
422 f6861a81 2018-09-13 stsp return diff_kind_mismatch(te1->id, te2->id, label1, label2, outfile);
425 474b4f94 2017-11-30 stsp static const struct got_error *
426 f6861a81 2018-09-13 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_entry *te1,
427 df2871d2 2018-10-18 stsp const char *label2, int diff_context, struct got_repository *repo,
428 df2871d2 2018-10-18 stsp FILE *outfile)
430 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
431 f6861a81 2018-09-13 stsp return NULL;
433 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
434 df2871d2 2018-10-18 stsp return diff_added_tree(te2->id, label2, diff_context, repo,
437 df2871d2 2018-10-18 stsp return diff_added_blob(te2->id, label2, diff_context, repo, outfile);
440 474b4f94 2017-11-30 stsp const struct got_error *
441 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
442 df2871d2 2018-10-18 stsp const char *label1, const char *label2, int diff_context,
443 df2871d2 2018-10-18 stsp struct got_repository *repo, FILE *outfile)
445 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
446 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
447 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
448 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
450 883f0469 2018-06-23 stsp if (tree1) {
451 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
452 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree1);
453 883f0469 2018-06-23 stsp te1 = SIMPLEQ_FIRST(&entries->head);
454 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
455 f6861a81 2018-09-13 stsp te1->name) == -1)
456 f6861a81 2018-09-13 stsp return got_error_from_errno();
458 883f0469 2018-06-23 stsp if (tree2) {
459 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
460 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree2);
461 883f0469 2018-06-23 stsp te2 = SIMPLEQ_FIRST(&entries->head);
462 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
463 f6861a81 2018-09-13 stsp te2->name) == -1)
464 f6861a81 2018-09-13 stsp return got_error_from_errno();
469 f6861a81 2018-09-13 stsp struct got_tree_entry *te = NULL;
471 f6861a81 2018-09-13 stsp te = match_entry_by_name(te1, tree2);
475 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
476 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
477 f6861a81 2018-09-13 stsp return got_error_from_errno();
479 df2871d2 2018-10-18 stsp err = diff_entry_old_new(te1, te, l1, l2, diff_context,
480 df2871d2 2018-10-18 stsp repo, outfile);
486 f6861a81 2018-09-13 stsp struct got_tree_entry *te = NULL;
488 f6861a81 2018-09-13 stsp te = match_entry_by_name(te2, tree1);
489 df2871d2 2018-10-18 stsp err = diff_entry_new_old(te2, te, l2, diff_context,
490 df2871d2 2018-10-18 stsp repo, outfile);
498 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
500 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
501 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
502 f6861a81 2018-09-13 stsp return got_error_from_errno();
507 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
509 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
510 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
511 f6861a81 2018-09-13 stsp return got_error_from_errno();
513 474b4f94 2017-11-30 stsp } while (te1 || te2);
515 11528a82 2018-05-19 stsp return err;
518 11528a82 2018-05-19 stsp const struct got_error *
519 11528a82 2018-05-19 stsp got_diff_objects_as_blobs(struct got_object *obj1, struct got_object *obj2,
520 df2871d2 2018-10-18 stsp const char *label1, const char *label2, int diff_context,
521 df2871d2 2018-10-18 stsp struct got_repository *repo, FILE *outfile)
523 11528a82 2018-05-19 stsp const struct got_error *err;
524 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
526 b74c7625 2018-05-20 stsp if (obj1 == NULL && obj2 == NULL)
527 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
529 cd0acaa7 2018-05-20 stsp if (obj1) {
530 cd0acaa7 2018-05-20 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
534 cd0acaa7 2018-05-20 stsp if (obj2) {
535 cd0acaa7 2018-05-20 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
539 df2871d2 2018-10-18 stsp err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
543 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
545 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
546 474b4f94 2017-11-30 stsp return err;
549 11528a82 2018-05-19 stsp const struct got_error *
550 11528a82 2018-05-19 stsp got_diff_objects_as_trees(struct got_object *obj1, struct got_object *obj2,
551 df2871d2 2018-10-18 stsp char *label1, char *label2, int diff_context, struct got_repository *repo,
552 df2871d2 2018-10-18 stsp FILE *outfile)
554 11528a82 2018-05-19 stsp const struct got_error *err;
555 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
557 b74c7625 2018-05-20 stsp if (obj1 == NULL && obj2 == NULL)
558 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
560 cd0acaa7 2018-05-20 stsp if (obj1) {
561 cd0acaa7 2018-05-20 stsp err = got_object_tree_open(&tree1, repo, obj1);
565 cd0acaa7 2018-05-20 stsp if (obj2) {
566 cd0acaa7 2018-05-20 stsp err = got_object_tree_open(&tree2, repo, obj2);
570 df2871d2 2018-10-18 stsp err = got_diff_tree(tree1, tree2, label1, label2, diff_context,
571 df2871d2 2018-10-18 stsp repo, outfile);
574 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
576 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
577 11528a82 2018-05-19 stsp return err;
580 4bb494d5 2018-06-16 stsp static char *
581 4bb494d5 2018-06-16 stsp get_datestr(time_t *time, char *datebuf)
583 4bb494d5 2018-06-16 stsp char *p, *s = ctime_r(time, datebuf);
584 4bb494d5 2018-06-16 stsp p = strchr(s, '\n');
590 11528a82 2018-05-19 stsp const struct got_error *
591 11528a82 2018-05-19 stsp got_diff_objects_as_commits(struct got_object *obj1, struct got_object *obj2,
592 df2871d2 2018-10-18 stsp int diff_context, struct got_repository *repo, FILE *outfile)
594 11528a82 2018-05-19 stsp const struct got_error *err;
595 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
596 11528a82 2018-05-19 stsp struct got_object *tree_obj1 = NULL, *tree_obj2 = NULL;
597 9b697879 2018-05-20 stsp char *id_str;
598 4bb494d5 2018-06-16 stsp char datebuf[26];
600 9b697879 2018-05-20 stsp if (obj2 == NULL)
601 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
603 cd0acaa7 2018-05-20 stsp if (obj1) {
604 cd0acaa7 2018-05-20 stsp err = got_object_commit_open(&commit1, repo, obj1);
607 cd0acaa7 2018-05-20 stsp err = got_object_open(&tree_obj1, repo, commit1->tree_id);
612 9b697879 2018-05-20 stsp err = got_object_commit_open(&commit2, repo, obj2);
615 9b697879 2018-05-20 stsp err = got_object_open(&tree_obj2, repo, commit2->tree_id);
618 9b697879 2018-05-20 stsp err = got_object_get_id_str(&id_str, obj2);
621 9fc8d6a2 2018-05-20 stsp if (fprintf(outfile, "commit: %s\n", id_str) < 0) {
622 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
623 9fc8d6a2 2018-05-20 stsp free(id_str);
626 9b697879 2018-05-20 stsp free(id_str);
627 dab5fe87 2018-09-14 stsp if (fprintf(outfile, "from: %s\n", commit2->author) < 0) {
628 dab5fe87 2018-09-14 stsp err = got_error_from_errno();
631 dab5fe87 2018-09-14 stsp if (fprintf(outfile, "date: %s UTC\n",
632 ccb26ccd 2018-11-05 stsp get_datestr(&commit2->committer_time, datebuf)) < 0) {
633 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
636 9fc8d6a2 2018-05-20 stsp if (strcmp(commit2->author, commit2->committer) != 0 &&
637 0dcf3e9c 2018-09-15 stsp fprintf(outfile, "via: %s\n", commit2->committer) < 0) {
638 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
641 ede67fd9 2018-07-10 stsp if (fprintf(outfile, "%s\n", commit2->logmsg) < 0) {
642 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
646 df2871d2 2018-10-18 stsp err = got_diff_objects_as_trees(tree_obj1, tree_obj2, "", "",
647 df2871d2 2018-10-18 stsp diff_context, repo, outfile);
649 11528a82 2018-05-19 stsp if (tree_obj1)
650 11528a82 2018-05-19 stsp got_object_close(tree_obj1);
651 11528a82 2018-05-19 stsp if (tree_obj2)
652 11528a82 2018-05-19 stsp got_object_close(tree_obj2);
653 11528a82 2018-05-19 stsp if (commit1)
654 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
655 11528a82 2018-05-19 stsp if (commit2)
656 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
657 11528a82 2018-05-19 stsp return err;
