1 7d283eee 2017-11-29 stsp /*
  2 7d283eee 2017-11-29 stsp  * Copyright (c) 2017 Stefan Sperling <stsp@openbsd.org>
  3 7d283eee 2017-11-29 stsp  *
  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.
  7 7d283eee 2017-11-29 stsp  *
  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.
 15 7d283eee 2017-11-29 stsp  */
 16 7d283eee 2017-11-29 stsp 
 17 7d283eee 2017-11-29 stsp #include <sys/queue.h>
 18 1c7f0520 2017-11-29 stsp #include <sys/stat.h>
 19 7d283eee 2017-11-29 stsp 
 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>
 26 7d283eee 2017-11-29 stsp 
 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"
 31 7d283eee 2017-11-29 stsp 
 32 7d283eee 2017-11-29 stsp #include "diff.h"
 33 7d283eee 2017-11-29 stsp 
 34 f9d67749 2017-11-30 stsp static FILE *
 35 f9d67749 2017-11-30 stsp opentemp(void)
 36 7d283eee 2017-11-29 stsp {
 37 f9d67749 2017-11-30 stsp 	char name[PATH_MAX];
 38 7d283eee 2017-11-29 stsp 	int fd;
 39 a7852263 2017-11-30 stsp 	FILE *f;
 40 7d283eee 2017-11-29 stsp 
 41 f9d67749 2017-11-30 stsp 	if (strlcpy(name, "/tmp/got.XXXXXXXX", sizeof(name)) >= sizeof(name))
 42 f9d67749 2017-11-30 stsp 		return NULL;
 43 f9d67749 2017-11-30 stsp 
 44 f9d67749 2017-11-30 stsp 	fd = mkstemp(name);
 45 f9d67749 2017-11-30 stsp 	if (fd < 0)
 46 f9d67749 2017-11-30 stsp 		return NULL;
 47 f9d67749 2017-11-30 stsp 
 48 f9d67749 2017-11-30 stsp 	unlink(name);
 49 a7852263 2017-11-30 stsp 	f = fdopen(fd, "w+");
 50 a7852263 2017-11-30 stsp 	if (f == NULL) {
 51 a7852263 2017-11-30 stsp 		close(fd);
 52 a7852263 2017-11-30 stsp 		return NULL;
 53 a7852263 2017-11-30 stsp 	}
 54 a7852263 2017-11-30 stsp 
 55 a7852263 2017-11-30 stsp 	return f;
 56 7d283eee 2017-11-29 stsp }
 57 7d283eee 2017-11-29 stsp 
 58 7d283eee 2017-11-29 stsp const struct got_error *
 59 7d283eee 2017-11-29 stsp got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
 60 474b4f94 2017-11-30 stsp     const char *label1, const char *label2, FILE *outfile)
 61 7d283eee 2017-11-29 stsp {
 62 ed9e98a8 2017-11-29 stsp 	struct got_diff_state ds;
 63 8ba9a219 2017-11-29 stsp 	struct got_diff_args args;
 64 7d283eee 2017-11-29 stsp 	const struct got_error *err = NULL;
 65 4e22badc 2017-11-30 stsp 	FILE *f1 = NULL, *f2 = NULL;
 66 f78b0693 2017-11-29 stsp 	char hex1[SHA1_DIGEST_STRING_LENGTH];
 67 f78b0693 2017-11-29 stsp 	char hex2[SHA1_DIGEST_STRING_LENGTH];
 68 98abbc84 2017-11-30 stsp 	char *idstr1 = NULL, *idstr2 = NULL;
 69 f9d67749 2017-11-30 stsp 	size_t len, hdrlen;
 70 4e22badc 2017-11-30 stsp 	int res, flags = 0;
 71 7d283eee 2017-11-29 stsp 
 72 4e22badc 2017-11-30 stsp 	if (blob1) {
 73 4e22badc 2017-11-30 stsp 		f1 = opentemp();
 74 4e22badc 2017-11-30 stsp 		if (f1 == NULL)
 75 4e22badc 2017-11-30 stsp 			return got_error(GOT_ERR_FILE_OPEN);
 76 4e22badc 2017-11-30 stsp 	} else
 77 4e22badc 2017-11-30 stsp 		flags |= D_EMPTY1;
 78 7d283eee 2017-11-29 stsp 
 79 4e22badc 2017-11-30 stsp 	if (blob2) {
 80 4e22badc 2017-11-30 stsp 		f2 = opentemp();
 81 4e22badc 2017-11-30 stsp 		if (f2 == NULL) {
 82 4e22badc 2017-11-30 stsp 			fclose(f1);
 83 4e22badc 2017-11-30 stsp 			return got_error(GOT_ERR_FILE_OPEN);
 84 4e22badc 2017-11-30 stsp 		}
 85 4e22badc 2017-11-30 stsp 	} else
 86 4e22badc 2017-11-30 stsp 		flags |= D_EMPTY2;
 87 7d283eee 2017-11-29 stsp 
 88 98abbc84 2017-11-30 stsp 	if (blob1) {
 89 98abbc84 2017-11-30 stsp 		idstr1 = got_object_id_str(&blob1->id, hex1, sizeof(hex1));
 90 4e22badc 2017-11-30 stsp 		hdrlen = blob1->hdrlen;
 91 4e22badc 2017-11-30 stsp 		do {
 92 4e22badc 2017-11-30 stsp 			err = got_object_blob_read_block(blob1, &len);
 93 4e22badc 2017-11-30 stsp 			if (err)
 94 4e22badc 2017-11-30 stsp 				goto done;
 95 4e22badc 2017-11-30 stsp 			/* Skip blob object header first time around. */
 96 4e22badc 2017-11-30 stsp 			fwrite(blob1->zb.outbuf + hdrlen, len - hdrlen, 1, f1);
 97 4e22badc 2017-11-30 stsp 			hdrlen = 0;
 98 4e22badc 2017-11-30 stsp 		} while (len != 0);
 99 98abbc84 2017-11-30 stsp 	} else
100 98abbc84 2017-11-30 stsp 		idstr1 = "/dev/null";
101 7d283eee 2017-11-29 stsp 
102 98abbc84 2017-11-30 stsp 	if (blob2) {
103 98abbc84 2017-11-30 stsp 		idstr2 = got_object_id_str(&blob2->id, hex2, sizeof(hex2));
104 98abbc84 2017-11-30 stsp 		hdrlen = blob2->hdrlen;
105 98abbc84 2017-11-30 stsp 		do {
106 98abbc84 2017-11-30 stsp 			err = got_object_blob_read_block(blob2, &len);
107 98abbc84 2017-11-30 stsp 			if (err)
108 98abbc84 2017-11-30 stsp 				goto done;
109 98abbc84 2017-11-30 stsp 			/* Skip blob object header first time around. */
110 98abbc84 2017-11-30 stsp 			fwrite(blob2->zb.outbuf + hdrlen, len - hdrlen, 1, f2);
111 98abbc84 2017-11-30 stsp 			hdrlen = 0;
112 98abbc84 2017-11-30 stsp 		} while (len != 0);
113 98abbc84 2017-11-30 stsp 	} else
114 98abbc84 2017-11-30 stsp 		idstr2 = "/dev/null";
115 7d283eee 2017-11-29 stsp 
116 98abbc84 2017-11-30 stsp 	if (f1)
117 98abbc84 2017-11-30 stsp 		fflush(f1);
118 98abbc84 2017-11-30 stsp 	if (f2)
119 98abbc84 2017-11-30 stsp 		fflush(f2);
120 7d283eee 2017-11-29 stsp 
121 ed9e98a8 2017-11-29 stsp 	memset(&ds, 0, sizeof(ds));
122 f9d67749 2017-11-30 stsp 	/* XXX should stat buffers be passed in args instead of ds? */
123 f9d67749 2017-11-30 stsp 	ds.stb1.st_mode = S_IFREG;
124 98abbc84 2017-11-30 stsp 	if (blob1)
125 98abbc84 2017-11-30 stsp 		ds.stb1.st_size = blob1->zb.z.total_out;
126 f9d67749 2017-11-30 stsp 	ds.stb1.st_mtime = 0; /* XXX */
127 8ba9a219 2017-11-29 stsp 
128 f9d67749 2017-11-30 stsp 	ds.stb2.st_mode = S_IFREG;
129 98abbc84 2017-11-30 stsp 	if (blob2)
130 98abbc84 2017-11-30 stsp 		ds.stb2.st_size = blob2->zb.z.total_out;
131 f9d67749 2017-11-30 stsp 	ds.stb2.st_mtime = 0; /* XXX */
132 f9d67749 2017-11-30 stsp 
133 f9d67749 2017-11-30 stsp 	memset(&args, 0, sizeof(args));
134 8ba9a219 2017-11-29 stsp 	args.diff_format = D_UNIFIED;
135 98abbc84 2017-11-30 stsp 	args.label[0] = label1 ? label1 : idstr1;
136 98abbc84 2017-11-30 stsp 	args.label[1] = label2 ? label2 : idstr2;
137 62136d3a 2017-11-29 stsp 
138 cb74ff21 2017-11-30 stsp 	err = got_diffreg(&res, f1, f2, flags, &args, &ds, outfile);
139 7d283eee 2017-11-29 stsp done:
140 98abbc84 2017-11-30 stsp 	if (f1)
141 98abbc84 2017-11-30 stsp 		fclose(f1);
142 98abbc84 2017-11-30 stsp 	if (f2)
143 98abbc84 2017-11-30 stsp 		fclose(f2);
144 7d283eee 2017-11-29 stsp 	return err;
145 7d283eee 2017-11-29 stsp }
146 474b4f94 2017-11-30 stsp 
147 a3e2cbea 2017-12-01 stsp struct got_tree_entry *
148 a3e2cbea 2017-12-01 stsp match_entry_by_name(struct got_tree_entry *te1, struct got_tree_object *tree2)
149 474b4f94 2017-11-30 stsp {
150 a3e2cbea 2017-12-01 stsp 	struct got_tree_entry *te2;
151 a3e2cbea 2017-12-01 stsp 
152 a3e2cbea 2017-12-01 stsp 	SIMPLEQ_FOREACH(te2, &tree2->entries, entry) {
153 a3e2cbea 2017-12-01 stsp 		if (strcmp(te1->name, te2->name) == 0)
154 a3e2cbea 2017-12-01 stsp 			return te2;
155 a3e2cbea 2017-12-01 stsp 	}
156 474b4f94 2017-11-30 stsp 	return NULL;
157 474b4f94 2017-11-30 stsp }
158 474b4f94 2017-11-30 stsp 
159 474b4f94 2017-11-30 stsp static int
160 474b4f94 2017-11-30 stsp same_id(struct got_object_id *id1, struct got_object_id *id2)
161 474b4f94 2017-11-30 stsp {
162 474b4f94 2017-11-30 stsp 	return (memcmp(id1->sha1, id2->sha1, SHA1_DIGEST_LENGTH) == 0);
163 474b4f94 2017-11-30 stsp }
164 474b4f94 2017-11-30 stsp 
165 474b4f94 2017-11-30 stsp static const struct got_error *
166 4e22badc 2017-11-30 stsp diff_added_blob(struct got_object_id *id, struct got_repository *repo)
167 474b4f94 2017-11-30 stsp {
168 4e22badc 2017-11-30 stsp 	const struct got_error *err;
169 4e22badc 2017-11-30 stsp 	struct got_blob_object  *blob;
170 4e22badc 2017-11-30 stsp 	struct got_object *obj;
171 4e22badc 2017-11-30 stsp 
172 4e22badc 2017-11-30 stsp 	err = got_object_open(&obj, repo, id);
173 4e22badc 2017-11-30 stsp 	if (err)
174 4e22badc 2017-11-30 stsp 		return err;
175 c7020aea 2017-11-30 stsp 	err = got_object_blob_open(&blob, repo, obj, 8192);
176 4e22badc 2017-11-30 stsp 	if (err != NULL)
177 4e22badc 2017-11-30 stsp 		return err;
178 4e22badc 2017-11-30 stsp 
179 4e22badc 2017-11-30 stsp 	return got_diff_blob(NULL, blob, NULL, NULL, stdout);
180 474b4f94 2017-11-30 stsp }
181 474b4f94 2017-11-30 stsp 
182 474b4f94 2017-11-30 stsp static const struct got_error *
183 6a213ccb 2017-11-30 stsp diff_modified_blob(struct got_object_id *id1, struct got_object_id *id2,
184 6a213ccb 2017-11-30 stsp     struct got_repository *repo)
185 474b4f94 2017-11-30 stsp {
186 6a213ccb 2017-11-30 stsp 	const struct got_error *err;
187 6a213ccb 2017-11-30 stsp 	struct got_object *obj1 = NULL;
188 6a213ccb 2017-11-30 stsp 	struct got_object *obj2 = NULL;
189 6a213ccb 2017-11-30 stsp 	struct got_blob_object *blob1 = NULL;
190 6a213ccb 2017-11-30 stsp 	struct got_blob_object *blob2 = NULL;
191 6a213ccb 2017-11-30 stsp 
192 6a213ccb 2017-11-30 stsp 	err = got_object_open(&obj1, repo, id1);
193 6a213ccb 2017-11-30 stsp 	if (err)
194 6a213ccb 2017-11-30 stsp 		return got_error(GOT_ERR_BAD_OBJ_HDR);
195 6a213ccb 2017-11-30 stsp 	if (obj1->type != GOT_OBJ_TYPE_BLOB) {
196 6a213ccb 2017-11-30 stsp 		err = got_error(GOT_ERR_OBJ_TYPE);
197 6a213ccb 2017-11-30 stsp 		goto done;
198 6a213ccb 2017-11-30 stsp 	}
199 6a213ccb 2017-11-30 stsp 
200 6a213ccb 2017-11-30 stsp 	err = got_object_open(&obj2, repo, id2);
201 6a213ccb 2017-11-30 stsp 	if (err) {
202 6a213ccb 2017-11-30 stsp 		err= got_error(GOT_ERR_BAD_OBJ_HDR);
203 6a213ccb 2017-11-30 stsp 		goto done;
204 6a213ccb 2017-11-30 stsp 	}
205 6a213ccb 2017-11-30 stsp 	if (obj2->type != GOT_OBJ_TYPE_BLOB) {
206 6a213ccb 2017-11-30 stsp 		err = got_error(GOT_ERR_BAD_OBJ_DATA);
207 6a213ccb 2017-11-30 stsp 		goto done;
208 6a213ccb 2017-11-30 stsp 	}
209 6a213ccb 2017-11-30 stsp 
210 c7020aea 2017-11-30 stsp 	err = got_object_blob_open(&blob1, repo, obj1, 8192);
211 6a213ccb 2017-11-30 stsp 	if (err != NULL) {
212 6a213ccb 2017-11-30 stsp 		err = got_error(GOT_ERR_FILE_OPEN);
213 6a213ccb 2017-11-30 stsp 		goto done;
214 6a213ccb 2017-11-30 stsp 	}
215 6a213ccb 2017-11-30 stsp 
216 c7020aea 2017-11-30 stsp 	err = got_object_blob_open(&blob2, repo, obj2, 8192);
217 6a213ccb 2017-11-30 stsp 	if (err != NULL) {
218 6a213ccb 2017-11-30 stsp 		err = got_error(GOT_ERR_FILE_OPEN);
219 6a213ccb 2017-11-30 stsp 		goto done;
220 6a213ccb 2017-11-30 stsp 	}
221 6a213ccb 2017-11-30 stsp 
222 6a213ccb 2017-11-30 stsp 	err = got_diff_blob(blob1, blob2, NULL, NULL, stdout);
223 6a213ccb 2017-11-30 stsp 
224 6a213ccb 2017-11-30 stsp done:
225 a3e2cbea 2017-12-01 stsp 	if (obj1)
226 a3e2cbea 2017-12-01 stsp 		got_object_close(obj1);
227 a3e2cbea 2017-12-01 stsp 	if (obj2)
228 a3e2cbea 2017-12-01 stsp 		got_object_close(obj2);
229 a3e2cbea 2017-12-01 stsp 	if (blob1)
230 a3e2cbea 2017-12-01 stsp 		got_object_blob_close(blob1);
231 a3e2cbea 2017-12-01 stsp 	if (blob2)
232 a3e2cbea 2017-12-01 stsp 		got_object_blob_close(blob2);
233 6a213ccb 2017-11-30 stsp 	return err;
234 474b4f94 2017-11-30 stsp }
235 474b4f94 2017-11-30 stsp 
236 474b4f94 2017-11-30 stsp static const struct got_error *
237 365fb436 2017-11-30 stsp diff_deleted_blob(struct got_object_id *id, struct got_repository *repo)
238 474b4f94 2017-11-30 stsp {
239 365fb436 2017-11-30 stsp 	const struct got_error *err;
240 365fb436 2017-11-30 stsp 	struct got_blob_object  *blob;
241 365fb436 2017-11-30 stsp 	struct got_object *obj;
242 365fb436 2017-11-30 stsp 
243 365fb436 2017-11-30 stsp 	err = got_object_open(&obj, repo, id);
244 365fb436 2017-11-30 stsp 	if (err)
245 365fb436 2017-11-30 stsp 		return err;
246 c7020aea 2017-11-30 stsp 	err = got_object_blob_open(&blob, repo, obj, 8192);
247 365fb436 2017-11-30 stsp 	if (err != NULL)
248 365fb436 2017-11-30 stsp 		return err;
249 365fb436 2017-11-30 stsp 
250 365fb436 2017-11-30 stsp 	return got_diff_blob(blob, NULL, NULL, NULL, stdout);
251 474b4f94 2017-11-30 stsp }
252 474b4f94 2017-11-30 stsp 
253 474b4f94 2017-11-30 stsp static const struct got_error *
254 9c70d4c3 2017-11-30 stsp diff_added_tree(struct got_object_id *id, struct got_repository *repo)
255 474b4f94 2017-11-30 stsp {
256 9c70d4c3 2017-11-30 stsp 	const struct got_error *err = NULL;
257 9c70d4c3 2017-11-30 stsp 	struct got_object *treeobj = NULL;
258 9c70d4c3 2017-11-30 stsp 	struct got_tree_object *tree = NULL;
259 9c70d4c3 2017-11-30 stsp 
260 9c70d4c3 2017-11-30 stsp 	err = got_object_open(&treeobj, repo, id);
261 9c70d4c3 2017-11-30 stsp 	if (err)
262 9c70d4c3 2017-11-30 stsp 		goto done;
263 9c70d4c3 2017-11-30 stsp 
264 9c70d4c3 2017-11-30 stsp 	if (treeobj->type != GOT_OBJ_TYPE_TREE) {
265 9c70d4c3 2017-11-30 stsp 		err = got_error(GOT_ERR_OBJ_TYPE);
266 9c70d4c3 2017-11-30 stsp 		goto done;
267 9c70d4c3 2017-11-30 stsp 	}
268 9c70d4c3 2017-11-30 stsp 
269 9c70d4c3 2017-11-30 stsp 	err = got_object_tree_open(&tree, repo, treeobj);
270 9c70d4c3 2017-11-30 stsp 	if (err)
271 9c70d4c3 2017-11-30 stsp 		goto done;
272 9c70d4c3 2017-11-30 stsp 
273 9c70d4c3 2017-11-30 stsp 	err = got_diff_tree(NULL, tree, repo);
274 9c70d4c3 2017-11-30 stsp 
275 9c70d4c3 2017-11-30 stsp done:
276 9c70d4c3 2017-11-30 stsp 	if (tree)
277 9c70d4c3 2017-11-30 stsp 		got_object_tree_close(tree);
278 9c70d4c3 2017-11-30 stsp 	if (treeobj)
279 9c70d4c3 2017-11-30 stsp 		got_object_close(treeobj);
280 9c70d4c3 2017-11-30 stsp 	return err;
281 474b4f94 2017-11-30 stsp }
282 474b4f94 2017-11-30 stsp 
283 474b4f94 2017-11-30 stsp static const struct got_error *
284 789689b5 2017-11-30 stsp diff_modified_tree(struct got_object_id *id1, struct got_object_id *id2,
285 789689b5 2017-11-30 stsp     struct got_repository *repo)
286 474b4f94 2017-11-30 stsp {
287 789689b5 2017-11-30 stsp 	const struct got_error *err = NULL;
288 789689b5 2017-11-30 stsp 	struct got_object *treeobj1 = NULL;
289 789689b5 2017-11-30 stsp 	struct got_object *treeobj2 = NULL;
290 789689b5 2017-11-30 stsp 	struct got_tree_object *tree1 = NULL;
291 789689b5 2017-11-30 stsp 	struct got_tree_object *tree2 = NULL;
292 789689b5 2017-11-30 stsp 
293 789689b5 2017-11-30 stsp 	err = got_object_open(&treeobj1, repo, id1);
294 789689b5 2017-11-30 stsp 	if (err)
295 789689b5 2017-11-30 stsp 		goto done;
296 789689b5 2017-11-30 stsp 
297 789689b5 2017-11-30 stsp 	if (treeobj1->type != GOT_OBJ_TYPE_TREE) {
298 789689b5 2017-11-30 stsp 		err = got_error(GOT_ERR_OBJ_TYPE);
299 789689b5 2017-11-30 stsp 		goto done;
300 789689b5 2017-11-30 stsp 	}
301 789689b5 2017-11-30 stsp 
302 789689b5 2017-11-30 stsp 	err = got_object_open(&treeobj2, repo, id2);
303 789689b5 2017-11-30 stsp 	if (err)
304 789689b5 2017-11-30 stsp 		goto done;
305 789689b5 2017-11-30 stsp 
306 789689b5 2017-11-30 stsp 	if (treeobj2->type != GOT_OBJ_TYPE_TREE) {
307 789689b5 2017-11-30 stsp 		err = got_error(GOT_ERR_OBJ_TYPE);
308 789689b5 2017-11-30 stsp 		goto done;
309 789689b5 2017-11-30 stsp 	}
310 789689b5 2017-11-30 stsp 
311 789689b5 2017-11-30 stsp 	err = got_object_tree_open(&tree1, repo, treeobj1);
312 789689b5 2017-11-30 stsp 	if (err)
313 789689b5 2017-11-30 stsp 		goto done;
314 789689b5 2017-11-30 stsp 
315 789689b5 2017-11-30 stsp 	err = got_object_tree_open(&tree2, repo, treeobj2);
316 789689b5 2017-11-30 stsp 	if (err)
317 789689b5 2017-11-30 stsp 		goto done;
318 789689b5 2017-11-30 stsp 
319 789689b5 2017-11-30 stsp 	err = got_diff_tree(tree1, tree2, repo);
320 789689b5 2017-11-30 stsp 
321 789689b5 2017-11-30 stsp done:
322 789689b5 2017-11-30 stsp 	if (tree1)
323 789689b5 2017-11-30 stsp 		got_object_tree_close(tree1);
324 789689b5 2017-11-30 stsp 	if (tree2)
325 789689b5 2017-11-30 stsp 		got_object_tree_close(tree2);
326 789689b5 2017-11-30 stsp 	if (treeobj1)
327 789689b5 2017-11-30 stsp 		got_object_close(treeobj1);
328 789689b5 2017-11-30 stsp 	if (treeobj2)
329 789689b5 2017-11-30 stsp 		got_object_close(treeobj2);
330 789689b5 2017-11-30 stsp 	return err;
331 474b4f94 2017-11-30 stsp }
332 474b4f94 2017-11-30 stsp 
333 474b4f94 2017-11-30 stsp static const struct got_error *
334 2c56f2ce 2017-11-30 stsp diff_deleted_tree(struct got_object_id *id, struct got_repository *repo)
335 474b4f94 2017-11-30 stsp {
336 2c56f2ce 2017-11-30 stsp 	const struct got_error *err = NULL;
337 2c56f2ce 2017-11-30 stsp 	struct got_object *treeobj = NULL;
338 2c56f2ce 2017-11-30 stsp 	struct got_tree_object *tree = NULL;
339 2c56f2ce 2017-11-30 stsp 
340 2c56f2ce 2017-11-30 stsp 	err = got_object_open(&treeobj, repo, id);
341 2c56f2ce 2017-11-30 stsp 	if (err)
342 2c56f2ce 2017-11-30 stsp 		goto done;
343 2c56f2ce 2017-11-30 stsp 
344 2c56f2ce 2017-11-30 stsp 	if (treeobj->type != GOT_OBJ_TYPE_TREE) {
345 2c56f2ce 2017-11-30 stsp 		err = got_error(GOT_ERR_OBJ_TYPE);
346 2c56f2ce 2017-11-30 stsp 		goto done;
347 2c56f2ce 2017-11-30 stsp 	}
348 2c56f2ce 2017-11-30 stsp 
349 2c56f2ce 2017-11-30 stsp 	err = got_object_tree_open(&tree, repo, treeobj);
350 2c56f2ce 2017-11-30 stsp 	if (err)
351 2c56f2ce 2017-11-30 stsp 		goto done;
352 2c56f2ce 2017-11-30 stsp 
353 2c56f2ce 2017-11-30 stsp 	err = got_diff_tree(tree, NULL, repo);
354 2c56f2ce 2017-11-30 stsp 
355 2c56f2ce 2017-11-30 stsp done:
356 2c56f2ce 2017-11-30 stsp 	if (tree)
357 2c56f2ce 2017-11-30 stsp 		got_object_tree_close(tree);
358 2c56f2ce 2017-11-30 stsp 	if (treeobj)
359 2c56f2ce 2017-11-30 stsp 		got_object_close(treeobj);
360 2c56f2ce 2017-11-30 stsp 	return err;
361 474b4f94 2017-11-30 stsp }
362 474b4f94 2017-11-30 stsp 
363 474b4f94 2017-11-30 stsp static const struct got_error *
364 474b4f94 2017-11-30 stsp diff_kind_mismatch(struct got_object_id *id1, struct got_object_id *id2)
365 474b4f94 2017-11-30 stsp {
366 013404a9 2017-11-30 stsp 	/* XXX TODO */
367 474b4f94 2017-11-30 stsp 	return NULL;
368 474b4f94 2017-11-30 stsp }
369 474b4f94 2017-11-30 stsp 
370 474b4f94 2017-11-30 stsp static const struct got_error *
371 6a213ccb 2017-11-30 stsp diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2,
372 6a213ccb 2017-11-30 stsp     struct got_repository *repo)
373 474b4f94 2017-11-30 stsp {
374 474b4f94 2017-11-30 stsp 	const struct got_error *err;
375 474b4f94 2017-11-30 stsp 	struct got_tree_entry *te2;
376 a3e2cbea 2017-12-01 stsp 	char hex[SHA1_DIGEST_STRING_LENGTH];
377 474b4f94 2017-11-30 stsp 
378 a3e2cbea 2017-12-01 stsp 	te2 = match_entry_by_name(te1, tree2);
379 474b4f94 2017-11-30 stsp 	if (te2 == NULL) {
380 474b4f94 2017-11-30 stsp 		if (S_ISDIR(te1->mode))
381 2c56f2ce 2017-11-30 stsp 			return diff_deleted_tree(&te1->id, repo);
382 365fb436 2017-11-30 stsp 		return diff_deleted_blob(&te1->id, repo);
383 474b4f94 2017-11-30 stsp 	}
384 474b4f94 2017-11-30 stsp 
385 4209f790 2017-11-30 stsp 	if (S_ISDIR(te1->mode) && S_ISDIR(te2->mode)) {
386 474b4f94 2017-11-30 stsp 		if (!same_id(&te1->id, &te2->id))
387 789689b5 2017-11-30 stsp 			return diff_modified_tree(&te1->id, &te2->id, repo);
388 4209f790 2017-11-30 stsp 	} else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
389 474b4f94 2017-11-30 stsp 		if (!same_id(&te1->id, &te2->id))
390 6a213ccb 2017-11-30 stsp 			return diff_modified_blob(&te1->id, &te2->id, repo);
391 a3e2cbea 2017-12-01 stsp 
392 413ea19d 2017-11-30 stsp 	}
393 474b4f94 2017-11-30 stsp 
394 413ea19d 2017-11-30 stsp 	return diff_kind_mismatch(&te1->id, &te2->id);
395 474b4f94 2017-11-30 stsp }
396 474b4f94 2017-11-30 stsp 
397 474b4f94 2017-11-30 stsp static const struct got_error *
398 4e22badc 2017-11-30 stsp diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
399 4e22badc 2017-11-30 stsp     struct got_repository *repo)
400 474b4f94 2017-11-30 stsp {
401 474b4f94 2017-11-30 stsp 	const struct got_error *err;
402 474b4f94 2017-11-30 stsp 	struct got_tree_entry *te1;
403 474b4f94 2017-11-30 stsp 
404 a3e2cbea 2017-12-01 stsp 	te1 = match_entry_by_name(te2, tree1);
405 474b4f94 2017-11-30 stsp 	if (te1 != NULL) /* handled by diff_entry_old_new() */
406 474b4f94 2017-11-30 stsp 		return NULL;
407 474b4f94 2017-11-30 stsp 
408 474b4f94 2017-11-30 stsp 	if (S_ISDIR(te2->mode))
409 9c70d4c3 2017-11-30 stsp 		return diff_added_tree(&te2->id, repo);
410 4e22badc 2017-11-30 stsp 	return diff_added_blob(&te2->id, repo);
411 474b4f94 2017-11-30 stsp }
412 474b4f94 2017-11-30 stsp 
413 474b4f94 2017-11-30 stsp const struct got_error *
414 474b4f94 2017-11-30 stsp got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
415 474b4f94 2017-11-30 stsp     struct got_repository *repo)
416 474b4f94 2017-11-30 stsp {
417 474b4f94 2017-11-30 stsp 	const struct got_error *err = NULL;
418 789689b5 2017-11-30 stsp 	struct got_tree_entry *te1 = NULL;
419 789689b5 2017-11-30 stsp 	struct got_tree_entry *te2 = NULL;
420 474b4f94 2017-11-30 stsp 
421 789689b5 2017-11-30 stsp 	if (tree1)
422 789689b5 2017-11-30 stsp 		te1 = SIMPLEQ_FIRST(&tree1->entries);
423 789689b5 2017-11-30 stsp 	if (tree2)
424 789689b5 2017-11-30 stsp 		te2 = SIMPLEQ_FIRST(&tree2->entries);
425 474b4f94 2017-11-30 stsp 
426 474b4f94 2017-11-30 stsp 	do {
427 474b4f94 2017-11-30 stsp 		if (te1) {
428 6a213ccb 2017-11-30 stsp 			err = diff_entry_old_new(te1, tree2, repo);
429 474b4f94 2017-11-30 stsp 			if (err)
430 474b4f94 2017-11-30 stsp 				break;
431 474b4f94 2017-11-30 stsp 		}
432 474b4f94 2017-11-30 stsp 
433 474b4f94 2017-11-30 stsp 		if (te2) {
434 4e22badc 2017-11-30 stsp 			err = diff_entry_new_old(te2, tree1, repo);
435 474b4f94 2017-11-30 stsp 			if (err)
436 474b4f94 2017-11-30 stsp 				break;
437 474b4f94 2017-11-30 stsp 		}
438 474b4f94 2017-11-30 stsp 
439 474b4f94 2017-11-30 stsp 		if (te1)
440 474b4f94 2017-11-30 stsp 			te1 = SIMPLEQ_NEXT(te1, entry);
441 474b4f94 2017-11-30 stsp 		if (te2)
442 474b4f94 2017-11-30 stsp 			te2 = SIMPLEQ_NEXT(te2, entry);
443 474b4f94 2017-11-30 stsp 	} while (te1 || te2);
444 474b4f94 2017-11-30 stsp 
445 474b4f94 2017-11-30 stsp 	return err;
446 474b4f94 2017-11-30 stsp }