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 404c43c4 2018-06-21 stsp const char *label1, const char *label2, 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 c2c21d46 2018-03-27 stsp args.diff_context = 3;
102 84eb021e 2018-03-27 stsp flags |= D_PROTOTYPE;
104 404c43c4 2018-06-21 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
107 98abbc84 2017-11-30 stsp fclose(f1);
109 98abbc84 2017-11-30 stsp fclose(f2);
110 7d283eee 2017-11-29 stsp return err;
113 404c43c4 2018-06-21 stsp const struct got_error *
114 404c43c4 2018-06-21 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
115 404c43c4 2018-06-21 stsp const char *label1, const char *label2, FILE *outfile)
117 404c43c4 2018-06-21 stsp return diff_blobs(blob1, blob2, label1, label2, outfile, NULL);
120 404c43c4 2018-06-21 stsp const struct got_error *
121 404c43c4 2018-06-21 stsp got_diff_blob_lines_changed(struct got_diff_changes **changes,
122 404c43c4 2018-06-21 stsp struct got_blob_object *blob1, struct got_blob_object *blob2)
124 404c43c4 2018-06-21 stsp const struct got_error *err = NULL;
126 404c43c4 2018-06-21 stsp *changes = calloc(1, sizeof(**changes));
127 404c43c4 2018-06-21 stsp if (*changes == NULL)
128 404c43c4 2018-06-21 stsp return got_error_from_errno();
129 404c43c4 2018-06-21 stsp SIMPLEQ_INIT(&(*changes)->entries);
131 404c43c4 2018-06-21 stsp err = diff_blobs(blob1, blob2, NULL, NULL, NULL, *changes);
133 404c43c4 2018-06-21 stsp got_diff_free_changes(*changes);
134 404c43c4 2018-06-21 stsp *changes = NULL;
136 404c43c4 2018-06-21 stsp return err;
140 404c43c4 2018-06-21 stsp got_diff_free_changes(struct got_diff_changes *changes)
142 404c43c4 2018-06-21 stsp struct got_diff_change *change;
143 404c43c4 2018-06-21 stsp while (!SIMPLEQ_EMPTY(&changes->entries)) {
144 404c43c4 2018-06-21 stsp change = SIMPLEQ_FIRST(&changes->entries);
145 404c43c4 2018-06-21 stsp SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
146 404c43c4 2018-06-21 stsp free(change);
148 404c43c4 2018-06-21 stsp free(changes);
151 a3e2cbea 2017-12-01 stsp struct got_tree_entry *
152 a3e2cbea 2017-12-01 stsp match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
154 a3e2cbea 2017-12-01 stsp struct got_tree_entry *te2;
155 883f0469 2018-06-23 stsp const struct got_tree_entries *entries2;
157 883f0469 2018-06-23 stsp entries2 = got_object_tree_get_entries(tree2);
158 883f0469 2018-06-23 stsp SIMPLEQ_FOREACH(te2, &entries2->head, entry) {
159 a3e2cbea 2017-12-01 stsp if (strcmp(te1->name, te2->name) == 0)
160 a3e2cbea 2017-12-01 stsp return te2;
162 474b4f94 2017-11-30 stsp return NULL;
165 474b4f94 2017-11-30 stsp static const struct got_error *
166 f6861a81 2018-09-13 stsp diff_added_blob(struct got_object_id *id, const char *label,
167 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
169 4e22badc 2017-11-30 stsp const struct got_error *err;
170 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
171 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
173 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
175 4e22badc 2017-11-30 stsp return err;
177 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
180 f6861a81 2018-09-13 stsp err = got_diff_blob(NULL, blob, NULL, label, outfile);
182 2acfca77 2018-04-01 stsp got_object_close(obj);
184 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
185 2acfca77 2018-04-01 stsp return err;
188 474b4f94 2017-11-30 stsp static const struct got_error *
189 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
190 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
191 f6861a81 2018-09-13 stsp FILE *outfile)
193 6a213ccb 2017-11-30 stsp const struct got_error *err;
194 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
195 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
196 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
197 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
199 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
201 730a8aa0 2018-04-24 stsp return err;
202 eef6493a 2018-01-19 stsp if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
203 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
207 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
210 eef6493a 2018-01-19 stsp if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
211 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
215 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
219 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
223 f6861a81 2018-09-13 stsp err = got_diff_blob(blob1, blob2, label1, label2, outfile);
227 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
229 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
231 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
233 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
234 6a213ccb 2017-11-30 stsp return err;
237 474b4f94 2017-11-30 stsp static const struct got_error *
238 f6861a81 2018-09-13 stsp diff_deleted_blob(struct got_object_id *id, const char *label,
239 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
241 365fb436 2017-11-30 stsp const struct got_error *err;
242 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
243 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
245 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
247 365fb436 2017-11-30 stsp return err;
249 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
252 f6861a81 2018-09-13 stsp err = got_diff_blob(blob, NULL, label, NULL, outfile);
254 2acfca77 2018-04-01 stsp got_object_close(obj);
256 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
257 2acfca77 2018-04-01 stsp return err;
260 474b4f94 2017-11-30 stsp static const struct got_error *
261 f6861a81 2018-09-13 stsp diff_added_tree(struct got_object_id *id, const char *label,
262 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
264 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
265 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
266 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
268 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
272 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
273 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
277 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
281 f6861a81 2018-09-13 stsp err = got_diff_tree(NULL, tree, NULL, label, repo, outfile);
285 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
286 9c70d4c3 2017-11-30 stsp if (treeobj)
287 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
288 9c70d4c3 2017-11-30 stsp return err;
291 474b4f94 2017-11-30 stsp static const struct got_error *
292 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
293 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
294 f6861a81 2018-09-13 stsp FILE *outfile)
296 f6861a81 2018-09-13 stsp const struct got_error *err;
297 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
298 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
299 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
300 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
302 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
306 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
307 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
311 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
315 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
316 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
320 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
324 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
328 f6861a81 2018-09-13 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, outfile);
332 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
334 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
335 789689b5 2017-11-30 stsp if (treeobj1)
336 789689b5 2017-11-30 stsp got_object_close(treeobj1);
337 789689b5 2017-11-30 stsp if (treeobj2)
338 789689b5 2017-11-30 stsp got_object_close(treeobj2);
339 789689b5 2017-11-30 stsp return err;
342 474b4f94 2017-11-30 stsp static const struct got_error *
343 f6861a81 2018-09-13 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
344 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
346 f6861a81 2018-09-13 stsp const struct got_error *err;
347 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
348 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
350 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
354 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
355 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
359 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
363 f6861a81 2018-09-13 stsp err = got_diff_tree(tree, NULL, label, NULL, repo, outfile);
366 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
367 2c56f2ce 2017-11-30 stsp if (treeobj)
368 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
369 2c56f2ce 2017-11-30 stsp return err;
372 474b4f94 2017-11-30 stsp static const struct got_error *
373 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
374 f6861a81 2018-09-13 stsp const char *label1, const char *label2, FILE *outfile)
376 013404a9 2017-11-30 stsp /* XXX TODO */
377 474b4f94 2017-11-30 stsp return NULL;
380 474b4f94 2017-11-30 stsp static const struct got_error *
381 f6861a81 2018-09-13 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_entry *te2,
382 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
383 f6861a81 2018-09-13 stsp FILE *outfile)
385 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
387 474b4f94 2017-11-30 stsp if (te2 == NULL) {
388 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
389 f6861a81 2018-09-13 stsp err = diff_deleted_tree(te1->id, label1, repo, outfile);
391 f6861a81 2018-09-13 stsp err = diff_deleted_blob(te1->id, label1, repo, outfile);
392 f6861a81 2018-09-13 stsp return err;
395 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
396 59ece79d 2018-02-12 stsp if (got_object_id_cmp(te1->id, te2->id) != 0)
397 f6861a81 2018-09-13 stsp return diff_modified_tree(te1->id, te2->id,
398 f6861a81 2018-09-13 stsp label1, label2, repo, outfile);
399 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
400 59ece79d 2018-02-12 stsp if (got_object_id_cmp(te1->id, te2->id) != 0)
401 f6861a81 2018-09-13 stsp return diff_modified_blob(te1->id, te2->id,
402 f6861a81 2018-09-13 stsp label1, label2, repo, outfile);
405 f6861a81 2018-09-13 stsp if (got_object_id_cmp(te1->id, te2->id) == 0)
406 f6861a81 2018-09-13 stsp return NULL;
408 f6861a81 2018-09-13 stsp return diff_kind_mismatch(te1->id, te2->id, label1, label2, outfile);
411 474b4f94 2017-11-30 stsp static const struct got_error *
412 f6861a81 2018-09-13 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_entry *te1,
413 f6861a81 2018-09-13 stsp const char *label2, struct got_repository *repo, FILE *outfile)
415 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
416 f6861a81 2018-09-13 stsp return NULL;
418 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
419 f6861a81 2018-09-13 stsp return diff_added_tree(te2->id, label2, repo, outfile);
421 f6861a81 2018-09-13 stsp return diff_added_blob(te2->id, label2, repo, outfile);
424 474b4f94 2017-11-30 stsp const struct got_error *
425 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
426 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
427 f6861a81 2018-09-13 stsp FILE *outfile)
429 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
430 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
431 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
432 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
434 883f0469 2018-06-23 stsp if (tree1) {
435 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
436 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree1);
437 883f0469 2018-06-23 stsp te1 = SIMPLEQ_FIRST(&entries->head);
438 f6861a81 2018-09-13 stsp if (asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
439 f6861a81 2018-09-13 stsp te1->name) == -1)
440 f6861a81 2018-09-13 stsp return got_error_from_errno();
442 883f0469 2018-06-23 stsp if (tree2) {
443 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
444 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree2);
445 883f0469 2018-06-23 stsp te2 = SIMPLEQ_FIRST(&entries->head);
446 f6861a81 2018-09-13 stsp if (asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
447 f6861a81 2018-09-13 stsp te2->name) == -1)
448 f6861a81 2018-09-13 stsp return got_error_from_errno();
453 f6861a81 2018-09-13 stsp struct got_tree_entry *te = NULL;
455 f6861a81 2018-09-13 stsp te = match_entry_by_name(te1, tree2);
459 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
460 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
461 f6861a81 2018-09-13 stsp return got_error_from_errno();
463 f6861a81 2018-09-13 stsp err = diff_entry_old_new(te1, te, l1, l2, repo,
470 f6861a81 2018-09-13 stsp struct got_tree_entry *te = NULL;
472 f6861a81 2018-09-13 stsp te = match_entry_by_name(te2, tree1);
473 f6861a81 2018-09-13 stsp err = diff_entry_new_old(te2, te, l2, repo, outfile);
481 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
483 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
484 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
485 f6861a81 2018-09-13 stsp return got_error_from_errno();
490 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
492 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
493 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
494 f6861a81 2018-09-13 stsp return got_error_from_errno();
496 474b4f94 2017-11-30 stsp } while (te1 || te2);
498 11528a82 2018-05-19 stsp return err;
501 11528a82 2018-05-19 stsp const struct got_error *
502 11528a82 2018-05-19 stsp got_diff_objects_as_blobs(struct got_object *obj1, struct got_object *obj2,
503 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
504 f6861a81 2018-09-13 stsp FILE *outfile)
506 11528a82 2018-05-19 stsp const struct got_error *err;
507 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
509 b74c7625 2018-05-20 stsp if (obj1 == NULL && obj2 == NULL)
510 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
512 cd0acaa7 2018-05-20 stsp if (obj1) {
513 cd0acaa7 2018-05-20 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
517 cd0acaa7 2018-05-20 stsp if (obj2) {
518 cd0acaa7 2018-05-20 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
522 f6861a81 2018-09-13 stsp err = got_diff_blob(blob1, blob2, label1, label2, outfile);
525 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
527 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
528 474b4f94 2017-11-30 stsp return err;
531 11528a82 2018-05-19 stsp const struct got_error *
532 11528a82 2018-05-19 stsp got_diff_objects_as_trees(struct got_object *obj1, struct got_object *obj2,
533 f6861a81 2018-09-13 stsp char *label1, char *label2, struct got_repository *repo, FILE *outfile)
535 11528a82 2018-05-19 stsp const struct got_error *err;
536 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
538 b74c7625 2018-05-20 stsp if (obj1 == NULL && obj2 == NULL)
539 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
541 cd0acaa7 2018-05-20 stsp if (obj1) {
542 cd0acaa7 2018-05-20 stsp err = got_object_tree_open(&tree1, repo, obj1);
546 cd0acaa7 2018-05-20 stsp if (obj2) {
547 cd0acaa7 2018-05-20 stsp err = got_object_tree_open(&tree2, repo, obj2);
551 f6861a81 2018-09-13 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, outfile);
554 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
556 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
557 11528a82 2018-05-19 stsp return err;
560 4bb494d5 2018-06-16 stsp static char *
561 4bb494d5 2018-06-16 stsp get_datestr(time_t *time, char *datebuf)
563 4bb494d5 2018-06-16 stsp char *p, *s = ctime_r(time, datebuf);
564 4bb494d5 2018-06-16 stsp p = strchr(s, '\n');
570 11528a82 2018-05-19 stsp const struct got_error *
571 11528a82 2018-05-19 stsp got_diff_objects_as_commits(struct got_object *obj1, struct got_object *obj2,
572 11528a82 2018-05-19 stsp struct got_repository *repo, FILE *outfile)
574 11528a82 2018-05-19 stsp const struct got_error *err;
575 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
576 11528a82 2018-05-19 stsp struct got_object *tree_obj1 = NULL, *tree_obj2 = NULL;
577 9b697879 2018-05-20 stsp char *id_str;
578 4bb494d5 2018-06-16 stsp char datebuf[26];
579 4bb494d5 2018-06-16 stsp time_t time;
581 9b697879 2018-05-20 stsp if (obj2 == NULL)
582 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
584 cd0acaa7 2018-05-20 stsp if (obj1) {
585 cd0acaa7 2018-05-20 stsp err = got_object_commit_open(&commit1, repo, obj1);
588 cd0acaa7 2018-05-20 stsp err = got_object_open(&tree_obj1, repo, commit1->tree_id);
593 9b697879 2018-05-20 stsp err = got_object_commit_open(&commit2, repo, obj2);
596 9b697879 2018-05-20 stsp err = got_object_open(&tree_obj2, repo, commit2->tree_id);
599 9b697879 2018-05-20 stsp err = got_object_get_id_str(&id_str, obj2);
602 9fc8d6a2 2018-05-20 stsp if (fprintf(outfile, "commit: %s\n", id_str) < 0) {
603 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
604 9fc8d6a2 2018-05-20 stsp free(id_str);
607 9b697879 2018-05-20 stsp free(id_str);
608 4bb494d5 2018-06-16 stsp time = mktime(&commit2->tm_author);
609 4bb494d5 2018-06-16 stsp if (fprintf(outfile, "author: %s %s UTC\n", commit2->author,
610 4bb494d5 2018-06-16 stsp get_datestr(&time, datebuf)) < 0) {
611 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
614 4bb494d5 2018-06-16 stsp time = mktime(&commit2->tm_committer);
615 9fc8d6a2 2018-05-20 stsp if (strcmp(commit2->author, commit2->committer) != 0 &&
616 4bb494d5 2018-06-16 stsp fprintf(outfile, "committer: %s %s UTC\n", commit2->committer,
617 4bb494d5 2018-06-16 stsp get_datestr(&time, datebuf)) < 0) {
618 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
621 ede67fd9 2018-07-10 stsp if (fprintf(outfile, "%s\n", commit2->logmsg) < 0) {
622 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
626 f6861a81 2018-09-13 stsp err = got_diff_objects_as_trees(tree_obj1, tree_obj2, "", "", repo,
629 11528a82 2018-05-19 stsp if (tree_obj1)
630 11528a82 2018-05-19 stsp got_object_close(tree_obj1);
631 11528a82 2018-05-19 stsp if (tree_obj2)
632 11528a82 2018-05-19 stsp got_object_close(tree_obj2);
633 11528a82 2018-05-19 stsp if (commit1)
634 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
635 11528a82 2018-05-19 stsp if (commit2)
636 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
637 11528a82 2018-05-19 stsp return err;
