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 63035f9f 2019-10-06 stsp const char *label1, const char *label2, int diff_context,
42 63035f9f 2019-10-06 stsp int ignore_whitespace, FILE *outfile, 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;
109 63035f9f 2019-10-06 stsp if (ignore_whitespace)
110 63035f9f 2019-10-06 stsp flags |= D_IGNOREBLANKS;
112 09de383e 2018-12-24 stsp if (outfile) {
113 09de383e 2018-12-24 stsp fprintf(outfile, "blob - %s\n", idstr1);
114 09de383e 2018-12-24 stsp fprintf(outfile, "blob + %s\n", idstr2);
116 404c43c4 2018-06-21 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile, changes);
117 dc424a06 2019-08-07 stsp got_diff_state_free(&ds);
119 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
120 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
121 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
122 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
123 7d283eee 2017-11-29 stsp return err;
126 aaa13589 2019-06-01 stsp const struct got_error *
127 aaa13589 2019-06-01 stsp got_diff_blob_output_unidiff(void *arg, struct got_blob_object *blob1,
128 aaa13589 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
129 aaa13589 2019-06-01 stsp struct got_object_id *id2, const char *label1, const char *label2,
130 aaa13589 2019-06-01 stsp struct got_repository *repo)
132 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg *a = arg;
134 aaa13589 2019-06-01 stsp return diff_blobs(blob1, blob2, label1, label2, a->diff_context,
135 63035f9f 2019-10-06 stsp a->ignore_whitespace, a->outfile, NULL);
138 404c43c4 2018-06-21 stsp const struct got_error *
139 404c43c4 2018-06-21 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
140 63035f9f 2019-10-06 stsp const char *label1, const char *label2, int diff_context,
141 63035f9f 2019-10-06 stsp int ignore_whitespace, FILE *outfile)
143 63035f9f 2019-10-06 stsp return diff_blobs(blob1, blob2, label1, label2, diff_context,
144 63035f9f 2019-10-06 stsp ignore_whitespace, outfile, NULL);
147 7f1f93af 2019-08-06 stsp static const struct got_error *
148 7f1f93af 2019-08-06 stsp alloc_changes(struct got_diff_changes **changes)
150 7f1f93af 2019-08-06 stsp *changes = calloc(1, sizeof(**changes));
151 7f1f93af 2019-08-06 stsp if (*changes == NULL)
152 7f1f93af 2019-08-06 stsp return got_error_from_errno("calloc");
153 7f1f93af 2019-08-06 stsp SIMPLEQ_INIT(&(*changes)->entries);
154 7f1f93af 2019-08-06 stsp return NULL;
157 7f1f93af 2019-08-06 stsp static const struct got_error *
158 7f1f93af 2019-08-06 stsp diff_blob_file(struct got_diff_changes **changes,
159 4ce46740 2019-08-08 stsp struct got_blob_object *blob1, const char *label1, FILE *f2, size_t size2,
160 63035f9f 2019-10-06 stsp const char *label2, int diff_context, int ignore_whitespace, FILE *outfile)
162 b72f483a 2019-02-05 stsp struct got_diff_state ds;
163 b72f483a 2019-02-05 stsp struct got_diff_args args;
164 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
165 b72f483a 2019-02-05 stsp FILE *f1 = NULL;
166 b72f483a 2019-02-05 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
167 b72f483a 2019-02-05 stsp char *idstr1 = NULL;
168 b72f483a 2019-02-05 stsp size_t size1;
169 b72f483a 2019-02-05 stsp int res, flags = 0;
171 7f1f93af 2019-08-06 stsp if (changes)
172 7f1f93af 2019-08-06 stsp *changes = NULL;
175 b72f483a 2019-02-05 stsp if (blob1) {
176 b72f483a 2019-02-05 stsp f1 = got_opentemp();
177 b72f483a 2019-02-05 stsp if (f1 == NULL)
178 638f9024 2019-05-13 stsp return got_error_from_errno("got_opentemp");
179 b72f483a 2019-02-05 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
180 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
185 b72f483a 2019-02-05 stsp flags |= D_EMPTY1;
186 b72f483a 2019-02-05 stsp idstr1 = "/dev/null";
189 b72f483a 2019-02-05 stsp if (f2 == NULL)
190 b72f483a 2019-02-05 stsp flags |= D_EMPTY2;
192 b72f483a 2019-02-05 stsp memset(&ds, 0, sizeof(ds));
193 b72f483a 2019-02-05 stsp /* XXX should stat buffers be passed in args instead of ds? */
194 b72f483a 2019-02-05 stsp ds.stb1.st_mode = S_IFREG;
196 b72f483a 2019-02-05 stsp ds.stb1.st_size = size1;
197 b72f483a 2019-02-05 stsp ds.stb1.st_mtime = 0; /* XXX */
199 b72f483a 2019-02-05 stsp ds.stb2.st_mode = S_IFREG;
200 b72f483a 2019-02-05 stsp ds.stb2.st_size = size2;
201 b72f483a 2019-02-05 stsp ds.stb2.st_mtime = 0; /* XXX */
203 b72f483a 2019-02-05 stsp memset(&args, 0, sizeof(args));
204 b72f483a 2019-02-05 stsp args.diff_format = D_UNIFIED;
205 b72f483a 2019-02-05 stsp args.label[0] = label2;
206 b72f483a 2019-02-05 stsp args.label[1] = label2;
207 b72f483a 2019-02-05 stsp args.diff_context = diff_context;
208 b72f483a 2019-02-05 stsp flags |= D_PROTOTYPE;
209 63035f9f 2019-10-06 stsp if (ignore_whitespace)
210 63035f9f 2019-10-06 stsp flags |= D_IGNOREBLANKS;
212 7f1f93af 2019-08-06 stsp if (outfile) {
213 4ce46740 2019-08-08 stsp fprintf(outfile, "blob - %s\n", label1 ? label1 : idstr1);
214 7f1f93af 2019-08-06 stsp fprintf(outfile, "file + %s\n",
215 7f1f93af 2019-08-06 stsp f2 == NULL ? "/dev/null" : label2);
217 7f1f93af 2019-08-06 stsp if (changes) {
218 7f1f93af 2019-08-06 stsp err = alloc_changes(changes);
220 7f1f93af 2019-08-06 stsp return err;
222 7f1f93af 2019-08-06 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile,
223 7f1f93af 2019-08-06 stsp changes ? *changes : NULL);
224 dc424a06 2019-08-07 stsp got_diff_state_free(&ds);
226 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
227 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
228 b72f483a 2019-02-05 stsp return err;
231 7f1f93af 2019-08-06 stsp const struct got_error *
232 4ce46740 2019-08-08 stsp got_diff_blob_file(struct got_blob_object *blob1, const char *label1,
233 4ce46740 2019-08-08 stsp FILE *f2, size_t size2, const char *label2, int diff_context,
234 63035f9f 2019-10-06 stsp int ignore_whitespace, FILE *outfile)
236 4ce46740 2019-08-08 stsp return diff_blob_file(NULL, blob1, label1, f2, size2, label2,
237 63035f9f 2019-10-06 stsp diff_context, ignore_whitespace, outfile);
240 4c9641fd 2019-08-21 stsp const struct got_error *
241 4c9641fd 2019-08-21 stsp got_diff_blob_file_lines_changed(struct got_diff_changes **changes,
242 4c9641fd 2019-08-21 stsp struct got_blob_object *blob1, FILE *f2, size_t size2)
244 4c9641fd 2019-08-21 stsp return diff_blob_file(changes, blob1, NULL, f2, size2, NULL,
245 63035f9f 2019-10-06 stsp 0, 0, NULL);
248 7f1f93af 2019-08-06 stsp const struct got_error *
249 404c43c4 2018-06-21 stsp got_diff_blob_lines_changed(struct got_diff_changes **changes,
250 404c43c4 2018-06-21 stsp struct got_blob_object *blob1, struct got_blob_object *blob2)
252 404c43c4 2018-06-21 stsp const struct got_error *err = NULL;
254 7f1f93af 2019-08-06 stsp err = alloc_changes(changes);
256 7f1f93af 2019-08-06 stsp return err;
258 63035f9f 2019-10-06 stsp err = diff_blobs(blob1, blob2, NULL, NULL, 3, 0, NULL, *changes);
260 404c43c4 2018-06-21 stsp got_diff_free_changes(*changes);
261 404c43c4 2018-06-21 stsp *changes = NULL;
263 404c43c4 2018-06-21 stsp return err;
267 404c43c4 2018-06-21 stsp got_diff_free_changes(struct got_diff_changes *changes)
269 404c43c4 2018-06-21 stsp struct got_diff_change *change;
270 404c43c4 2018-06-21 stsp while (!SIMPLEQ_EMPTY(&changes->entries)) {
271 404c43c4 2018-06-21 stsp change = SIMPLEQ_FIRST(&changes->entries);
272 404c43c4 2018-06-21 stsp SIMPLEQ_REMOVE_HEAD(&changes->entries, entry);
273 404c43c4 2018-06-21 stsp free(change);
275 404c43c4 2018-06-21 stsp free(changes);
278 474b4f94 2017-11-30 stsp static const struct got_error *
279 54156555 2018-12-24 stsp diff_added_blob(struct got_object_id *id, const char *label,
280 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
282 4e22badc 2017-11-30 stsp const struct got_error *err;
283 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
284 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
286 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
288 4e22badc 2017-11-30 stsp return err;
290 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
293 aaa13589 2019-06-01 stsp err = cb(cb_arg, NULL, blob, NULL, id, NULL, label, repo);
295 2acfca77 2018-04-01 stsp got_object_close(obj);
297 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
298 2acfca77 2018-04-01 stsp return err;
301 474b4f94 2017-11-30 stsp static const struct got_error *
302 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
303 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
304 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
306 6a213ccb 2017-11-30 stsp const struct got_error *err;
307 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
308 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
309 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
310 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
312 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
314 730a8aa0 2018-04-24 stsp return err;
315 15a94983 2018-12-23 stsp if (obj1->type != GOT_OBJ_TYPE_BLOB) {
316 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
320 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
323 15a94983 2018-12-23 stsp if (obj2->type != GOT_OBJ_TYPE_BLOB) {
324 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
328 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
332 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
336 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob1, blob2, id1, id2, label1, label2, repo);
339 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
341 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
343 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
345 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
346 6a213ccb 2017-11-30 stsp return err;
349 474b4f94 2017-11-30 stsp static const struct got_error *
350 f6861a81 2018-09-13 stsp diff_deleted_blob(struct got_object_id *id, const char *label,
351 aaa13589 2019-06-01 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg)
353 365fb436 2017-11-30 stsp const struct got_error *err;
354 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
355 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
357 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
359 365fb436 2017-11-30 stsp return err;
361 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
364 aaa13589 2019-06-01 stsp err = cb(cb_arg, blob, NULL, id, NULL, label, NULL, repo);
366 2acfca77 2018-04-01 stsp got_object_close(obj);
368 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
369 2acfca77 2018-04-01 stsp return err;
372 474b4f94 2017-11-30 stsp static const struct got_error *
373 54156555 2018-12-24 stsp diff_added_tree(struct got_object_id *id, const char *label,
374 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
375 31b4484f 2019-07-27 stsp int diff_content)
377 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
378 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
379 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
381 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
385 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
386 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
390 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
394 31b4484f 2019-07-27 stsp err = got_diff_tree(NULL, tree, NULL, label, repo, cb, cb_arg,
395 31b4484f 2019-07-27 stsp diff_content);
398 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
399 9c70d4c3 2017-11-30 stsp if (treeobj)
400 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
401 9c70d4c3 2017-11-30 stsp return err;
404 474b4f94 2017-11-30 stsp static const struct got_error *
405 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
406 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
407 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
409 f6861a81 2018-09-13 stsp const struct got_error *err;
410 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
411 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
412 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
413 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
415 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
419 15a94983 2018-12-23 stsp if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
420 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
424 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
428 15a94983 2018-12-23 stsp if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
429 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
433 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
437 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
441 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo, cb, cb_arg,
442 31b4484f 2019-07-27 stsp diff_content);
446 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
448 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
449 789689b5 2017-11-30 stsp if (treeobj1)
450 789689b5 2017-11-30 stsp got_object_close(treeobj1);
451 789689b5 2017-11-30 stsp if (treeobj2)
452 789689b5 2017-11-30 stsp got_object_close(treeobj2);
453 789689b5 2017-11-30 stsp return err;
456 474b4f94 2017-11-30 stsp static const struct got_error *
457 54156555 2018-12-24 stsp diff_deleted_tree(struct got_object_id *id, const char *label,
458 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
459 31b4484f 2019-07-27 stsp int diff_content)
461 f6861a81 2018-09-13 stsp const struct got_error *err;
462 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
463 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
465 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
469 15a94983 2018-12-23 stsp if (treeobj->type != GOT_OBJ_TYPE_TREE) {
470 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
474 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
478 31b4484f 2019-07-27 stsp err = got_diff_tree(tree, NULL, label, NULL, repo, cb, cb_arg,
479 31b4484f 2019-07-27 stsp diff_content);
482 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
483 2c56f2ce 2017-11-30 stsp if (treeobj)
484 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
485 2c56f2ce 2017-11-30 stsp return err;
488 474b4f94 2017-11-30 stsp static const struct got_error *
489 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
490 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
491 aaa13589 2019-06-01 stsp got_diff_blob_cb cb, void *cb_arg)
493 013404a9 2017-11-30 stsp /* XXX TODO */
494 474b4f94 2017-11-30 stsp return NULL;
497 474b4f94 2017-11-30 stsp static const struct got_error *
498 1de5e065 2019-06-01 stsp diff_entry_old_new(const struct got_tree_entry *te1,
499 1de5e065 2019-06-01 stsp const struct got_tree_entry *te2, const char *label1, const char *label2,
500 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
501 31b4484f 2019-07-27 stsp int diff_content)
503 f6861a81 2018-09-13 stsp const struct got_error *err = NULL;
504 19ae6da1 2018-11-05 stsp int id_match;
506 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te1))
507 63c5ca5d 2019-08-24 stsp return NULL;
509 474b4f94 2017-11-30 stsp if (te2 == NULL) {
510 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
511 aaa13589 2019-06-01 stsp err = diff_deleted_tree(te1->id, label1, repo,
512 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
514 31b4484f 2019-07-27 stsp if (diff_content)
515 31b4484f 2019-07-27 stsp err = diff_deleted_blob(te1->id, label1, repo,
516 31b4484f 2019-07-27 stsp cb, cb_arg);
518 31b4484f 2019-07-27 stsp err = cb(cb_arg, NULL, NULL, te1->id, NULL,
519 31b4484f 2019-07-27 stsp label1, NULL, repo);
521 f6861a81 2018-09-13 stsp return err;
522 63c5ca5d 2019-08-24 stsp } else if (got_object_tree_entry_is_submodule(te2))
523 63c5ca5d 2019-08-24 stsp return NULL;
525 19ae6da1 2018-11-05 stsp id_match = (got_object_id_cmp(te1->id, te2->id) == 0);
526 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
527 19ae6da1 2018-11-05 stsp if (!id_match)
528 f6861a81 2018-09-13 stsp return diff_modified_tree(te1->id, te2->id,
529 31b4484f 2019-07-27 stsp label1, label2, repo, cb, cb_arg, diff_content);
530 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
531 31b4484f 2019-07-27 stsp if (!id_match) {
532 31b4484f 2019-07-27 stsp if (diff_content)
533 31b4484f 2019-07-27 stsp return diff_modified_blob(te1->id, te2->id,
534 31b4484f 2019-07-27 stsp label1, label2, repo, cb, cb_arg);
536 31b4484f 2019-07-27 stsp return cb(cb_arg, NULL, NULL, te1->id,
537 31b4484f 2019-07-27 stsp te2->id, label1, label2, repo);
541 19ae6da1 2018-11-05 stsp if (id_match)
542 f6861a81 2018-09-13 stsp return NULL;
544 aaa13589 2019-06-01 stsp return diff_kind_mismatch(te1->id, te2->id, label1, label2, repo,
545 aaa13589 2019-06-01 stsp cb, cb_arg);
548 474b4f94 2017-11-30 stsp static const struct got_error *
549 1de5e065 2019-06-01 stsp diff_entry_new_old(const struct got_tree_entry *te2,
550 aaa13589 2019-06-01 stsp const struct got_tree_entry *te1, const char *label2,
551 31b4484f 2019-07-27 stsp struct got_repository *repo, got_diff_blob_cb cb, void *cb_arg,
552 31b4484f 2019-07-27 stsp int diff_content)
554 f6861a81 2018-09-13 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
555 63c5ca5d 2019-08-24 stsp return NULL;
557 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te2))
558 f6861a81 2018-09-13 stsp return NULL;
560 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
561 31b4484f 2019-07-27 stsp return diff_added_tree(te2->id, label2, repo, cb, cb_arg,
562 31b4484f 2019-07-27 stsp diff_content);
564 31b4484f 2019-07-27 stsp if (diff_content)
565 31b4484f 2019-07-27 stsp return diff_added_blob(te2->id, label2, repo, cb, cb_arg);
567 31b4484f 2019-07-27 stsp return cb(cb_arg, NULL, NULL, NULL, te2->id, NULL, label2, repo);
570 474b4f94 2017-11-30 stsp const struct got_error *
571 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
572 aaa13589 2019-06-01 stsp const char *label1, const char *label2, struct got_repository *repo,
573 31b4484f 2019-07-27 stsp got_diff_blob_cb cb, void *cb_arg, int diff_content)
575 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
576 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
577 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
578 f6861a81 2018-09-13 stsp char *l1 = NULL, *l2 = NULL;
580 883f0469 2018-06-23 stsp if (tree1) {
581 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
582 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree1);
583 883f0469 2018-06-23 stsp te1 = SIMPLEQ_FIRST(&entries->head);
584 60f50a58 2018-09-15 stsp if (te1 && asprintf(&l1, "%s%s%s", label1, label1[0] ? "/" : "",
585 f6861a81 2018-09-13 stsp te1->name) == -1)
586 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
588 883f0469 2018-06-23 stsp if (tree2) {
589 883f0469 2018-06-23 stsp const struct got_tree_entries *entries;
590 883f0469 2018-06-23 stsp entries = got_object_tree_get_entries(tree2);
591 883f0469 2018-06-23 stsp te2 = SIMPLEQ_FIRST(&entries->head);
592 60f50a58 2018-09-15 stsp if (te2 && asprintf(&l2, "%s%s%s", label2, label2[0] ? "/" : "",
593 f6861a81 2018-09-13 stsp te2->name) == -1)
594 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
599 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
601 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree2,
602 1de5e065 2019-06-01 stsp te1->name);
606 f6861a81 2018-09-13 stsp if (te && asprintf(&l2, "%s%s%s", label2,
607 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te->name) == -1)
609 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
611 aaa13589 2019-06-01 stsp err = diff_entry_old_new(te1, te, l1, l2, repo, cb,
612 31b4484f 2019-07-27 stsp cb_arg, diff_content);
618 1de5e065 2019-06-01 stsp const struct got_tree_entry *te = NULL;
620 1de5e065 2019-06-01 stsp te = got_object_tree_find_entry(tree1,
621 1de5e065 2019-06-01 stsp te2->name);
624 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
625 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te->name) == -1)
627 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
629 d6ce02f1 2018-11-17 stsp if (asprintf(&l2, "%s%s%s", label2,
630 d6ce02f1 2018-11-17 stsp label2[0] ? "/" : "", te2->name) == -1)
632 638f9024 2019-05-13 stsp got_error_from_errno("asprintf");
634 31b4484f 2019-07-27 stsp err = diff_entry_new_old(te2, te, l2, repo,
635 31b4484f 2019-07-27 stsp cb, cb_arg, diff_content);
643 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
645 f6861a81 2018-09-13 stsp asprintf(&l1, "%s%s%s", label1,
646 f6861a81 2018-09-13 stsp label1[0] ? "/" : "", te1->name) == -1)
647 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
652 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
654 f6861a81 2018-09-13 stsp asprintf(&l2, "%s%s%s", label2,
655 f6861a81 2018-09-13 stsp label2[0] ? "/" : "", te2->name) == -1)
656 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
658 474b4f94 2017-11-30 stsp } while (te1 || te2);
660 11528a82 2018-05-19 stsp return err;
663 11528a82 2018-05-19 stsp const struct got_error *
664 15a94983 2018-12-23 stsp got_diff_objects_as_blobs(struct got_object_id *id1, struct got_object_id *id2,
665 54156555 2018-12-24 stsp const char *label1, const char *label2, int diff_context,
666 63035f9f 2019-10-06 stsp int ignore_whitespace, struct got_repository *repo, FILE *outfile)
668 11528a82 2018-05-19 stsp const struct got_error *err;
669 11528a82 2018-05-19 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
671 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
672 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
675 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob1, repo, id1, 8192);
680 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob2, repo, id2, 8192);
684 54156555 2018-12-24 stsp err = got_diff_blob(blob1, blob2, label1, label2, diff_context,
685 63035f9f 2019-10-06 stsp ignore_whitespace, outfile);
688 11528a82 2018-05-19 stsp got_object_blob_close(blob1);
690 11528a82 2018-05-19 stsp got_object_blob_close(blob2);
691 474b4f94 2017-11-30 stsp return err;
694 11528a82 2018-05-19 stsp const struct got_error *
695 15a94983 2018-12-23 stsp got_diff_objects_as_trees(struct got_object_id *id1, struct got_object_id *id2,
696 63035f9f 2019-10-06 stsp char *label1, char *label2, int diff_context, int ignore_whitespace,
697 63035f9f 2019-10-06 stsp struct got_repository *repo, FILE *outfile)
699 11528a82 2018-05-19 stsp const struct got_error *err;
700 11528a82 2018-05-19 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
701 aaa13589 2019-06-01 stsp struct got_diff_blob_output_unidiff_arg arg;
703 15a94983 2018-12-23 stsp if (id1 == NULL && id2 == NULL)
704 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
707 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree1, repo, id1);
712 15a94983 2018-12-23 stsp err = got_object_open_as_tree(&tree2, repo, id2);
716 aaa13589 2019-06-01 stsp arg.diff_context = diff_context;
717 63035f9f 2019-10-06 stsp arg.ignore_whitespace = ignore_whitespace;
718 aaa13589 2019-06-01 stsp arg.outfile = outfile;
719 aaa13589 2019-06-01 stsp err = got_diff_tree(tree1, tree2, label1, label2, repo,
720 31b4484f 2019-07-27 stsp got_diff_blob_output_unidiff, &arg, 1);
723 11528a82 2018-05-19 stsp got_object_tree_close(tree1);
725 11528a82 2018-05-19 stsp got_object_tree_close(tree2);
726 11528a82 2018-05-19 stsp return err;
729 11528a82 2018-05-19 stsp const struct got_error *
730 15a94983 2018-12-23 stsp got_diff_objects_as_commits(struct got_object_id *id1,
731 63035f9f 2019-10-06 stsp struct got_object_id *id2, int diff_context, int ignore_whitespace,
732 15a94983 2018-12-23 stsp struct got_repository *repo, FILE *outfile)
734 11528a82 2018-05-19 stsp const struct got_error *err;
735 11528a82 2018-05-19 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
737 15a94983 2018-12-23 stsp if (id2 == NULL)
738 b74c7625 2018-05-20 stsp return got_error(GOT_ERR_NO_OBJ);
741 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit1, repo, id1);
746 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, repo, id2);
750 15a94983 2018-12-23 stsp err = got_diff_objects_as_trees(
751 15a94983 2018-12-23 stsp commit1 ? got_object_commit_get_tree_id(commit1) : NULL,
752 63035f9f 2019-10-06 stsp got_object_commit_get_tree_id(commit2), "", "", diff_context,
753 63035f9f 2019-10-06 stsp ignore_whitespace, repo, outfile);
755 11528a82 2018-05-19 stsp if (commit1)
756 11528a82 2018-05-19 stsp got_object_commit_close(commit1);
757 11528a82 2018-05-19 stsp if (commit2)
758 11528a82 2018-05-19 stsp got_object_commit_close(commit2);
759 11528a82 2018-05-19 stsp return err;
762 dc424a06 2019-08-07 stsp const struct got_error *
763 dc424a06 2019-08-07 stsp got_diff_files(struct got_diff_changes **changes,
764 dc424a06 2019-08-07 stsp struct got_diff_state **ds,
765 dc424a06 2019-08-07 stsp struct got_diff_args **args,
766 dc424a06 2019-08-07 stsp int *flags,
767 dc424a06 2019-08-07 stsp FILE *f1, size_t size1, const char *label1,
768 dc424a06 2019-08-07 stsp FILE *f2, size_t size2, const char *label2,
769 dc424a06 2019-08-07 stsp int diff_context, FILE *outfile)
771 dc424a06 2019-08-07 stsp const struct got_error *err = NULL;
774 dc424a06 2019-08-07 stsp *flags = 0;
775 dc424a06 2019-08-07 stsp *ds = calloc(1, sizeof(**ds));
776 dc424a06 2019-08-07 stsp if (*ds == NULL)
777 dc424a06 2019-08-07 stsp return got_error_from_errno("calloc");
778 dc424a06 2019-08-07 stsp *args = calloc(1, sizeof(**args));
779 dc424a06 2019-08-07 stsp if (*args == NULL) {
780 dc424a06 2019-08-07 stsp err = got_error_from_errno("calloc");
784 dc424a06 2019-08-07 stsp if (changes)
785 dc424a06 2019-08-07 stsp *changes = NULL;
787 dc424a06 2019-08-07 stsp if (f1 == NULL)
788 dc424a06 2019-08-07 stsp *flags |= D_EMPTY1;
790 dc424a06 2019-08-07 stsp if (f2 == NULL)
791 dc424a06 2019-08-07 stsp *flags |= D_EMPTY2;
793 dc424a06 2019-08-07 stsp /* XXX should stat buffers be passed in args instead of ds? */
794 dc424a06 2019-08-07 stsp (*ds)->stb1.st_mode = S_IFREG;
795 dc424a06 2019-08-07 stsp (*ds)->stb1.st_size = size1;
796 dc424a06 2019-08-07 stsp (*ds)->stb1.st_mtime = 0; /* XXX */
798 dc424a06 2019-08-07 stsp (*ds)->stb2.st_mode = S_IFREG;
799 dc424a06 2019-08-07 stsp (*ds)->stb2.st_size = size2;
800 dc424a06 2019-08-07 stsp (*ds)->stb2.st_mtime = 0; /* XXX */
802 dc424a06 2019-08-07 stsp (*args)->diff_format = D_UNIFIED;
803 dc424a06 2019-08-07 stsp (*args)->label[0] = label1;
804 dc424a06 2019-08-07 stsp (*args)->label[1] = label2;
805 dc424a06 2019-08-07 stsp (*args)->diff_context = diff_context;
806 dc424a06 2019-08-07 stsp *flags |= D_PROTOTYPE;
808 dc424a06 2019-08-07 stsp if (outfile) {
809 dc424a06 2019-08-07 stsp fprintf(outfile, "file - %s\n",
810 dc424a06 2019-08-07 stsp f1 == NULL ? "/dev/null" : label1);
811 dc424a06 2019-08-07 stsp fprintf(outfile, "file + %s\n",
812 dc424a06 2019-08-07 stsp f2 == NULL ? "/dev/null" : label2);
814 dc424a06 2019-08-07 stsp if (changes) {
815 dc424a06 2019-08-07 stsp err = alloc_changes(changes);
819 dc424a06 2019-08-07 stsp err = got_diffreg(&res, f1, f2, *flags, *args, *ds, outfile,
820 dc424a06 2019-08-07 stsp changes ? *changes : NULL);
824 dc424a06 2019-08-07 stsp got_diff_state_free(*ds);
826 dc424a06 2019-08-07 stsp *ds = NULL;
828 dc424a06 2019-08-07 stsp if (*args) {
829 dc424a06 2019-08-07 stsp free(*args);
830 dc424a06 2019-08-07 stsp *args = NULL;
832 dc424a06 2019-08-07 stsp if (changes) {
833 dc424a06 2019-08-07 stsp if (*changes)
834 dc424a06 2019-08-07 stsp got_diff_free_changes(*changes);
835 dc424a06 2019-08-07 stsp *changes = NULL;
838 dc424a06 2019-08-07 stsp return err;
