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