2 7d283eee 2017-11-29 stsp * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 7d283eee 2017-11-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 7d283eee 2017-11-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 7d283eee 2017-11-29 stsp * copyright notice and this permission notice appear in all copies.
8 7d283eee 2017-11-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 7d283eee 2017-11-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 7d283eee 2017-11-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 7d283eee 2017-11-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 7d283eee 2017-11-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 7d283eee 2017-11-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 7d283eee 2017-11-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 7d283eee 2017-11-29 stsp #include <sys/queue.h>
18 1c7f0520 2017-11-29 stsp #include <sys/stat.h>
20 7d283eee 2017-11-29 stsp #include <stdio.h>
21 7d283eee 2017-11-29 stsp #include <stdlib.h>
22 7d283eee 2017-11-29 stsp #include <string.h>
23 f9d67749 2017-11-30 stsp #include <limits.h>
24 7d283eee 2017-11-29 stsp #include <sha1.h>
25 7d283eee 2017-11-29 stsp #include <zlib.h>
27 7d283eee 2017-11-29 stsp #include "got_repository.h"
28 7d283eee 2017-11-29 stsp #include "got_object.h"
29 7d283eee 2017-11-29 stsp #include "got_error.h"
30 789689b5 2017-11-30 stsp #include "got_diff.h"
32 718b3ab0 2018-03-17 stsp #include "got_lib_diff.h"
33 718b3ab0 2018-03-17 stsp #include "got_lib_path.h"
35 7d283eee 2017-11-29 stsp const struct got_error *
36 7d283eee 2017-11-29 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
37 474b4f94 2017-11-30 stsp const char *label1, const char *label2, FILE *outfile)
39 ed9e98a8 2017-11-29 stsp struct got_diff_state ds;
40 8ba9a219 2017-11-29 stsp struct got_diff_args args;
41 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
42 4e22badc 2017-11-30 stsp FILE *f1 = NULL, *f2 = NULL;
43 f78b0693 2017-11-29 stsp char hex1[SHA1_DIGEST_STRING_LENGTH];
44 f78b0693 2017-11-29 stsp char hex2[SHA1_DIGEST_STRING_LENGTH];
45 98abbc84 2017-11-30 stsp char *idstr1 = NULL, *idstr2 = NULL;
46 f9d67749 2017-11-30 stsp size_t len, hdrlen;
47 f934cf2c 2018-02-12 stsp size_t size1, size2;
48 4e22badc 2017-11-30 stsp int res, flags = 0;
50 4e22badc 2017-11-30 stsp if (blob1) {
51 a1fd68d8 2018-01-12 stsp f1 = got_opentemp();
52 4e22badc 2017-11-30 stsp if (f1 == NULL)
53 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
55 4e22badc 2017-11-30 stsp flags |= D_EMPTY1;
57 4e22badc 2017-11-30 stsp if (blob2) {
58 a1fd68d8 2018-01-12 stsp f2 = got_opentemp();
59 4e22badc 2017-11-30 stsp if (f2 == NULL) {
61 4e22badc 2017-11-30 stsp return got_error(GOT_ERR_FILE_OPEN);
64 4e22badc 2017-11-30 stsp flags |= D_EMPTY2;
67 98abbc84 2017-11-30 stsp if (blob1) {
68 f934cf2c 2018-02-12 stsp idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
69 f934cf2c 2018-02-12 stsp hdrlen = got_object_blob_get_hdrlen(blob1);
71 eb651edf 2018-02-11 stsp err = got_object_blob_read_block(&len, blob1);
74 eba5c6bb 2018-02-11 stsp if (len == 0)
76 f934cf2c 2018-02-12 stsp size1 += len;
77 4e22badc 2017-11-30 stsp /* Skip blob object header first time around. */
78 dfb54902 2018-04-02 stsp fwrite(got_object_blob_get_read_buf(blob1) + hdrlen,
79 dfb54902 2018-04-02 stsp len - hdrlen, 1, f1);
81 4e22badc 2017-11-30 stsp } while (len != 0);
83 98abbc84 2017-11-30 stsp idstr1 = "/dev/null";
86 98abbc84 2017-11-30 stsp if (blob2) {
87 f934cf2c 2018-02-12 stsp idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
88 f934cf2c 2018-02-12 stsp hdrlen = got_object_blob_get_hdrlen(blob2);
90 eb651edf 2018-02-11 stsp err = got_object_blob_read_block(&len, blob2);
93 eba5c6bb 2018-02-11 stsp if (len == 0)
95 f934cf2c 2018-02-12 stsp size2 += len;
96 98abbc84 2017-11-30 stsp /* Skip blob object header first time around. */
97 dfb54902 2018-04-02 stsp fwrite(got_object_blob_get_read_buf(blob2) + hdrlen,
98 dfb54902 2018-04-02 stsp len - hdrlen, 1, f2);
100 98abbc84 2017-11-30 stsp } while (len != 0);
102 98abbc84 2017-11-30 stsp idstr2 = "/dev/null";
105 eba5c6bb 2018-02-11 stsp fflush(f1);
106 eba5c6bb 2018-02-11 stsp rewind(f1);
109 98abbc84 2017-11-30 stsp fflush(f2);
110 eba5c6bb 2018-02-11 stsp rewind(f2);
113 ed9e98a8 2017-11-29 stsp memset(&ds, 0, sizeof(ds));
114 f9d67749 2017-11-30 stsp /* XXX should stat buffers be passed in args instead of ds? */
115 f9d67749 2017-11-30 stsp ds.stb1.st_mode = S_IFREG;
117 f934cf2c 2018-02-12 stsp ds.stb1.st_size = size1;
118 f9d67749 2017-11-30 stsp ds.stb1.st_mtime = 0; /* XXX */
120 f9d67749 2017-11-30 stsp ds.stb2.st_mode = S_IFREG;
122 f934cf2c 2018-02-12 stsp ds.stb2.st_size = size2;
123 f9d67749 2017-11-30 stsp ds.stb2.st_mtime = 0; /* XXX */
125 f9d67749 2017-11-30 stsp memset(&args, 0, sizeof(args));
126 8ba9a219 2017-11-29 stsp args.diff_format = D_UNIFIED;
127 98abbc84 2017-11-30 stsp args.label[0] = label1 ? label1 : idstr1;
128 98abbc84 2017-11-30 stsp args.label[1] = label2 ? label2 : idstr2;
129 c2c21d46 2018-03-27 stsp args.diff_context = 3;
130 84eb021e 2018-03-27 stsp flags |= D_PROTOTYPE;
132 cb74ff21 2017-11-30 stsp err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
135 98abbc84 2017-11-30 stsp fclose(f1);
137 98abbc84 2017-11-30 stsp fclose(f2);
138 7d283eee 2017-11-29 stsp return err;
141 a3e2cbea 2017-12-01 stsp struct got_tree_entry *
142 a3e2cbea 2017-12-01 stsp match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
144 a3e2cbea 2017-12-01 stsp struct got_tree_entry *te2;
146 a3e2cbea 2017-12-01 stsp SIMPLEQ_FOREACH(te2, &tree2->entries, entry) {
147 a3e2cbea 2017-12-01 stsp if (strcmp(te1->name, te2->name) == 0)
148 a3e2cbea 2017-12-01 stsp return te2;
150 474b4f94 2017-11-30 stsp return NULL;
153 474b4f94 2017-11-30 stsp static const struct got_error *
154 74671950 2018-02-11 stsp diff_added_blob(struct got_object_id *id, struct got_repository *repo,
155 74671950 2018-02-11 stsp FILE *outfile)
157 4e22badc 2017-11-30 stsp const struct got_error *err;
158 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
159 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
161 4e22badc 2017-11-30 stsp err = got_object_open(&obj, repo, id);
163 4e22badc 2017-11-30 stsp return err;
165 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
168 2acfca77 2018-04-01 stsp err = got_diff_blob(NULL, blob, NULL, NULL, outfile);
170 2acfca77 2018-04-01 stsp got_object_close(obj);
172 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
173 2acfca77 2018-04-01 stsp return err;
176 474b4f94 2017-11-30 stsp static const struct got_error *
177 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
178 74671950 2018-02-11 stsp struct got_repository *repo, FILE *outfile)
180 6a213ccb 2017-11-30 stsp const struct got_error *err;
181 6a213ccb 2017-11-30 stsp struct got_object *obj1 = NULL;
182 6a213ccb 2017-11-30 stsp struct got_object *obj2 = NULL;
183 6a213ccb 2017-11-30 stsp struct got_blob_object *blob1 = NULL;
184 6a213ccb 2017-11-30 stsp struct got_blob_object *blob2 = NULL;
186 6a213ccb 2017-11-30 stsp err = got_object_open(&obj1, repo, id1);
188 6a213ccb 2017-11-30 stsp return got_error(GOT_ERR_BAD_OBJ_HDR);
189 eef6493a 2018-01-19 stsp if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
190 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
194 6a213ccb 2017-11-30 stsp err = got_object_open(&obj2, repo, id2);
196 6a213ccb 2017-11-30 stsp err= got_error(GOT_ERR_BAD_OBJ_HDR);
199 eef6493a 2018-01-19 stsp if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
200 6a213ccb 2017-11-30 stsp err = got_error(GOT_ERR_BAD_OBJ_DATA);
204 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
208 c7020aea 2017-11-30 stsp err = got_object_blob_open(&blob2, repo, obj2, 8192);
212 74671950 2018-02-11 stsp err = got_diff_blob(blob1, blob2, NULL, NULL, outfile);
216 a3e2cbea 2017-12-01 stsp got_object_close(obj1);
218 a3e2cbea 2017-12-01 stsp got_object_close(obj2);
220 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob1);
222 a3e2cbea 2017-12-01 stsp got_object_blob_close(blob2);
223 6a213ccb 2017-11-30 stsp return err;
226 474b4f94 2017-11-30 stsp static const struct got_error *
227 74671950 2018-02-11 stsp diff_deleted_blob(struct got_object_id *id, struct got_repository *repo,
228 74671950 2018-02-11 stsp FILE *outfile)
230 365fb436 2017-11-30 stsp const struct got_error *err;
231 2acfca77 2018-04-01 stsp struct got_blob_object *blob = NULL;
232 2acfca77 2018-04-01 stsp struct got_object *obj = NULL;
234 365fb436 2017-11-30 stsp err = got_object_open(&obj, repo, id);
236 365fb436 2017-11-30 stsp return err;
238 2acfca77 2018-04-01 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
241 2acfca77 2018-04-01 stsp err = got_diff_blob(blob, NULL, NULL, NULL, outfile);
243 2acfca77 2018-04-01 stsp got_object_close(obj);
245 2acfca77 2018-04-01 stsp got_object_blob_close(blob);
246 2acfca77 2018-04-01 stsp return err;
249 474b4f94 2017-11-30 stsp static const struct got_error *
250 74671950 2018-02-11 stsp diff_added_tree(struct got_object_id *id, struct got_repository *repo,
251 74671950 2018-02-11 stsp FILE *outfile)
253 9c70d4c3 2017-11-30 stsp const struct got_error *err = NULL;
254 9c70d4c3 2017-11-30 stsp struct got_object *treeobj = NULL;
255 9c70d4c3 2017-11-30 stsp struct got_tree_object *tree = NULL;
257 9c70d4c3 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
261 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
262 9c70d4c3 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
266 9c70d4c3 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
270 74671950 2018-02-11 stsp err = got_diff_tree(NULL, tree, repo, outfile);
274 9c70d4c3 2017-11-30 stsp got_object_tree_close(tree);
275 9c70d4c3 2017-11-30 stsp if (treeobj)
276 9c70d4c3 2017-11-30 stsp got_object_close(treeobj);
277 9c70d4c3 2017-11-30 stsp return err;
280 474b4f94 2017-11-30 stsp static const struct got_error *
281 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
282 74671950 2018-02-11 stsp struct got_repository *repo, FILE *outfile)
284 789689b5 2017-11-30 stsp const struct got_error *err = NULL;
285 789689b5 2017-11-30 stsp struct got_object *treeobj1 = NULL;
286 789689b5 2017-11-30 stsp struct got_object *treeobj2 = NULL;
287 789689b5 2017-11-30 stsp struct got_tree_object *tree1 = NULL;
288 789689b5 2017-11-30 stsp struct got_tree_object *tree2 = NULL;
290 789689b5 2017-11-30 stsp err = got_object_open(&treeobj1, repo, id1);
294 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
295 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
299 789689b5 2017-11-30 stsp err = got_object_open(&treeobj2, repo, id2);
303 eef6493a 2018-01-19 stsp if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
304 789689b5 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
308 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree1, repo, treeobj1);
312 789689b5 2017-11-30 stsp err = got_object_tree_open(&tree2, repo, treeobj2);
316 74671950 2018-02-11 stsp err = got_diff_tree(tree1, tree2, repo, outfile);
320 789689b5 2017-11-30 stsp got_object_tree_close(tree1);
322 789689b5 2017-11-30 stsp got_object_tree_close(tree2);
323 789689b5 2017-11-30 stsp if (treeobj1)
324 789689b5 2017-11-30 stsp got_object_close(treeobj1);
325 789689b5 2017-11-30 stsp if (treeobj2)
326 789689b5 2017-11-30 stsp got_object_close(treeobj2);
327 789689b5 2017-11-30 stsp return err;
330 474b4f94 2017-11-30 stsp static const struct got_error *
331 74671950 2018-02-11 stsp diff_deleted_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
333 2c56f2ce 2017-11-30 stsp const struct got_error *err = NULL;
334 2c56f2ce 2017-11-30 stsp struct got_object *treeobj = NULL;
335 2c56f2ce 2017-11-30 stsp struct got_tree_object *tree = NULL;
337 2c56f2ce 2017-11-30 stsp err = got_object_open(&treeobj, repo, id);
341 b107e67f 2018-01-19 stsp if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
342 2c56f2ce 2017-11-30 stsp err = got_error(GOT_ERR_OBJ_TYPE);
346 2c56f2ce 2017-11-30 stsp err = got_object_tree_open(&tree, repo, treeobj);
350 74671950 2018-02-11 stsp err = got_diff_tree(tree, NULL, repo, outfile);
354 2c56f2ce 2017-11-30 stsp got_object_tree_close(tree);
355 2c56f2ce 2017-11-30 stsp if (treeobj)
356 2c56f2ce 2017-11-30 stsp got_object_close(treeobj);
357 2c56f2ce 2017-11-30 stsp return err;
360 474b4f94 2017-11-30 stsp static const struct got_error *
361 74671950 2018-02-11 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
362 74671950 2018-02-11 stsp FILE *outfile)
364 013404a9 2017-11-30 stsp /* XXX TODO */
365 474b4f94 2017-11-30 stsp return NULL;
368 474b4f94 2017-11-30 stsp static const struct got_error *
369 6a213ccb 2017-11-30 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
370 74671950 2018-02-11 stsp struct got_repository *repo, FILE *outfile)
372 07ccb00b 2018-03-27 stsp struct got_tree_entry *te2 = NULL;
375 07ccb00b 2018-03-27 stsp te2 = match_entry_by_name(te1, tree2);
376 474b4f94 2017-11-30 stsp if (te2 == NULL) {
377 474b4f94 2017-11-30 stsp if (S_ISDIR(te1->mode))
378 59ece79d 2018-02-12 stsp return diff_deleted_tree(te1->id, repo, outfile);
379 59ece79d 2018-02-12 stsp return diff_deleted_blob(te1->id, repo, outfile);
382 4209f790 2017-11-30 stsp if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
383 59ece79d 2018-02-12 stsp if (got_object_id_cmp(te1->id, te2->id) != 0)
384 59ece79d 2018-02-12 stsp return diff_modified_tree(te1->id, te2->id, repo,
386 4209f790 2017-11-30 stsp } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
387 59ece79d 2018-02-12 stsp if (got_object_id_cmp(te1->id, te2->id) != 0)
388 59ece79d 2018-02-12 stsp return diff_modified_blob(te1->id, te2->id, repo,
392 59ece79d 2018-02-12 stsp return diff_kind_mismatch(te1->id, te2->id, outfile);
395 474b4f94 2017-11-30 stsp static const struct got_error *
396 4e22badc 2017-11-30 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
397 74671950 2018-02-11 stsp struct got_repository *repo, FILE *outfile)
399 07ccb00b 2018-03-27 stsp if (tree1) {
400 07ccb00b 2018-03-27 stsp struct got_tree_entry *te1 = match_entry_by_name(te2, tree1);
401 07ccb00b 2018-03-27 stsp if (te1 != NULL) /* handled by diff_entry_old_new() */
402 07ccb00b 2018-03-27 stsp return NULL;
405 474b4f94 2017-11-30 stsp if (S_ISDIR(te2->mode))
406 59ece79d 2018-02-12 stsp return diff_added_tree(te2->id, repo, outfile);
407 59ece79d 2018-02-12 stsp return diff_added_blob(te2->id, repo, outfile);
410 474b4f94 2017-11-30 stsp const struct got_error *
411 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
412 74671950 2018-02-11 stsp struct got_repository *repo, FILE *outfile)
414 474b4f94 2017-11-30 stsp const struct got_error *err = NULL;
415 789689b5 2017-11-30 stsp struct got_tree_entry *te1 = NULL;
416 789689b5 2017-11-30 stsp struct got_tree_entry *te2 = NULL;
419 789689b5 2017-11-30 stsp te1 = SIMPLEQ_FIRST(&tree1->entries);
421 789689b5 2017-11-30 stsp te2 = SIMPLEQ_FIRST(&tree2->entries);
425 74671950 2018-02-11 stsp err = diff_entry_old_new(te1, tree2, repo, outfile);
431 74671950 2018-02-11 stsp err = diff_entry_new_old(te2, tree1, repo, outfile);
437 474b4f94 2017-11-30 stsp te1 = SIMPLEQ_NEXT(te1, entry);
439 474b4f94 2017-11-30 stsp te2 = SIMPLEQ_NEXT(te2, entry);
440 474b4f94 2017-11-30 stsp } while (te1 || te2);
442 474b4f94 2017-11-30 stsp return err;