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 4ce46740 2019-08-08 stsp struct got_blob_object *blob1, const char *label1, 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 4ce46740 2019-08-08 stsp fprintf(outfile, "blob - %s\n", label1 ? label1 : 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 4ce46740 2019-08-08 stsp got_diff_blob_file(struct got_blob_object *blob1, const char *label1,
228 4ce46740 2019-08-08 stsp FILE *f2, size_t size2, const char *label2, int diff_context,
229 4ce46740 2019-08-08 stsp FILE *outfile)
231 4ce46740 2019-08-08 stsp return diff_blob_file(NULL, blob1, label1, f2, size2, label2,
232 4ce46740 2019-08-08 stsp diff_context, outfile);
235 7f1f93af 2019-08-06 stsp const struct got_error *
236 404c43c4 2018-06-21 stsp got_diff_blob_lines_changed(struct got_diff_changes **changes,
237 404c43c4 2018-06-21 stsp struct got_blob_object *blob1, struct got_blob_object *blob2)
239 404c43c4 2018-06-21 stsp const struct got_error *err = NULL;
241 7f1f93af 2019-08-06 stsp err = alloc_changes(changes);
243 7f1f93af 2019-08-06 stsp return err;
245 54156555 2018-12-24 stsp err = diff_blobs(blob1, blob2, NULL, NULL, 3, NULL, *changes);
247 404c43c4 2018-06-21 stsp got_diff_free_changes(*changes);
248 404c43c4 2018-06-21 stsp *changes = NULL;
250 404c43c4 2018-06-21 stsp return err;
254 404c43c4 2018-06-21 stsp got_diff_free_changes(struct got_diff_changes *changes)
256 404c43c4 2018-06-21 stsp struct got_diff_change *change;
257 404c43c4 2018-06-21 stsp while (!SIMPLEQ_EMPTY(&changes->entries)) {
258 404c43c4 2018-06-21 stsp change = SIMPLEQ_FIRST(&changes->entries);
259 404c43c4 2018-06-21 stsp SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
260 404c43c4 2018-06-21 stsp free(change);
262 404c43c4 2018-06-21 stsp free(changes);
265 474b4f94 2017-11-30 stsp static const struct got_error *
266 54156555 2018-12-24 stsp diff_added_blob(struct got_object_id *id, const char *label,
267 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
269 4e22badc 2017-11-30 stsp const struct got_error *err;
270 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
271 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
273 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
275 4e22badc 2017-11-30 stsp return err;
277 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
280 aaa13589 2019-06-01 stsp err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, repo);
282 2acfca77 2018-04-01 stsp got_object_close(obj);
284 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
285 2acfca77 2018-04-01 stsp return err;
288 474b4f94 2017-11-30 stsp static const struct got_error *
289 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
290 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
291 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
293 6a213ccb 2017-11-30 stsp const struct got_error *err;
294 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
295 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
296 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
297 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
299 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
301 730a8aa0 2018-04-24 stsp return err;
302 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
303 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
307 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
310 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
311 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
315 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
319 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
323 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, repo);
326 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
328 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
330 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
332 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
333 6a213ccb 2017-11-30 stsp return err;
336 474b4f94 2017-11-30 stsp static const struct got_error *
337 f6861a81 2018-09-13 stsp diff_deleted_blob(struct got_object_id *id, const char *label,
338 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
340 365fb436 2017-11-30 stsp const struct got_error *err;
341 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
342 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
344 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
346 365fb436 2017-11-30 stsp return err;
348 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
351 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, repo);
353 2acfca77 2018-04-01 stsp got_object_close(obj);
355 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
356 2acfca77 2018-04-01 stsp return err;
359 474b4f94 2017-11-30 stsp static const struct got_error *
360 54156555 2018-12-24 stsp diff_added_tree(struct got_object_id *id, const char *label,
361 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
362 31b4484f 2019-07-27 stsp int diff_content)
364 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
365 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
366 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
368 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
372 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
373 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
377 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
381 31b4484f 2019-07-27 stsp err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg,
382 31b4484f 2019-07-27 stsp diff_content);
385 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
386 9c70d4c3 2017-11-30 stsp if (treeobj)
387 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
388 9c70d4c3 2017-11-30 stsp return err;
391 474b4f94 2017-11-30 stsp static const struct got_error *
392 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
393 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
394 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
396 f6861a81 2018-09-13 stsp const struct got_error *err;
397 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
398 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
399 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
400 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
402 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
406 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
407 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
411 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
415 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
416 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
420 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
424 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
428 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg,
429 31b4484f 2019-07-27 stsp diff_content);
433 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
435 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
436 789689b5 2017-11-30 stsp if (treeobj1)
437 789689b5 2017-11-30 stsp got_object_close(treeobj1);
438 789689b5 2017-11-30 stsp if (treeobj2)
439 789689b5 2017-11-30 stsp got_object_close(treeobj2);
440 789689b5 2017-11-30 stsp return err;
443 474b4f94 2017-11-30 stsp static const struct got_error *
444 54156555 2018-12-24 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
445 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
446 31b4484f 2019-07-27 stsp int diff_content)
448 f6861a81 2018-09-13 stsp const struct got_error *err;
449 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
450 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
452 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
456 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
457 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
461 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
465 31b4484f 2019-07-27 stsp err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg,
466 31b4484f 2019-07-27 stsp diff_content);
469 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
470 2c56f2ce 2017-11-30 stsp if (treeobj)
471 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
472 2c56f2ce 2017-11-30 stsp return err;
475 474b4f94 2017-11-30 stsp static const struct got_error *
476 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
477 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
478 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
480 013404a9 2017-11-30 stsp /* XXX TODO */
481 474b4f94 2017-11-30 stsp return NULL;
484 474b4f94 2017-11-30 stsp static const struct got_error *
485 1de5e065 2019-06-01 stsp diff_entry_old_new(const struct got_tree_entry *te1,
486 1de5e065 2019-06-01 stsp const struct got_tree_entry *te2, const char *label1, const char *label2,
487 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
488 31b4484f 2019-07-27 stsp int diff_content)
490 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
491 19ae6da1 2018-11-05 stsp int id_match;
493 474b4f94 2017-11-30 stsp if (te2 == NULL) {
494 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
495 aaa13589 2019-06-01 stsp err = diff_deleted_tree(te1->id, label1, repo,
496 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
498 31b4484f 2019-07-27 stsp if (diff_content)
499 31b4484f 2019-07-27 stsp err = diff_deleted_blob(te1->id, label1, repo,
500 31b4484f 2019-07-27 stsp cb, cb_arg);
502 31b4484f 2019-07-27 stsp err = cb(cb_arg, NULL, NULL, te1->id, NULL,
503 31b4484f 2019-07-27 stsp label1, NULL, repo);
505 f6861a81 2018-09-13 stsp return err;
508 19ae6da1 2018-11-05 stsp id_match = (got_object_id_cmp(te1->id, te2->id) == 0);
509 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
510 19ae6da1 2018-11-05 stsp if (!id_match)
511 f6861a81 2018-09-13 stsp return diff_modified_tree(te1->id, te2->id,
512 31b4484f 2019-07-27 stsp label1, label2, repo, cb, cb_arg, diff_content);
513 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
514 31b4484f 2019-07-27 stsp if (!id_match) {
515 31b4484f 2019-07-27 stsp if (diff_content)
516 31b4484f 2019-07-27 stsp return diff_modified_blob(te1->id, te2->id,
517 31b4484f 2019-07-27 stsp label1, label2, repo, cb, cb_arg);
519 31b4484f 2019-07-27 stsp return cb(cb_arg, NULL, NULL, te1->id,
520 31b4484f 2019-07-27 stsp te2->id, label1, label2, repo);
524 19ae6da1 2018-11-05 stsp if (id_match)
525 f6861a81 2018-09-13 stsp return NULL;
527 aaa13589 2019-06-01 stsp return diff_kind_mismatch(te1->id, te2->id, label1, label2, repo,
528 aaa13589 2019-06-01 stsp cb, cb_arg);
531 474b4f94 2017-11-30 stsp static const struct got_error *
532 1de5e065 2019-06-01 stsp diff_entry_new_old(const struct got_tree_entry *te2,
533 aaa13589 2019-06-01 stsp const struct got_tree_entry *te1, const char *label2,
534 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
535 31b4484f 2019-07-27 stsp int diff_content)
537 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
538 f6861a81 2018-09-13 stsp return NULL;
540 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
541 31b4484f 2019-07-27 stsp return diff_added_tree(te2->id, label2, repo, cb, cb_arg,
542 31b4484f 2019-07-27 stsp diff_content);
544 31b4484f 2019-07-27 stsp if (diff_content)
545 31b4484f 2019-07-27 stsp return diff_added_blob(te2->id, label2, repo, cb, cb_arg);
547 31b4484f 2019-07-27 stsp return cb(cb_arg, NULL, NULL, NULL, te2->id, NULL, label2, repo);
550 474b4f94 2017-11-30 stsp const struct got_error *
551 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
552 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
553 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
555 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
556 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
557 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
558 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
560 883f0469 2018-06-23 stsp if (tree1) {
561 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
562 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree1);
563 883f0469 2018-06-23 stsp te1 = SIMPLEQ_FIRST(&entries->head);
564 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
565 f6861a81 2018-09-13 stsp te1->name) == -1)
566 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
568 883f0469 2018-06-23 stsp if (tree2) {
569 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
570 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree2);
571 883f0469 2018-06-23 stsp te2 = SIMPLEQ_FIRST(&entries->head);
572 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
573 f6861a81 2018-09-13 stsp te2->name) == -1)
574 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
579 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
581 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
582 1de5e065 2019-06-01 stsp te1->name);
586 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
587 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
589 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
591 aaa13589 2019-06-01 stsp err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
592 31b4484f 2019-07-27 stsp cb_arg, diff_content);
598 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
600 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
601 1de5e065 2019-06-01 stsp te2->name);
604 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
605 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te->name) == -1)
607 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
609 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
610 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te2->name) == -1)
612 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
614 31b4484f 2019-07-27 stsp err = diff_entry_new_old(te2, te, l2, repo,
615 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
623 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
625 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
626 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
627 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
632 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
634 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
635 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
636 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
638 474b4f94 2017-11-30 stsp } while (te1 || te2);
640 11528a82 2018-05-19 stsp return err;
643 11528a82 2018-05-19 stsp const struct got_error *
644 15a94983 2018-12-23 stsp got_diff_objects_as_blobs(struct got_object_id *id1, struct got_object_id *id2,
645 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context,
646 54156555 2018-12-24 stsp struct got_repository *repo, FILE *outfile)
648 11528a82 2018-05-19 stsp const struct got_error *err;
649 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
651 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
652 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
655 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob1, repo, id1, 8192);
660 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob2, repo, id2, 8192);
664 54156555 2018-12-24 stsp err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
668 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
670 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
671 474b4f94 2017-11-30 stsp return err;
674 11528a82 2018-05-19 stsp const struct got_error *
675 15a94983 2018-12-23 stsp got_diff_objects_as_trees(struct got_object_id *id1, struct got_object_id *id2,
676 54156555 2018-12-24 stsp char *label1, char *label2, int diff_context, struct got_repository *repo,
677 54156555 2018-12-24 stsp FILE *outfile)
679 11528a82 2018-05-19 stsp const struct got_error *err;
680 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
681 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
683 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
684 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
687 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
692 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
696 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
697 aaa13589 2019-06-01 stsp arg.outfile = outfile;
698 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo,
699 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
702 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
704 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
705 11528a82 2018-05-19 stsp return err;
708 11528a82 2018-05-19 stsp const struct got_error *
709 15a94983 2018-12-23 stsp got_diff_objects_as_commits(struct got_object_id *id1,
710 15a94983 2018-12-23 stsp struct got_object_id *id2, int diff_context,
711 15a94983 2018-12-23 stsp struct got_repository *repo, FILE *outfile)
713 11528a82 2018-05-19 stsp const struct got_error *err;
714 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
716 15a94983 2018-12-23 stsp if (id2 == NULL)
717 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
720 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
725 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
729 15a94983 2018-12-23 stsp err = got_diff_objects_as_trees(
730 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
731 54156555 2018-12-24 stsp got_object_commit_get_tree_id(commit2), "", "", diff_context, repo,
734 11528a82 2018-05-19 stsp if (commit1)
735 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
736 11528a82 2018-05-19 stsp if (commit2)
737 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
738 11528a82 2018-05-19 stsp return err;
741 dc424a06 2019-08-07 stsp const struct got_error *
742 dc424a06 2019-08-07 stsp got_diff_files(struct got_diff_changes **changes,
743 dc424a06 2019-08-07 stsp struct got_diff_state **ds,
744 dc424a06 2019-08-07 stsp struct got_diff_args **args,
745 dc424a06 2019-08-07 stsp int *flags,
746 dc424a06 2019-08-07 stsp FILE *f1, size_t size1, const char *label1,
747 dc424a06 2019-08-07 stsp FILE *f2, size_t size2, const char *label2,
748 dc424a06 2019-08-07 stsp int diff_context, FILE *outfile)
750 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
753 dc424a06 2019-08-07 stsp *flags = 0;
754 dc424a06 2019-08-07 stsp *ds = calloc(1, sizeof(**ds));
755 dc424a06 2019-08-07 stsp if (*ds == NULL)
756 dc424a06 2019-08-07 stsp return got_error_from_errno("calloc");
757 dc424a06 2019-08-07 stsp *args = calloc(1, sizeof(**args));
758 dc424a06 2019-08-07 stsp if (*args == NULL) {
759 dc424a06 2019-08-07 stsp err = got_error_from_errno("calloc");
763 dc424a06 2019-08-07 stsp if (changes)
764 dc424a06 2019-08-07 stsp *changes = NULL;
766 dc424a06 2019-08-07 stsp if (f1 == NULL)
767 dc424a06 2019-08-07 stsp *flags |= D_EMPTY1;
769 dc424a06 2019-08-07 stsp if (f2 == NULL)
770 dc424a06 2019-08-07 stsp *flags |= D_EMPTY2;
772 dc424a06 2019-08-07 stsp /* XXX should stat buffers be passed in args instead of ds? */
773 dc424a06 2019-08-07 stsp (*ds)->stb1.st_mode = S_IFREG;
774 dc424a06 2019-08-07 stsp (*ds)->stb1.st_size = size1;
775 dc424a06 2019-08-07 stsp (*ds)->stb1.st_mtime = 0; /* XXX */
777 dc424a06 2019-08-07 stsp (*ds)->stb2.st_mode = S_IFREG;
778 dc424a06 2019-08-07 stsp (*ds)->stb2.st_size = size2;
779 dc424a06 2019-08-07 stsp (*ds)->stb2.st_mtime = 0; /* XXX */
781 dc424a06 2019-08-07 stsp (*args)->diff_format = D_UNIFIED;
782 dc424a06 2019-08-07 stsp (*args)->label[0] = label1;
783 dc424a06 2019-08-07 stsp (*args)->label[1] = label2;
784 dc424a06 2019-08-07 stsp (*args)->diff_context = diff_context;
785 dc424a06 2019-08-07 stsp *flags |= D_PROTOTYPE;
787 dc424a06 2019-08-07 stsp if (outfile) {
788 dc424a06 2019-08-07 stsp fprintf(outfile, "file - %s\n",
789 dc424a06 2019-08-07 stsp f1 == NULL ? "/dev/null" : label1);
790 dc424a06 2019-08-07 stsp fprintf(outfile, "file + %s\n",
791 dc424a06 2019-08-07 stsp f2 == NULL ? "/dev/null" : label2);
793 dc424a06 2019-08-07 stsp if (changes) {
794 dc424a06 2019-08-07 stsp err = alloc_changes(changes);
798 dc424a06 2019-08-07 stsp err = got_diffreg(&res, f1, f2, *flags, *args, *ds, outfile,
799 dc424a06 2019-08-07 stsp changes ? *changes : NULL);
803 dc424a06 2019-08-07 stsp got_diff_state_free(*ds);
805 dc424a06 2019-08-07 stsp *ds = NULL;
807 dc424a06 2019-08-07 stsp if (*args) {
808 dc424a06 2019-08-07 stsp free(*args);
809 dc424a06 2019-08-07 stsp *args = NULL;
811 dc424a06 2019-08-07 stsp if (changes) {
812 dc424a06 2019-08-07 stsp if (*changes)
813 dc424a06 2019-08-07 stsp got_diff_free_changes(*changes);
814 dc424a06 2019-08-07 stsp *changes = NULL;
817 dc424a06 2019-08-07 stsp return err;
