op public repos

Blame

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