2 * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 #include <sys/queue.h>
27 #include "got_repository.h"
28 #include "got_object.h"
29 #include "got_error.h"
32 #include "got_lib_diff.h"
33 #include "got_lib_path.h"
35 const struct got_error *
36 got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
37 const char *label1, const char *label2, FILE *outfile)
39 struct got_diff_state ds;
40 struct got_diff_args args;
41 const struct got_error *err = NULL;
42 FILE *f1 = NULL, *f2 = NULL;
43 char hex1[SHA1_DIGEST_STRING_LENGTH];
44 char hex2[SHA1_DIGEST_STRING_LENGTH];
45 char *idstr1 = NULL, *idstr2 = NULL;
53 return got_error(GOT_ERR_FILE_OPEN);
61 return got_error(GOT_ERR_FILE_OPEN);
68 idstr1 = got_object_blob_id_str(blob1, hex1, sizeof(hex1));
69 hdrlen = got_object_blob_get_hdrlen(blob1);
71 err = got_object_blob_read_block(&len, blob1);
77 /* Skip blob object header first time around. */
78 fwrite(got_object_blob_get_read_buf(blob1) + hdrlen, len - hdrlen, 1, f1);
86 idstr2 = got_object_blob_id_str(blob2, hex2, sizeof(hex2));
87 hdrlen = got_object_blob_get_hdrlen(blob2);
89 err = got_object_blob_read_block(&len, blob2);
95 /* Skip blob object header first time around. */
96 fwrite(got_object_blob_get_read_buf(blob2) + hdrlen, len - hdrlen, 1, f2);
100 idstr2 = "/dev/null";
111 memset(&ds, 0, sizeof(ds));
112 /* XXX should stat buffers be passed in args instead of ds? */
113 ds.stb1.st_mode = S_IFREG;
115 ds.stb1.st_size = size1;
116 ds.stb1.st_mtime = 0; /* XXX */
118 ds.stb2.st_mode = S_IFREG;
120 ds.stb2.st_size = size2;
121 ds.stb2.st_mtime = 0; /* XXX */
123 memset(&args, 0, sizeof(args));
124 args.diff_format = D_UNIFIED;
125 args.label[0] = label1 ? label1 : idstr1;
126 args.label[1] = label2 ? label2 : idstr2;
127 args.diff_context = 3;
128 flags |= D_PROTOTYPE;
130 err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
139 struct got_tree_entry *
140 match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
142 struct got_tree_entry *te2;
144 SIMPLEQ_FOREACH(te2, &tree2->entries, entry) {
145 if (strcmp(te1->name, te2->name) == 0)
151 static const struct got_error *
152 diff_added_blob(struct got_object_id *id, struct got_repository *repo,
155 const struct got_error *err;
156 struct got_blob_object *blob = NULL;
157 struct got_object *obj = NULL;
159 err = got_object_open(&obj, repo, id);
163 err = got_object_blob_open(&blob, repo, obj, 8192);
166 err = got_diff_blob(NULL, blob, NULL, NULL, outfile);
168 got_object_close(obj);
170 got_object_blob_close(blob);
174 static const struct got_error *
175 diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
176 struct got_repository *repo, FILE *outfile)
178 const struct got_error *err;
179 struct got_object *obj1 = NULL;
180 struct got_object *obj2 = NULL;
181 struct got_blob_object *blob1 = NULL;
182 struct got_blob_object *blob2 = NULL;
184 err = got_object_open(&obj1, repo, id1);
186 return got_error(GOT_ERR_BAD_OBJ_HDR);
187 if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
188 err = got_error(GOT_ERR_OBJ_TYPE);
192 err = got_object_open(&obj2, repo, id2);
194 err= got_error(GOT_ERR_BAD_OBJ_HDR);
197 if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
198 err = got_error(GOT_ERR_BAD_OBJ_DATA);
202 err = got_object_blob_open(&blob1, repo, obj1, 8192);
206 err = got_object_blob_open(&blob2, repo, obj2, 8192);
210 err = got_diff_blob(blob1, blob2, NULL, NULL, outfile);
214 got_object_close(obj1);
216 got_object_close(obj2);
218 got_object_blob_close(blob1);
220 got_object_blob_close(blob2);
224 static const struct got_error *
225 diff_deleted_blob(struct got_object_id *id, struct got_repository *repo,
228 const struct got_error *err;
229 struct got_blob_object *blob = NULL;
230 struct got_object *obj = NULL;
232 err = got_object_open(&obj, repo, id);
236 err = got_object_blob_open(&blob, repo, obj, 8192);
239 err = got_diff_blob(blob, NULL, NULL, NULL, outfile);
241 got_object_close(obj);
243 got_object_blob_close(blob);
247 static const struct got_error *
248 diff_added_tree(struct got_object_id *id, struct got_repository *repo,
251 const struct got_error *err = NULL;
252 struct got_object *treeobj = NULL;
253 struct got_tree_object *tree = NULL;
255 err = got_object_open(&treeobj, repo, id);
259 if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
260 err = got_error(GOT_ERR_OBJ_TYPE);
264 err = got_object_tree_open(&tree, repo, treeobj);
268 err = got_diff_tree(NULL, tree, repo, outfile);
272 got_object_tree_close(tree);
274 got_object_close(treeobj);
278 static const struct got_error *
279 diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
280 struct got_repository *repo, FILE *outfile)
282 const struct got_error *err = NULL;
283 struct got_object *treeobj1 = NULL;
284 struct got_object *treeobj2 = NULL;
285 struct got_tree_object *tree1 = NULL;
286 struct got_tree_object *tree2 = NULL;
288 err = got_object_open(&treeobj1, repo, id1);
292 if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
293 err = got_error(GOT_ERR_OBJ_TYPE);
297 err = got_object_open(&treeobj2, repo, id2);
301 if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
302 err = got_error(GOT_ERR_OBJ_TYPE);
306 err = got_object_tree_open(&tree1, repo, treeobj1);
310 err = got_object_tree_open(&tree2, repo, treeobj2);
314 err = got_diff_tree(tree1, tree2, repo, outfile);
318 got_object_tree_close(tree1);
320 got_object_tree_close(tree2);
322 got_object_close(treeobj1);
324 got_object_close(treeobj2);
328 static const struct got_error *
329 diff_deleted_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
331 const struct got_error *err = NULL;
332 struct got_object *treeobj = NULL;
333 struct got_tree_object *tree = NULL;
335 err = got_object_open(&treeobj, repo, id);
339 if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
340 err = got_error(GOT_ERR_OBJ_TYPE);
344 err = got_object_tree_open(&tree, repo, treeobj);
348 err = got_diff_tree(tree, NULL, repo, outfile);
352 got_object_tree_close(tree);
354 got_object_close(treeobj);
358 static const struct got_error *
359 diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
366 static const struct got_error *
367 diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
368 struct got_repository *repo, FILE *outfile)
370 struct got_tree_entry *te2 = NULL;
373 te2 = match_entry_by_name(te1, tree2);
375 if (S_ISDIR(te1->mode))
376 return diff_deleted_tree(te1->id, repo, outfile);
377 return diff_deleted_blob(te1->id, repo, outfile);
380 if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
381 if (got_object_id_cmp(te1->id, te2->id) != 0)
382 return diff_modified_tree(te1->id, te2->id, repo,
384 } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
385 if (got_object_id_cmp(te1->id, te2->id) != 0)
386 return diff_modified_blob(te1->id, te2->id, repo,
390 return diff_kind_mismatch(te1->id, te2->id, outfile);
393 static const struct got_error *
394 diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
395 struct got_repository *repo, FILE *outfile)
398 struct got_tree_entry *te1 = match_entry_by_name(te2, tree1);
399 if (te1 != NULL) /* handled by diff_entry_old_new() */
403 if (S_ISDIR(te2->mode))
404 return diff_added_tree(te2->id, repo, outfile);
405 return diff_added_blob(te2->id, repo, outfile);
408 const struct got_error *
409 got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
410 struct got_repository *repo, FILE *outfile)
412 const struct got_error *err = NULL;
413 struct got_tree_entry *te1 = NULL;
414 struct got_tree_entry *te2 = NULL;
417 te1 = SIMPLEQ_FIRST(&tree1->entries);
419 te2 = SIMPLEQ_FIRST(&tree2->entries);
423 err = diff_entry_old_new(te1, tree2, repo, outfile);
429 err = diff_entry_new_old(te2, tree1, repo, outfile);
435 te1 = SIMPLEQ_NEXT(te1, entry);
437 te2 = SIMPLEQ_NEXT(te2, entry);
438 } while (te1 || te2);