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"
32 324d37e7 2019-05-11 stsp #include "got_path.h"
34 718b3ab0 2018-03-17 stsp #include "got_lib_diff.h"
35 15a94983 2018-12-23 stsp #include "got_lib_delta.h"
36 15a94983 2018-12-23 stsp #include "got_lib_inflate.h"
37 15a94983 2018-12-23 stsp #include "got_lib_object.h"
39 404c43c4 2018-06-21 stsp static const struct got_error *
40 404c43c4 2018-06-21 stsp diff_blobs(struct got_blob_object *blob1, struct got_blob_object *blob2,
41 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context, FILE *outfile,
42 54156555 2018-12-24 stsp struct got_diff_changes *changes)
44 ed9e98a8 2017-11-29 stsp struct got_diff_state ds;
45 8ba9a219 2017-11-29 stsp struct got_diff_args args;
46 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
47 4e22badc 2017-11-30 stsp FILE *f1 = NULL, *f2 = NULL;
48 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
49 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
50 98abbc84 2017-11-30 stsp char *idstr1 = NULL, *idstr2 = NULL;
51 f934cf2c 2018-02-12 stsp size_t size1, size2;
52 4e22badc 2017-11-30 stsp int res, flags = 0;
54 4e22badc 2017-11-30 stsp if (blob1) {
55 a1fd68d8 2018-01-12 stsp f1 = got_opentemp();
56 4e22badc 2017-11-30 stsp if (f1 == NULL)
57 638f9024 2019-05-13 stsp return got_error_from_errno("got_opentemp");
59 4e22badc 2017-11-30 stsp flags |= D_EMPTY1;
61 4e22badc 2017-11-30 stsp if (blob2) {
62 a1fd68d8 2018-01-12 stsp f2 = got_opentemp();
63 4e22badc 2017-11-30 stsp if (f2 == NULL) {
64 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
69 4e22badc 2017-11-30 stsp flags |= D_EMPTY2;
72 98abbc84 2017-11-30 stsp if (blob1) {
73 f934cf2c 2018-02-12 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
74 84451b3e 2018-07-10 stsp err = got_object_blob_dump_to_file(&size1, NULL, f1, blob1);
78 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
81 98abbc84 2017-11-30 stsp if (blob2) {
82 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
83 84451b3e 2018-07-10 stsp err = got_object_blob_dump_to_file(&size2, NULL, f2, blob2);
87 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
89 ed9e98a8 2017-11-29 stsp memset(&ds, 0, sizeof(ds));
90 f9d67749 2017-11-30 stsp /* XXX should stat buffers be passed in args instead of ds? */
91 f9d67749 2017-11-30 stsp ds.stb1.st_mode = S_IFREG;
93 f934cf2c 2018-02-12 stsp ds.stb1.st_size = size1;
94 f9d67749 2017-11-30 stsp ds.stb1.st_mtime = 0; /* XXX */
96 f9d67749 2017-11-30 stsp ds.stb2.st_mode = S_IFREG;
98 f934cf2c 2018-02-12 stsp ds.stb2.st_size = size2;
99 f9d67749 2017-11-30 stsp ds.stb2.st_mtime = 0; /* XXX */
101 54156555 2018-12-24 stsp memset(&args, 0, sizeof(args));
102 8ba9a219 2017-11-29 stsp args.diff_format = D_UNIFIED;
103 54156555 2018-12-24 stsp args.label[0] = label1 ? label1 : idstr1;
104 54156555 2018-12-24 stsp args.label[1] = label2 ? label2 : idstr2;
105 df2871d2 2018-10-18 stsp args.diff_context = diff_context;
106 84eb021e 2018-03-27 stsp flags |= D_PROTOTYPE;
108 09de383e 2018-12-24 stsp if (outfile) {
109 09de383e 2018-12-24 stsp fprintf(outfile, "blob - %s\n", idstr1);
110 09de383e 2018-12-24 stsp fprintf(outfile, "blob + %s\n", idstr2);
112 404c43c4 2018-06-21 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
114 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
115 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
116 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
117 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
118 7d283eee 2017-11-29 stsp return err;
121 aaa13589 2019-06-01 stsp const struct got_error *
122 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
123 aaa13589 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
124 aaa13589 2019-06-01 stsp struct got_object_id *id2, const char *label1, const char *label2,
125 aaa13589 2019-06-01 stsp struct got_repository *repo)
127 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg *a = arg;
129 aaa13589 2019-06-01 stsp return diff_blobs(blob1, blob2, label1, label2, a->diff_context,
130 aaa13589 2019-06-01 stsp a->outfile, NULL);
133 404c43c4 2018-06-21 stsp const struct got_error *
134 404c43c4 2018-06-21 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
135 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context, FILE *outfile)
137 54156555 2018-12-24 stsp return diff_blobs(blob1, blob2, label1, label2, diff_context, outfile,
141 404c43c4 2018-06-21 stsp const struct got_error *
142 b72f483a 2019-02-05 stsp got_diff_blob_file(struct got_blob_object *blob1, FILE *f2, size_t size2,
143 b72f483a 2019-02-05 stsp const char *label2, int diff_context, FILE *outfile)
145 b72f483a 2019-02-05 stsp struct got_diff_state ds;
146 b72f483a 2019-02-05 stsp struct got_diff_args args;
147 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
148 b72f483a 2019-02-05 stsp FILE *f1 = NULL;
149 b72f483a 2019-02-05 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
150 b72f483a 2019-02-05 stsp char *idstr1 = NULL;
151 b72f483a 2019-02-05 stsp size_t size1;
152 b72f483a 2019-02-05 stsp int res, flags = 0;
155 b72f483a 2019-02-05 stsp if (blob1) {
156 b72f483a 2019-02-05 stsp f1 = got_opentemp();
157 b72f483a 2019-02-05 stsp if (f1 == NULL)
158 638f9024 2019-05-13 stsp return got_error_from_errno("got_opentemp");
159 b72f483a 2019-02-05 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
160 b72f483a 2019-02-05 stsp err = got_object_blob_dump_to_file(&size1, NULL, f1, blob1);
164 b72f483a 2019-02-05 stsp flags |= D_EMPTY1;
165 b72f483a 2019-02-05 stsp idstr1 = "/dev/null";
168 b72f483a 2019-02-05 stsp if (f2 == NULL)
169 b72f483a 2019-02-05 stsp flags |= D_EMPTY2;
171 b72f483a 2019-02-05 stsp memset(&ds, 0, sizeof(ds));
172 b72f483a 2019-02-05 stsp /* XXX should stat buffers be passed in args instead of ds? */
173 b72f483a 2019-02-05 stsp ds.stb1.st_mode = S_IFREG;
175 b72f483a 2019-02-05 stsp ds.stb1.st_size = size1;
176 b72f483a 2019-02-05 stsp ds.stb1.st_mtime = 0; /* XXX */
178 b72f483a 2019-02-05 stsp ds.stb2.st_mode = S_IFREG;
179 b72f483a 2019-02-05 stsp ds.stb2.st_size = size2;
180 b72f483a 2019-02-05 stsp ds.stb2.st_mtime = 0; /* XXX */
182 b72f483a 2019-02-05 stsp memset(&args, 0, sizeof(args));
183 b72f483a 2019-02-05 stsp args.diff_format = D_UNIFIED;
184 b72f483a 2019-02-05 stsp args.label[0] = label2;
185 b72f483a 2019-02-05 stsp args.label[1] = label2;
186 b72f483a 2019-02-05 stsp args.diff_context = diff_context;
187 b72f483a 2019-02-05 stsp flags |= D_PROTOTYPE;
189 b72f483a 2019-02-05 stsp fprintf(outfile, "blob - %s\n", idstr1);
190 049da17d 2019-03-26 stsp fprintf(outfile, "file + %s\n", f2 == NULL ? "/dev/null" : label2);
191 b72f483a 2019-02-05 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, NULL);
193 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
194 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
195 b72f483a 2019-02-05 stsp return err;
198 b72f483a 2019-02-05 stsp const struct got_error *
199 404c43c4 2018-06-21 stsp got_diff_blob_lines_changed(struct got_diff_changes **changes,
200 404c43c4 2018-06-21 stsp struct got_blob_object *blob1, struct got_blob_object *blob2)
202 404c43c4 2018-06-21 stsp const struct got_error *err = NULL;
204 404c43c4 2018-06-21 stsp *changes = calloc(1, sizeof(**changes));
205 404c43c4 2018-06-21 stsp if (*changes == NULL)
206 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
207 404c43c4 2018-06-21 stsp SIMPLEQ_INIT(&(*changes)->entries);
209 54156555 2018-12-24 stsp err = diff_blobs(blob1, blob2, NULL, NULL, 3, NULL, *changes);
211 404c43c4 2018-06-21 stsp got_diff_free_changes(*changes);
212 404c43c4 2018-06-21 stsp *changes = NULL;
214 404c43c4 2018-06-21 stsp return err;
218 404c43c4 2018-06-21 stsp got_diff_free_changes(struct got_diff_changes *changes)
220 404c43c4 2018-06-21 stsp struct got_diff_change *change;
221 404c43c4 2018-06-21 stsp while (!SIMPLEQ_EMPTY(&changes->entries)) {
222 404c43c4 2018-06-21 stsp change = SIMPLEQ_FIRST(&changes->entries);
223 404c43c4 2018-06-21 stsp SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
224 404c43c4 2018-06-21 stsp free(change);
226 404c43c4 2018-06-21 stsp free(changes);
229 474b4f94 2017-11-30 stsp static const struct got_error *
230 54156555 2018-12-24 stsp diff_added_blob(struct got_object_id *id, const char *label,
231 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
233 4e22badc 2017-11-30 stsp const struct got_error *err;
234 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
235 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
237 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
239 4e22badc 2017-11-30 stsp return err;
241 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
244 aaa13589 2019-06-01 stsp err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, repo);
246 2acfca77 2018-04-01 stsp got_object_close(obj);
248 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
249 2acfca77 2018-04-01 stsp return err;
252 474b4f94 2017-11-30 stsp static const struct got_error *
253 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
254 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
255 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
257 6a213ccb 2017-11-30 stsp const struct got_error *err;
258 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
259 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
260 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
261 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
263 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
265 730a8aa0 2018-04-24 stsp return err;
266 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
267 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
271 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
274 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
275 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
279 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
283 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
287 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, repo);
290 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
292 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
294 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
296 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
297 6a213ccb 2017-11-30 stsp return err;
300 474b4f94 2017-11-30 stsp static const struct got_error *
301 f6861a81 2018-09-13 stsp diff_deleted_blob(struct got_object_id *id, const char *label,
302 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
304 365fb436 2017-11-30 stsp const struct got_error *err;
305 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
306 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
308 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
310 365fb436 2017-11-30 stsp return err;
312 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
315 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, repo);
317 2acfca77 2018-04-01 stsp got_object_close(obj);
319 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
320 2acfca77 2018-04-01 stsp return err;
323 474b4f94 2017-11-30 stsp static const struct got_error *
324 54156555 2018-12-24 stsp diff_added_tree(struct got_object_id *id, const char *label,
325 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
327 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
328 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
329 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
331 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
335 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
336 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
340 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
344 aaa13589 2019-06-01 stsp err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg);
347 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
348 9c70d4c3 2017-11-30 stsp if (treeobj)
349 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
350 9c70d4c3 2017-11-30 stsp return err;
353 474b4f94 2017-11-30 stsp static const struct got_error *
354 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
355 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
356 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
358 f6861a81 2018-09-13 stsp const struct got_error *err;
359 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
360 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
361 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
362 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
364 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
368 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
369 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
373 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
377 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
378 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
382 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
386 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
390 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg);
394 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
396 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
397 789689b5 2017-11-30 stsp if (treeobj1)
398 789689b5 2017-11-30 stsp got_object_close(treeobj1);
399 789689b5 2017-11-30 stsp if (treeobj2)
400 789689b5 2017-11-30 stsp got_object_close(treeobj2);
401 789689b5 2017-11-30 stsp return err;
404 474b4f94 2017-11-30 stsp static const struct got_error *
405 54156555 2018-12-24 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
406 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
408 f6861a81 2018-09-13 stsp const struct got_error *err;
409 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
410 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
412 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
416 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
417 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
421 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
425 aaa13589 2019-06-01 stsp err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg);
428 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
429 2c56f2ce 2017-11-30 stsp if (treeobj)
430 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
431 2c56f2ce 2017-11-30 stsp return err;
434 474b4f94 2017-11-30 stsp static const struct got_error *
435 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
436 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
437 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
439 013404a9 2017-11-30 stsp /* XXX TODO */
440 474b4f94 2017-11-30 stsp return NULL;
443 474b4f94 2017-11-30 stsp static const struct got_error *
444 1de5e065 2019-06-01 stsp diff_entry_old_new(const struct got_tree_entry *te1,
445 1de5e065 2019-06-01 stsp const struct got_tree_entry *te2, const char *label1, const char *label2,
446 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
448 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
449 19ae6da1 2018-11-05 stsp int id_match;
451 474b4f94 2017-11-30 stsp if (te2 == NULL) {
452 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
453 aaa13589 2019-06-01 stsp err = diff_deleted_tree(te1->id, label1, repo,
454 aaa13589 2019-06-01 stsp cb, cb_arg);
456 aaa13589 2019-06-01 stsp err = diff_deleted_blob(te1->id, label1, repo,
457 aaa13589 2019-06-01 stsp cb, cb_arg);
458 f6861a81 2018-09-13 stsp return err;
461 19ae6da1 2018-11-05 stsp id_match = (got_object_id_cmp(te1->id, te2->id) == 0);
462 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
463 19ae6da1 2018-11-05 stsp if (!id_match)
464 f6861a81 2018-09-13 stsp return diff_modified_tree(te1->id, te2->id,
465 aaa13589 2019-06-01 stsp label1, label2, repo, cb, cb_arg);
466 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
467 19ae6da1 2018-11-05 stsp if (!id_match)
468 f6861a81 2018-09-13 stsp return diff_modified_blob(te1->id, te2->id,
469 aaa13589 2019-06-01 stsp label1, label2, repo, cb, cb_arg);
472 19ae6da1 2018-11-05 stsp if (id_match)
473 f6861a81 2018-09-13 stsp return NULL;
475 aaa13589 2019-06-01 stsp return diff_kind_mismatch(te1->id, te2->id, label1, label2, repo,
476 aaa13589 2019-06-01 stsp cb, cb_arg);
479 474b4f94 2017-11-30 stsp static const struct got_error *
480 1de5e065 2019-06-01 stsp diff_entry_new_old(const struct got_tree_entry *te2,
481 aaa13589 2019-06-01 stsp const struct got_tree_entry *te1, const char *label2,
482 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
484 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
485 f6861a81 2018-09-13 stsp return NULL;
487 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
488 aaa13589 2019-06-01 stsp return diff_added_tree(te2->id, label2, repo, cb, cb_arg);
490 aaa13589 2019-06-01 stsp return diff_added_blob(te2->id, label2, repo, cb, cb_arg);
493 474b4f94 2017-11-30 stsp const struct got_error *
494 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
495 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
496 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
498 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
499 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
500 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
501 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
503 883f0469 2018-06-23 stsp if (tree1) {
504 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
505 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree1);
506 883f0469 2018-06-23 stsp te1 = SIMPLEQ_FIRST(&entries->head);
507 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
508 f6861a81 2018-09-13 stsp te1->name) == -1)
509 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
511 883f0469 2018-06-23 stsp if (tree2) {
512 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
513 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree2);
514 883f0469 2018-06-23 stsp te2 = SIMPLEQ_FIRST(&entries->head);
515 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
516 f6861a81 2018-09-13 stsp te2->name) == -1)
517 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
522 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
524 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
525 1de5e065 2019-06-01 stsp te1->name);
529 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
530 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
532 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
534 aaa13589 2019-06-01 stsp err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
541 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
543 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
544 1de5e065 2019-06-01 stsp te2->name);
547 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
548 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te->name) == -1)
550 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
552 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
553 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te2->name) == -1)
555 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
557 aaa13589 2019-06-01 stsp err = diff_entry_new_old(te2, te, l2, repo, cb, cb_arg);
565 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
567 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
568 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
569 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
574 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
576 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
577 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
578 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
580 474b4f94 2017-11-30 stsp } while (te1 || te2);
582 11528a82 2018-05-19 stsp return err;
585 11528a82 2018-05-19 stsp const struct got_error *
586 15a94983 2018-12-23 stsp got_diff_objects_as_blobs(struct got_object_id *id1, struct got_object_id *id2,
587 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context,
588 54156555 2018-12-24 stsp struct got_repository *repo, FILE *outfile)
590 11528a82 2018-05-19 stsp const struct got_error *err;
591 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
593 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
594 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
597 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob1, repo, id1, 8192);
602 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob2, repo, id2, 8192);
606 54156555 2018-12-24 stsp err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
610 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
612 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
613 474b4f94 2017-11-30 stsp return err;
616 11528a82 2018-05-19 stsp const struct got_error *
617 15a94983 2018-12-23 stsp got_diff_objects_as_trees(struct got_object_id *id1, struct got_object_id *id2,
618 54156555 2018-12-24 stsp char *label1, char *label2, int diff_context, struct got_repository *repo,
619 54156555 2018-12-24 stsp FILE *outfile)
621 11528a82 2018-05-19 stsp const struct got_error *err;
622 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
623 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
625 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
626 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
629 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
634 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
638 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
639 aaa13589 2019-06-01 stsp arg.outfile = outfile;
640 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo,
641 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff, &arg);
644 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
646 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
647 11528a82 2018-05-19 stsp return err;
650 11528a82 2018-05-19 stsp const struct got_error *
651 15a94983 2018-12-23 stsp got_diff_objects_as_commits(struct got_object_id *id1,
652 15a94983 2018-12-23 stsp struct got_object_id *id2, int diff_context,
653 15a94983 2018-12-23 stsp struct got_repository *repo, FILE *outfile)
655 11528a82 2018-05-19 stsp const struct got_error *err;
656 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
658 15a94983 2018-12-23 stsp if (id2 == NULL)
659 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
662 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
667 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
671 15a94983 2018-12-23 stsp err = got_diff_objects_as_trees(
672 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
673 54156555 2018-12-24 stsp got_object_commit_get_tree_id(commit2), "", "", diff_context, repo,
676 11528a82 2018-05-19 stsp if (commit1)
677 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
678 11528a82 2018-05-19 stsp if (commit2)
679 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
680 11528a82 2018-05-19 stsp return err;
