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_object.h"
28 e09a504c 2019-06-28 stsp #include "got_repository.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 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
79 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
82 98abbc84 2017-11-30 stsp if (blob2) {
83 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
84 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size2, NULL, NULL, f2,
89 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
91 ed9e98a8 2017-11-29 stsp memset(&ds, 0, sizeof(ds));
92 f9d67749 2017-11-30 stsp /* XXX should stat buffers be passed in args instead of ds? */
93 f9d67749 2017-11-30 stsp ds.stb1.st_mode = S_IFREG;
95 f934cf2c 2018-02-12 stsp ds.stb1.st_size = size1;
96 f9d67749 2017-11-30 stsp ds.stb1.st_mtime = 0; /* XXX */
98 f9d67749 2017-11-30 stsp ds.stb2.st_mode = S_IFREG;
100 f934cf2c 2018-02-12 stsp ds.stb2.st_size = size2;
101 f9d67749 2017-11-30 stsp ds.stb2.st_mtime = 0; /* XXX */
103 54156555 2018-12-24 stsp memset(&args, 0, sizeof(args));
104 8ba9a219 2017-11-29 stsp args.diff_format = D_UNIFIED;
105 54156555 2018-12-24 stsp args.label[0] = label1 ? label1 : idstr1;
106 54156555 2018-12-24 stsp args.label[1] = label2 ? label2 : idstr2;
107 df2871d2 2018-10-18 stsp args.diff_context = diff_context;
108 84eb021e 2018-03-27 stsp flags |= D_PROTOTYPE;
110 09de383e 2018-12-24 stsp if (outfile) {
111 09de383e 2018-12-24 stsp fprintf(outfile, "blob - %s\n", idstr1);
112 09de383e 2018-12-24 stsp fprintf(outfile, "blob + %s\n", idstr2);
114 404c43c4 2018-06-21 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
115 dc424a06 2019-08-07 stsp got_diff_state_free(&ds);
117 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
118 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
119 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
120 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
121 7d283eee 2017-11-29 stsp return err;
124 aaa13589 2019-06-01 stsp const struct got_error *
125 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
126 aaa13589 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
127 aaa13589 2019-06-01 stsp struct got_object_id *id2, const char *label1, const char *label2,
128 aaa13589 2019-06-01 stsp struct got_repository *repo)
130 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg *a = arg;
132 aaa13589 2019-06-01 stsp return diff_blobs(blob1, blob2, label1, label2, a->diff_context,
133 aaa13589 2019-06-01 stsp a->outfile, NULL);
136 404c43c4 2018-06-21 stsp const struct got_error *
137 404c43c4 2018-06-21 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
138 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context, FILE *outfile)
140 54156555 2018-12-24 stsp return diff_blobs(blob1, blob2, label1, label2, diff_context, outfile,
144 7f1f93af 2019-08-06 stsp static const struct got_error *
145 7f1f93af 2019-08-06 stsp alloc_changes(struct got_diff_changes **changes)
147 7f1f93af 2019-08-06 stsp *changes = calloc(1, sizeof(**changes));
148 7f1f93af 2019-08-06 stsp if (*changes == NULL)
149 7f1f93af 2019-08-06 stsp return got_error_from_errno("calloc");
150 7f1f93af 2019-08-06 stsp SIMPLEQ_INIT(&(*changes)->entries);
151 7f1f93af 2019-08-06 stsp return NULL;
154 7f1f93af 2019-08-06 stsp static const struct got_error *
155 7f1f93af 2019-08-06 stsp diff_blob_file(struct got_diff_changes **changes,
156 7f1f93af 2019-08-06 stsp struct got_blob_object *blob1, FILE *f2, size_t size2,
157 b72f483a 2019-02-05 stsp const char *label2, int diff_context, FILE *outfile)
159 b72f483a 2019-02-05 stsp struct got_diff_state ds;
160 b72f483a 2019-02-05 stsp struct got_diff_args args;
161 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
162 b72f483a 2019-02-05 stsp FILE *f1 = NULL;
163 b72f483a 2019-02-05 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
164 b72f483a 2019-02-05 stsp char *idstr1 = NULL;
165 b72f483a 2019-02-05 stsp size_t size1;
166 b72f483a 2019-02-05 stsp int res, flags = 0;
168 7f1f93af 2019-08-06 stsp if (changes)
169 7f1f93af 2019-08-06 stsp *changes = NULL;
172 b72f483a 2019-02-05 stsp if (blob1) {
173 b72f483a 2019-02-05 stsp f1 = got_opentemp();
174 b72f483a 2019-02-05 stsp if (f1 == NULL)
175 638f9024 2019-05-13 stsp return got_error_from_errno("got_opentemp");
176 b72f483a 2019-02-05 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
177 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
182 b72f483a 2019-02-05 stsp flags |= D_EMPTY1;
183 b72f483a 2019-02-05 stsp idstr1 = "/dev/null";
186 b72f483a 2019-02-05 stsp if (f2 == NULL)
187 b72f483a 2019-02-05 stsp flags |= D_EMPTY2;
189 b72f483a 2019-02-05 stsp memset(&ds, 0, sizeof(ds));
190 b72f483a 2019-02-05 stsp /* XXX should stat buffers be passed in args instead of ds? */
191 b72f483a 2019-02-05 stsp ds.stb1.st_mode = S_IFREG;
193 b72f483a 2019-02-05 stsp ds.stb1.st_size = size1;
194 b72f483a 2019-02-05 stsp ds.stb1.st_mtime = 0; /* XXX */
196 b72f483a 2019-02-05 stsp ds.stb2.st_mode = S_IFREG;
197 b72f483a 2019-02-05 stsp ds.stb2.st_size = size2;
198 b72f483a 2019-02-05 stsp ds.stb2.st_mtime = 0; /* XXX */
200 b72f483a 2019-02-05 stsp memset(&args, 0, sizeof(args));
201 b72f483a 2019-02-05 stsp args.diff_format = D_UNIFIED;
202 b72f483a 2019-02-05 stsp args.label[0] = label2;
203 b72f483a 2019-02-05 stsp args.label[1] = label2;
204 b72f483a 2019-02-05 stsp args.diff_context = diff_context;
205 b72f483a 2019-02-05 stsp flags |= D_PROTOTYPE;
207 7f1f93af 2019-08-06 stsp if (outfile) {
208 7f1f93af 2019-08-06 stsp fprintf(outfile, "blob - %s\n", idstr1);
209 7f1f93af 2019-08-06 stsp fprintf(outfile, "file + %s\n",
210 7f1f93af 2019-08-06 stsp f2 == NULL ? "/dev/null" : label2);
212 7f1f93af 2019-08-06 stsp if (changes) {
213 7f1f93af 2019-08-06 stsp err = alloc_changes(changes);
215 7f1f93af 2019-08-06 stsp return err;
217 7f1f93af 2019-08-06 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile,
218 7f1f93af 2019-08-06 stsp changes ? *changes : NULL);
219 dc424a06 2019-08-07 stsp got_diff_state_free(&ds);
221 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
222 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
223 b72f483a 2019-02-05 stsp return err;
226 7f1f93af 2019-08-06 stsp const struct got_error *
227 7f1f93af 2019-08-06 stsp got_diff_blob_file(struct got_blob_object *blob1, FILE *f2, size_t size2,
228 7f1f93af 2019-08-06 stsp const char *label2, int diff_context, FILE *outfile)
230 7f1f93af 2019-08-06 stsp return diff_blob_file(NULL, blob1, f2, size2, label2, diff_context,
234 7f1f93af 2019-08-06 stsp const struct got_error *
235 404c43c4 2018-06-21 stsp got_diff_blob_lines_changed(struct got_diff_changes **changes,
236 404c43c4 2018-06-21 stsp struct got_blob_object *blob1, struct got_blob_object *blob2)
238 404c43c4 2018-06-21 stsp const struct got_error *err = NULL;
240 7f1f93af 2019-08-06 stsp err = alloc_changes(changes);
242 7f1f93af 2019-08-06 stsp return err;
244 54156555 2018-12-24 stsp err = diff_blobs(blob1, blob2, NULL, NULL, 3, NULL, *changes);
246 404c43c4 2018-06-21 stsp got_diff_free_changes(*changes);
247 404c43c4 2018-06-21 stsp *changes = NULL;
249 404c43c4 2018-06-21 stsp return err;
253 404c43c4 2018-06-21 stsp got_diff_free_changes(struct got_diff_changes *changes)
255 404c43c4 2018-06-21 stsp struct got_diff_change *change;
256 404c43c4 2018-06-21 stsp while (!SIMPLEQ_EMPTY(&changes->entries)) {
257 404c43c4 2018-06-21 stsp change = SIMPLEQ_FIRST(&changes->entries);
258 404c43c4 2018-06-21 stsp SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
259 404c43c4 2018-06-21 stsp free(change);
261 404c43c4 2018-06-21 stsp free(changes);
264 474b4f94 2017-11-30 stsp static const struct got_error *
265 54156555 2018-12-24 stsp diff_added_blob(struct got_object_id *id, const char *label,
266 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
268 4e22badc 2017-11-30 stsp const struct got_error *err;
269 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
270 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
272 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
274 4e22badc 2017-11-30 stsp return err;
276 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
279 aaa13589 2019-06-01 stsp err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, repo);
281 2acfca77 2018-04-01 stsp got_object_close(obj);
283 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
284 2acfca77 2018-04-01 stsp return err;
287 474b4f94 2017-11-30 stsp static const struct got_error *
288 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
289 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
290 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
292 6a213ccb 2017-11-30 stsp const struct got_error *err;
293 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
294 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
295 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
296 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
298 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
300 730a8aa0 2018-04-24 stsp return err;
301 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
302 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
306 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
309 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
310 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
314 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
318 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
322 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, repo);
325 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
327 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
329 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
331 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
332 6a213ccb 2017-11-30 stsp return err;
335 474b4f94 2017-11-30 stsp static const struct got_error *
336 f6861a81 2018-09-13 stsp diff_deleted_blob(struct got_object_id *id, const char *label,
337 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
339 365fb436 2017-11-30 stsp const struct got_error *err;
340 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
341 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
343 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
345 365fb436 2017-11-30 stsp return err;
347 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
350 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, repo);
352 2acfca77 2018-04-01 stsp got_object_close(obj);
354 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
355 2acfca77 2018-04-01 stsp return err;
358 474b4f94 2017-11-30 stsp static const struct got_error *
359 54156555 2018-12-24 stsp diff_added_tree(struct got_object_id *id, const char *label,
360 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
361 31b4484f 2019-07-27 stsp int diff_content)
363 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
364 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
365 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
367 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
371 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
372 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
376 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
380 31b4484f 2019-07-27 stsp err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg,
381 31b4484f 2019-07-27 stsp diff_content);
384 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
385 9c70d4c3 2017-11-30 stsp if (treeobj)
386 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
387 9c70d4c3 2017-11-30 stsp return err;
390 474b4f94 2017-11-30 stsp static const struct got_error *
391 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
392 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
393 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
395 f6861a81 2018-09-13 stsp const struct got_error *err;
396 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
397 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
398 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
399 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
401 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
405 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
406 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
410 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
414 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
415 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
419 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
423 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
427 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg,
428 31b4484f 2019-07-27 stsp diff_content);
432 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
434 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
435 789689b5 2017-11-30 stsp if (treeobj1)
436 789689b5 2017-11-30 stsp got_object_close(treeobj1);
437 789689b5 2017-11-30 stsp if (treeobj2)
438 789689b5 2017-11-30 stsp got_object_close(treeobj2);
439 789689b5 2017-11-30 stsp return err;
442 474b4f94 2017-11-30 stsp static const struct got_error *
443 54156555 2018-12-24 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
444 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
445 31b4484f 2019-07-27 stsp int diff_content)
447 f6861a81 2018-09-13 stsp const struct got_error *err;
448 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
449 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
451 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
455 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
456 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
460 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
464 31b4484f 2019-07-27 stsp err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg,
465 31b4484f 2019-07-27 stsp diff_content);
468 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
469 2c56f2ce 2017-11-30 stsp if (treeobj)
470 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
471 2c56f2ce 2017-11-30 stsp return err;
474 474b4f94 2017-11-30 stsp static const struct got_error *
475 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
476 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
477 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
479 013404a9 2017-11-30 stsp /* XXX TODO */
480 474b4f94 2017-11-30 stsp return NULL;
483 474b4f94 2017-11-30 stsp static const struct got_error *
484 1de5e065 2019-06-01 stsp diff_entry_old_new(const struct got_tree_entry *te1,
485 1de5e065 2019-06-01 stsp const struct got_tree_entry *te2, const char *label1, const char *label2,
486 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
487 31b4484f 2019-07-27 stsp int diff_content)
489 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
490 19ae6da1 2018-11-05 stsp int id_match;
492 474b4f94 2017-11-30 stsp if (te2 == NULL) {
493 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
494 aaa13589 2019-06-01 stsp err = diff_deleted_tree(te1->id, label1, repo,
495 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
497 31b4484f 2019-07-27 stsp if (diff_content)
498 31b4484f 2019-07-27 stsp err = diff_deleted_blob(te1->id, label1, repo,
499 31b4484f 2019-07-27 stsp cb, cb_arg);
501 31b4484f 2019-07-27 stsp err = cb(cb_arg, NULL, NULL, te1->id, NULL,
502 31b4484f 2019-07-27 stsp label1, NULL, repo);
504 f6861a81 2018-09-13 stsp return err;
507 19ae6da1 2018-11-05 stsp id_match = (got_object_id_cmp(te1->id, te2->id) == 0);
508 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
509 19ae6da1 2018-11-05 stsp if (!id_match)
510 f6861a81 2018-09-13 stsp return diff_modified_tree(te1->id, te2->id,
511 31b4484f 2019-07-27 stsp label1, label2, repo, cb, cb_arg, diff_content);
512 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
513 31b4484f 2019-07-27 stsp if (!id_match) {
514 31b4484f 2019-07-27 stsp if (diff_content)
515 31b4484f 2019-07-27 stsp return diff_modified_blob(te1->id, te2->id,
516 31b4484f 2019-07-27 stsp label1, label2, repo, cb, cb_arg);
518 31b4484f 2019-07-27 stsp return cb(cb_arg, NULL, NULL, te1->id,
519 31b4484f 2019-07-27 stsp te2->id, label1, label2, repo);
523 19ae6da1 2018-11-05 stsp if (id_match)
524 f6861a81 2018-09-13 stsp return NULL;
526 aaa13589 2019-06-01 stsp return diff_kind_mismatch(te1->id, te2->id, label1, label2, repo,
527 aaa13589 2019-06-01 stsp cb, cb_arg);
530 474b4f94 2017-11-30 stsp static const struct got_error *
531 1de5e065 2019-06-01 stsp diff_entry_new_old(const struct got_tree_entry *te2,
532 aaa13589 2019-06-01 stsp const struct got_tree_entry *te1, const char *label2,
533 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
534 31b4484f 2019-07-27 stsp int diff_content)
536 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
537 f6861a81 2018-09-13 stsp return NULL;
539 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
540 31b4484f 2019-07-27 stsp return diff_added_tree(te2->id, label2, repo, cb, cb_arg,
541 31b4484f 2019-07-27 stsp diff_content);
543 31b4484f 2019-07-27 stsp if (diff_content)
544 31b4484f 2019-07-27 stsp return diff_added_blob(te2->id, label2, repo, cb, cb_arg);
546 31b4484f 2019-07-27 stsp return cb(cb_arg, NULL, NULL, NULL, te2->id, NULL, label2, repo);
549 474b4f94 2017-11-30 stsp const struct got_error *
550 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
551 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
552 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
554 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
555 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
556 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
557 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
559 883f0469 2018-06-23 stsp if (tree1) {
560 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
561 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree1);
562 883f0469 2018-06-23 stsp te1 = SIMPLEQ_FIRST(&entries->head);
563 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
564 f6861a81 2018-09-13 stsp te1->name) == -1)
565 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
567 883f0469 2018-06-23 stsp if (tree2) {
568 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
569 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree2);
570 883f0469 2018-06-23 stsp te2 = SIMPLEQ_FIRST(&entries->head);
571 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
572 f6861a81 2018-09-13 stsp te2->name) == -1)
573 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
578 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
580 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
581 1de5e065 2019-06-01 stsp te1->name);
585 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
586 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
588 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
590 aaa13589 2019-06-01 stsp err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
591 31b4484f 2019-07-27 stsp cb_arg, diff_content);
597 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
599 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
600 1de5e065 2019-06-01 stsp te2->name);
603 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
604 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te->name) == -1)
606 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
608 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
609 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te2->name) == -1)
611 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
613 31b4484f 2019-07-27 stsp err = diff_entry_new_old(te2, te, l2, repo,
614 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
622 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
624 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
625 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
626 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
631 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
633 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
634 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
635 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
637 474b4f94 2017-11-30 stsp } while (te1 || te2);
639 11528a82 2018-05-19 stsp return err;
642 11528a82 2018-05-19 stsp const struct got_error *
643 15a94983 2018-12-23 stsp got_diff_objects_as_blobs(struct got_object_id *id1, struct got_object_id *id2,
644 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context,
645 54156555 2018-12-24 stsp struct got_repository *repo, FILE *outfile)
647 11528a82 2018-05-19 stsp const struct got_error *err;
648 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
650 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
651 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
654 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob1, repo, id1, 8192);
659 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob2, repo, id2, 8192);
663 54156555 2018-12-24 stsp err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
667 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
669 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
670 474b4f94 2017-11-30 stsp return err;
673 11528a82 2018-05-19 stsp const struct got_error *
674 15a94983 2018-12-23 stsp got_diff_objects_as_trees(struct got_object_id *id1, struct got_object_id *id2,
675 54156555 2018-12-24 stsp char *label1, char *label2, int diff_context, struct got_repository *repo,
676 54156555 2018-12-24 stsp FILE *outfile)
678 11528a82 2018-05-19 stsp const struct got_error *err;
679 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
680 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
682 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
683 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
686 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
691 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
695 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
696 aaa13589 2019-06-01 stsp arg.outfile = outfile;
697 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo,
698 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
701 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
703 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
704 11528a82 2018-05-19 stsp return err;
707 11528a82 2018-05-19 stsp const struct got_error *
708 15a94983 2018-12-23 stsp got_diff_objects_as_commits(struct got_object_id *id1,
709 15a94983 2018-12-23 stsp struct got_object_id *id2, int diff_context,
710 15a94983 2018-12-23 stsp struct got_repository *repo, FILE *outfile)
712 11528a82 2018-05-19 stsp const struct got_error *err;
713 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
715 15a94983 2018-12-23 stsp if (id2 == NULL)
716 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
719 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
724 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
728 15a94983 2018-12-23 stsp err = got_diff_objects_as_trees(
729 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
730 54156555 2018-12-24 stsp got_object_commit_get_tree_id(commit2), "", "", diff_context, repo,
733 11528a82 2018-05-19 stsp if (commit1)
734 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
735 11528a82 2018-05-19 stsp if (commit2)
736 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
737 11528a82 2018-05-19 stsp return err;
740 dc424a06 2019-08-07 stsp const struct got_error *
741 dc424a06 2019-08-07 stsp got_diff_files(struct got_diff_changes **changes,
742 dc424a06 2019-08-07 stsp struct got_diff_state **ds,
743 dc424a06 2019-08-07 stsp struct got_diff_args **args,
744 dc424a06 2019-08-07 stsp int *flags,
745 dc424a06 2019-08-07 stsp FILE *f1, size_t size1, const char *label1,
746 dc424a06 2019-08-07 stsp FILE *f2, size_t size2, const char *label2,
747 dc424a06 2019-08-07 stsp int diff_context, FILE *outfile)
749 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
752 dc424a06 2019-08-07 stsp *flags = 0;
753 dc424a06 2019-08-07 stsp *ds = calloc(1, sizeof(**ds));
754 dc424a06 2019-08-07 stsp if (*ds == NULL)
755 dc424a06 2019-08-07 stsp return got_error_from_errno("calloc");
756 dc424a06 2019-08-07 stsp *args = calloc(1, sizeof(**args));
757 dc424a06 2019-08-07 stsp if (*args == NULL) {
758 dc424a06 2019-08-07 stsp err = got_error_from_errno("calloc");
762 dc424a06 2019-08-07 stsp if (changes)
763 dc424a06 2019-08-07 stsp *changes = NULL;
765 dc424a06 2019-08-07 stsp if (f1 == NULL)
766 dc424a06 2019-08-07 stsp *flags |= D_EMPTY1;
768 dc424a06 2019-08-07 stsp if (f2 == NULL)
769 dc424a06 2019-08-07 stsp *flags |= D_EMPTY2;
771 dc424a06 2019-08-07 stsp /* XXX should stat buffers be passed in args instead of ds? */
772 dc424a06 2019-08-07 stsp (*ds)->stb1.st_mode = S_IFREG;
773 dc424a06 2019-08-07 stsp (*ds)->stb1.st_size = size1;
774 dc424a06 2019-08-07 stsp (*ds)->stb1.st_mtime = 0; /* XXX */
776 dc424a06 2019-08-07 stsp (*ds)->stb2.st_mode = S_IFREG;
777 dc424a06 2019-08-07 stsp (*ds)->stb2.st_size = size2;
778 dc424a06 2019-08-07 stsp (*ds)->stb2.st_mtime = 0; /* XXX */
780 dc424a06 2019-08-07 stsp (*args)->diff_format = D_UNIFIED;
781 dc424a06 2019-08-07 stsp (*args)->label[0] = label1;
782 dc424a06 2019-08-07 stsp (*args)->label[1] = label2;
783 dc424a06 2019-08-07 stsp (*args)->diff_context = diff_context;
784 dc424a06 2019-08-07 stsp *flags |= D_PROTOTYPE;
786 dc424a06 2019-08-07 stsp if (outfile) {
787 dc424a06 2019-08-07 stsp fprintf(outfile, "file - %s\n",
788 dc424a06 2019-08-07 stsp f1 == NULL ? "/dev/null" : label1);
789 dc424a06 2019-08-07 stsp fprintf(outfile, "file + %s\n",
790 dc424a06 2019-08-07 stsp f2 == NULL ? "/dev/null" : label2);
792 dc424a06 2019-08-07 stsp if (changes) {
793 dc424a06 2019-08-07 stsp err = alloc_changes(changes);
797 dc424a06 2019-08-07 stsp err = got_diffreg(&res, f1, f2, *flags, *args, *ds, outfile,
798 dc424a06 2019-08-07 stsp changes ? *changes : NULL);
802 dc424a06 2019-08-07 stsp got_diff_state_free(*ds);
804 dc424a06 2019-08-07 stsp *ds = NULL;
806 dc424a06 2019-08-07 stsp if (*args) {
807 dc424a06 2019-08-07 stsp free(*args);
808 dc424a06 2019-08-07 stsp *args = NULL;
810 dc424a06 2019-08-07 stsp if (changes) {
811 dc424a06 2019-08-07 stsp if (*changes)
812 dc424a06 2019-08-07 stsp got_diff_free_changes(*changes);
813 dc424a06 2019-08-07 stsp *changes = NULL;
816 dc424a06 2019-08-07 stsp return err;