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 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 404c43c4 2018-06-21 stsp const char *label1, const char *label2, FILE *outfile)
122 404c43c4 2018-06-21 stsp return diff_blobs(blob1, blob2, label1, label2, outfile, NULL);
125 404c43c4 2018-06-21 stsp const struct got_error *
126 404c43c4 2018-06-21 stsp got_diff_blob_lines_changed(struct got_diff_changes **changes,
127 404c43c4 2018-06-21 stsp struct got_blob_object *blob1, struct got_blob_object *blob2)
129 404c43c4 2018-06-21 stsp const struct got_error *err = NULL;
131 404c43c4 2018-06-21 stsp *changes = calloc(1, sizeof(**changes));
132 404c43c4 2018-06-21 stsp if (*changes == NULL)
133 404c43c4 2018-06-21 stsp return got_error_from_errno();
134 404c43c4 2018-06-21 stsp SIMPLEQ_INIT(&(*changes)->entries);
136 404c43c4 2018-06-21 stsp err = diff_blobs(blob1, blob2, NULL, NULL, NULL, *changes);
138 404c43c4 2018-06-21 stsp got_diff_free_changes(*changes);
139 404c43c4 2018-06-21 stsp *changes = NULL;
141 404c43c4 2018-06-21 stsp return err;
145 404c43c4 2018-06-21 stsp got_diff_free_changes(struct got_diff_changes *changes)
147 404c43c4 2018-06-21 stsp struct got_diff_change *change;
148 404c43c4 2018-06-21 stsp while (!SIMPLEQ_EMPTY(&changes->entries)) {
149 404c43c4 2018-06-21 stsp change = SIMPLEQ_FIRST(&changes->entries);
150 404c43c4 2018-06-21 stsp SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
151 404c43c4 2018-06-21 stsp free(change);
153 404c43c4 2018-06-21 stsp free(changes);
156 a3e2cbea 2017-12-01 stsp struct got_tree_entry *
157 a3e2cbea 2017-12-01 stsp match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
159 a3e2cbea 2017-12-01 stsp struct got_tree_entry *te2;
160 883f0469 2018-06-23 stsp const struct got_tree_entries *entries2;
162 883f0469 2018-06-23 stsp entries2 = got_object_tree_get_entries(tree2);
163 883f0469 2018-06-23 stsp SIMPLEQ_FOREACH(te2, &entries2->head, entry) {
164 a3e2cbea 2017-12-01 stsp if (strcmp(te1->name, te2->name) == 0)
165 a3e2cbea 2017-12-01 stsp return te2;
167 474b4f94 2017-11-30 stsp return NULL;
170 474b4f94 2017-11-30 stsp static const struct got_error *
171 f6861a81 2018-09-13 stsp diff_added_blob(struct got_object_id *id, const char *label,
172 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
174 4e22badc 2017-11-30 stsp const struct got_error *err;
175 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
176 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
178 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
180 4e22badc 2017-11-30 stsp return err;
182 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
185 f6861a81 2018-09-13 stsp err = got_diff_blob(NULL, blob, NULL, label, outfile);
187 2acfca77 2018-04-01 stsp got_object_close(obj);
189 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
190 2acfca77 2018-04-01 stsp return err;
193 474b4f94 2017-11-30 stsp static const struct got_error *
194 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
195 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
196 f6861a81 2018-09-13 stsp FILE *outfile)
198 6a213ccb 2017-11-30 stsp const struct got_error *err;
199 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
200 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
201 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
202 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
204 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
206 730a8aa0 2018-04-24 stsp return err;
207 eef6493a 2018-01-19 stsp if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
208 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
212 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
215 eef6493a 2018-01-19 stsp if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
216 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
220 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
224 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
228 f6861a81 2018-09-13 stsp err = got_diff_blob(blob1, blob2, label1, label2, outfile);
232 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
234 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
236 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
238 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
239 6a213ccb 2017-11-30 stsp return err;
242 474b4f94 2017-11-30 stsp static const struct got_error *
243 f6861a81 2018-09-13 stsp diff_deleted_blob(struct got_object_id *id, const char *label,
244 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
246 365fb436 2017-11-30 stsp const struct got_error *err;
247 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
248 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
250 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
252 365fb436 2017-11-30 stsp return err;
254 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
257 f6861a81 2018-09-13 stsp err = got_diff_blob(blob, NULL, label, NULL, outfile);
259 2acfca77 2018-04-01 stsp got_object_close(obj);
261 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
262 2acfca77 2018-04-01 stsp return err;
265 474b4f94 2017-11-30 stsp static const struct got_error *
266 f6861a81 2018-09-13 stsp diff_added_tree(struct got_object_id *id, const char *label,
267 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
269 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
270 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
271 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
273 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
277 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
278 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
282 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
286 f6861a81 2018-09-13 stsp err = got_diff_tree(NULL, tree, NULL, label, repo, outfile);
290 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
291 9c70d4c3 2017-11-30 stsp if (treeobj)
292 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
293 9c70d4c3 2017-11-30 stsp return err;
296 474b4f94 2017-11-30 stsp static const struct got_error *
297 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
298 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
299 f6861a81 2018-09-13 stsp FILE *outfile)
301 f6861a81 2018-09-13 stsp const struct got_error *err;
302 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
303 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
304 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
305 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
307 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
311 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
312 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
316 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
320 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
321 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
325 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
329 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
333 f6861a81 2018-09-13 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, outfile);
337 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
339 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
340 789689b5 2017-11-30 stsp if (treeobj1)
341 789689b5 2017-11-30 stsp got_object_close(treeobj1);
342 789689b5 2017-11-30 stsp if (treeobj2)
343 789689b5 2017-11-30 stsp got_object_close(treeobj2);
344 789689b5 2017-11-30 stsp return err;
347 474b4f94 2017-11-30 stsp static const struct got_error *
348 f6861a81 2018-09-13 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
349 f6861a81 2018-09-13 stsp struct got_repository *repo, FILE *outfile)
351 f6861a81 2018-09-13 stsp const struct got_error *err;
352 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
353 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
355 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
359 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
360 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
364 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
368 f6861a81 2018-09-13 stsp err = got_diff_tree(tree, NULL, label, NULL, repo, outfile);
371 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
372 2c56f2ce 2017-11-30 stsp if (treeobj)
373 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
374 2c56f2ce 2017-11-30 stsp return err;
377 474b4f94 2017-11-30 stsp static const struct got_error *
378 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
379 f6861a81 2018-09-13 stsp const char *label1, const char *label2, FILE *outfile)
381 013404a9 2017-11-30 stsp /* XXX TODO */
382 474b4f94 2017-11-30 stsp return NULL;
385 474b4f94 2017-11-30 stsp static const struct got_error *
386 f6861a81 2018-09-13 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_entry *te2,
387 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
388 f6861a81 2018-09-13 stsp FILE *outfile)
390 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
392 474b4f94 2017-11-30 stsp if (te2 == NULL) {
393 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
394 f6861a81 2018-09-13 stsp err = diff_deleted_tree(te1->id, label1, repo, outfile);
396 f6861a81 2018-09-13 stsp err = diff_deleted_blob(te1->id, label1, repo, outfile);
397 f6861a81 2018-09-13 stsp return err;
400 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
401 59ece79d 2018-02-12 stsp if (got_object_id_cmp(te1->id, te2->id) != 0)
402 f6861a81 2018-09-13 stsp return diff_modified_tree(te1->id, te2->id,
403 f6861a81 2018-09-13 stsp label1, label2, repo, outfile);
404 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
405 59ece79d 2018-02-12 stsp if (got_object_id_cmp(te1->id, te2->id) != 0)
406 f6861a81 2018-09-13 stsp return diff_modified_blob(te1->id, te2->id,
407 f6861a81 2018-09-13 stsp label1, label2, repo, outfile);
410 f6861a81 2018-09-13 stsp if (got_object_id_cmp(te1->id, te2->id) == 0)
411 f6861a81 2018-09-13 stsp return NULL;
413 f6861a81 2018-09-13 stsp return diff_kind_mismatch(te1->id, te2->id, label1, label2, outfile);
416 474b4f94 2017-11-30 stsp static const struct got_error *
417 f6861a81 2018-09-13 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_entry *te1,
418 f6861a81 2018-09-13 stsp const char *label2, struct got_repository *repo, FILE *outfile)
420 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
421 f6861a81 2018-09-13 stsp return NULL;
423 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
424 f6861a81 2018-09-13 stsp return diff_added_tree(te2->id, label2, repo, outfile);
426 f6861a81 2018-09-13 stsp return diff_added_blob(te2->id, label2, repo, outfile);
429 474b4f94 2017-11-30 stsp const struct got_error *
430 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
431 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
432 f6861a81 2018-09-13 stsp FILE *outfile)
434 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
435 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
436 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
437 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
439 883f0469 2018-06-23 stsp if (tree1) {
440 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
441 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree1);
442 883f0469 2018-06-23 stsp te1 = SIMPLEQ_FIRST(&entries->head);
443 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
444 f6861a81 2018-09-13 stsp te1->name) == -1)
445 f6861a81 2018-09-13 stsp return got_error_from_errno();
447 883f0469 2018-06-23 stsp if (tree2) {
448 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
449 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree2);
450 883f0469 2018-06-23 stsp te2 = SIMPLEQ_FIRST(&entries->head);
451 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
452 f6861a81 2018-09-13 stsp te2->name) == -1)
453 f6861a81 2018-09-13 stsp return got_error_from_errno();
458 f6861a81 2018-09-13 stsp struct got_tree_entry *te = NULL;
460 f6861a81 2018-09-13 stsp te = match_entry_by_name(te1, tree2);
464 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
465 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
466 f6861a81 2018-09-13 stsp return got_error_from_errno();
468 f6861a81 2018-09-13 stsp err = diff_entry_old_new(te1, te, l1, l2, repo,
475 f6861a81 2018-09-13 stsp struct got_tree_entry *te = NULL;
477 f6861a81 2018-09-13 stsp te = match_entry_by_name(te2, tree1);
478 f6861a81 2018-09-13 stsp err = diff_entry_new_old(te2, te, l2, repo, outfile);
486 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
488 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
489 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
490 f6861a81 2018-09-13 stsp return got_error_from_errno();
495 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
497 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
498 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
499 f6861a81 2018-09-13 stsp return got_error_from_errno();
501 474b4f94 2017-11-30 stsp } while (te1 || te2);
503 11528a82 2018-05-19 stsp return err;
506 11528a82 2018-05-19 stsp const struct got_error *
507 11528a82 2018-05-19 stsp got_diff_objects_as_blobs(struct got_object *obj1, struct got_object *obj2,
508 f6861a81 2018-09-13 stsp const char *label1, const char *label2, struct got_repository *repo,
509 f6861a81 2018-09-13 stsp FILE *outfile)
511 11528a82 2018-05-19 stsp const struct got_error *err;
512 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
514 b74c7625 2018-05-20 stsp if (obj1 == NULL && obj2 == NULL)
515 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
517 cd0acaa7 2018-05-20 stsp if (obj1) {
518 cd0acaa7 2018-05-20 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
522 cd0acaa7 2018-05-20 stsp if (obj2) {
523 cd0acaa7 2018-05-20 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
527 f6861a81 2018-09-13 stsp err = got_diff_blob(blob1, blob2, label1, label2, outfile);
530 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
532 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
533 474b4f94 2017-11-30 stsp return err;
536 11528a82 2018-05-19 stsp const struct got_error *
537 11528a82 2018-05-19 stsp got_diff_objects_as_trees(struct got_object *obj1, struct got_object *obj2,
538 f6861a81 2018-09-13 stsp char *label1, char *label2, struct got_repository *repo, FILE *outfile)
540 11528a82 2018-05-19 stsp const struct got_error *err;
541 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
543 b74c7625 2018-05-20 stsp if (obj1 == NULL && obj2 == NULL)
544 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
546 cd0acaa7 2018-05-20 stsp if (obj1) {
547 cd0acaa7 2018-05-20 stsp err = got_object_tree_open(&tree1, repo, obj1);
551 cd0acaa7 2018-05-20 stsp if (obj2) {
552 cd0acaa7 2018-05-20 stsp err = got_object_tree_open(&tree2, repo, obj2);
556 f6861a81 2018-09-13 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, outfile);
559 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
561 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
562 11528a82 2018-05-19 stsp return err;
565 4bb494d5 2018-06-16 stsp static char *
566 4bb494d5 2018-06-16 stsp get_datestr(time_t *time, char *datebuf)
568 4bb494d5 2018-06-16 stsp char *p, *s = ctime_r(time, datebuf);
569 4bb494d5 2018-06-16 stsp p = strchr(s, '\n');
575 11528a82 2018-05-19 stsp const struct got_error *
576 11528a82 2018-05-19 stsp got_diff_objects_as_commits(struct got_object *obj1, struct got_object *obj2,
577 11528a82 2018-05-19 stsp struct got_repository *repo, FILE *outfile)
579 11528a82 2018-05-19 stsp const struct got_error *err;
580 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
581 11528a82 2018-05-19 stsp struct got_object *tree_obj1 = NULL, *tree_obj2 = NULL;
582 9b697879 2018-05-20 stsp char *id_str;
583 4bb494d5 2018-06-16 stsp char datebuf[26];
584 4bb494d5 2018-06-16 stsp time_t time;
586 9b697879 2018-05-20 stsp if (obj2 == NULL)
587 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
589 cd0acaa7 2018-05-20 stsp if (obj1) {
590 cd0acaa7 2018-05-20 stsp err = got_object_commit_open(&commit1, repo, obj1);
593 cd0acaa7 2018-05-20 stsp err = got_object_open(&tree_obj1, repo, commit1->tree_id);
598 9b697879 2018-05-20 stsp err = got_object_commit_open(&commit2, repo, obj2);
601 9b697879 2018-05-20 stsp err = got_object_open(&tree_obj2, repo, commit2->tree_id);
604 9b697879 2018-05-20 stsp err = got_object_get_id_str(&id_str, obj2);
607 9fc8d6a2 2018-05-20 stsp if (fprintf(outfile, "commit: %s\n", id_str) < 0) {
608 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
609 9fc8d6a2 2018-05-20 stsp free(id_str);
612 9b697879 2018-05-20 stsp free(id_str);
613 dab5fe87 2018-09-14 stsp if (fprintf(outfile, "from: %s\n", commit2->author) < 0) {
614 dab5fe87 2018-09-14 stsp err = got_error_from_errno();
617 0dcf3e9c 2018-09-15 stsp time = mktime(&commit2->tm_committer);
618 dab5fe87 2018-09-14 stsp if (fprintf(outfile, "date: %s UTC\n",
619 4bb494d5 2018-06-16 stsp get_datestr(&time, datebuf)) < 0) {
620 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
623 9fc8d6a2 2018-05-20 stsp if (strcmp(commit2->author, commit2->committer) != 0 &&
624 0dcf3e9c 2018-09-15 stsp fprintf(outfile, "via: %s\n", commit2->committer) < 0) {
625 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
628 ede67fd9 2018-07-10 stsp if (fprintf(outfile, "%s\n", commit2->logmsg) < 0) {
629 9fc8d6a2 2018-05-20 stsp err = got_error_from_errno();
633 f6861a81 2018-09-13 stsp err = got_diff_objects_as_trees(tree_obj1, tree_obj2, "", "", repo,
636 11528a82 2018-05-19 stsp if (tree_obj1)
637 11528a82 2018-05-19 stsp got_object_close(tree_obj1);
638 11528a82 2018-05-19 stsp if (tree_obj2)
639 11528a82 2018-05-19 stsp got_object_close(tree_obj2);
640 11528a82 2018-05-19 stsp if (commit1)
641 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
642 11528a82 2018-05-19 stsp if (commit2)
643 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
644 11528a82 2018-05-19 stsp return err;
