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_diff_lib.h"
33 #include "got_path_lib.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;
128 err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
137 struct got_tree_entry *
138 match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
140 struct got_tree_entry *te2;
142 SIMPLEQ_FOREACH(te2, &tree2->entries, entry) {
143 if (strcmp(te1->name, te2->name) == 0)
149 static const struct got_error *
150 diff_added_blob(struct got_object_id *id, struct got_repository *repo,
153 const struct got_error *err;
154 struct got_blob_object *blob;
155 struct got_object *obj;
157 err = got_object_open(&obj, repo, id);
160 err = got_object_blob_open(&blob, repo, obj, 8192);
164 return got_diff_blob(NULL, blob, NULL, NULL, outfile);
167 static const struct got_error *
168 diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
169 struct got_repository *repo, FILE *outfile)
171 const struct got_error *err;
172 struct got_object *obj1 = NULL;
173 struct got_object *obj2 = NULL;
174 struct got_blob_object *blob1 = NULL;
175 struct got_blob_object *blob2 = NULL;
177 err = got_object_open(&obj1, repo, id1);
179 return got_error(GOT_ERR_BAD_OBJ_HDR);
180 if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) {
181 err = got_error(GOT_ERR_OBJ_TYPE);
185 err = got_object_open(&obj2, repo, id2);
187 err= got_error(GOT_ERR_BAD_OBJ_HDR);
190 if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) {
191 err = got_error(GOT_ERR_BAD_OBJ_DATA);
195 err = got_object_blob_open(&blob1, repo, obj1, 8192);
197 err = got_error(GOT_ERR_FILE_OPEN);
201 err = got_object_blob_open(&blob2, repo, obj2, 8192);
203 err = got_error(GOT_ERR_FILE_OPEN);
207 err = got_diff_blob(blob1, blob2, NULL, NULL, outfile);
211 got_object_close(obj1);
213 got_object_close(obj2);
215 got_object_blob_close(blob1);
217 got_object_blob_close(blob2);
221 static const struct got_error *
222 diff_deleted_blob(struct got_object_id *id, struct got_repository *repo,
225 const struct got_error *err;
226 struct got_blob_object *blob;
227 struct got_object *obj;
229 err = got_object_open(&obj, repo, id);
232 err = got_object_blob_open(&blob, repo, obj, 8192);
236 return got_diff_blob(blob, NULL, NULL, NULL, outfile);
239 static const struct got_error *
240 diff_added_tree(struct got_object_id *id, struct got_repository *repo,
243 const struct got_error *err = NULL;
244 struct got_object *treeobj = NULL;
245 struct got_tree_object *tree = NULL;
247 err = got_object_open(&treeobj, repo, id);
251 if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
252 err = got_error(GOT_ERR_OBJ_TYPE);
256 err = got_object_tree_open(&tree, repo, treeobj);
260 err = got_diff_tree(NULL, tree, repo, outfile);
264 got_object_tree_close(tree);
266 got_object_close(treeobj);
270 static const struct got_error *
271 diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
272 struct got_repository *repo, FILE *outfile)
274 const struct got_error *err = NULL;
275 struct got_object *treeobj1 = NULL;
276 struct got_object *treeobj2 = NULL;
277 struct got_tree_object *tree1 = NULL;
278 struct got_tree_object *tree2 = NULL;
280 err = got_object_open(&treeobj1, repo, id1);
284 if (got_object_get_type(treeobj1) != GOT_OBJ_TYPE_TREE) {
285 err = got_error(GOT_ERR_OBJ_TYPE);
289 err = got_object_open(&treeobj2, repo, id2);
293 if (got_object_get_type(treeobj2) != GOT_OBJ_TYPE_TREE) {
294 err = got_error(GOT_ERR_OBJ_TYPE);
298 err = got_object_tree_open(&tree1, repo, treeobj1);
302 err = got_object_tree_open(&tree2, repo, treeobj2);
306 err = got_diff_tree(tree1, tree2, repo, outfile);
310 got_object_tree_close(tree1);
312 got_object_tree_close(tree2);
314 got_object_close(treeobj1);
316 got_object_close(treeobj2);
320 static const struct got_error *
321 diff_deleted_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
323 const struct got_error *err = NULL;
324 struct got_object *treeobj = NULL;
325 struct got_tree_object *tree = NULL;
327 err = got_object_open(&treeobj, repo, id);
331 if (got_object_get_type(treeobj) != GOT_OBJ_TYPE_TREE) {
332 err = got_error(GOT_ERR_OBJ_TYPE);
336 err = got_object_tree_open(&tree, repo, treeobj);
340 err = got_diff_tree(tree, NULL, repo, outfile);
344 got_object_tree_close(tree);
346 got_object_close(treeobj);
350 static const struct got_error *
351 diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2,
358 static const struct got_error *
359 diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
360 struct got_repository *repo, FILE *outfile)
362 struct got_tree_entry *te2;
364 te2 = match_entry_by_name(te1, tree2);
366 if (S_ISDIR(te1->mode))
367 return diff_deleted_tree(te1->id, repo, outfile);
368 return diff_deleted_blob(te1->id, repo, outfile);
371 if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
372 if (got_object_id_cmp(te1->id, te2->id) != 0)
373 return diff_modified_tree(te1->id, te2->id, repo,
375 } else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
376 if (got_object_id_cmp(te1->id, te2->id) != 0)
377 return diff_modified_blob(te1->id, te2->id, repo,
381 return diff_kind_mismatch(te1->id, te2->id, outfile);
384 static const struct got_error *
385 diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
386 struct got_repository *repo, FILE *outfile)
388 struct got_tree_entry *te1;
390 te1 = match_entry_by_name(te2, tree1);
391 if (te1 != NULL) /* handled by diff_entry_old_new() */
394 if (S_ISDIR(te2->mode))
395 return diff_added_tree(te2->id, repo, outfile);
396 return diff_added_blob(te2->id, repo, outfile);
399 const struct got_error *
400 got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
401 struct got_repository *repo, FILE *outfile)
403 const struct got_error *err = NULL;
404 struct got_tree_entry *te1 = NULL;
405 struct got_tree_entry *te2 = NULL;
408 te1 = SIMPLEQ_FIRST(&tree1->entries);
410 te2 = SIMPLEQ_FIRST(&tree2->entries);
414 err = diff_entry_old_new(te1, tree2, repo, outfile);
420 err = diff_entry_new_old(te2, tree1, repo, outfile);
426 te1 = SIMPLEQ_NEXT(te1, entry);
428 te2 = SIMPLEQ_NEXT(te2, entry);
429 } while (te1 || te2);