2 f42b1b34 2018-03-12 stsp * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 f42b1b34 2018-03-12 stsp * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
5 5c860e29 2018-03-12 stsp * Permission to use, copy, modify, and distribute this software for any
6 5c860e29 2018-03-12 stsp * purpose with or without fee is hereby granted, provided that the above
7 5c860e29 2018-03-12 stsp * copyright notice and this permission notice appear in all copies.
9 5c860e29 2018-03-12 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 5c860e29 2018-03-12 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 5c860e29 2018-03-12 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 5c860e29 2018-03-12 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 5c860e29 2018-03-12 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 5c860e29 2018-03-12 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 5c860e29 2018-03-12 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 f42b1b34 2018-03-12 stsp #include <sys/queue.h>
19 64a96a6d 2018-04-01 stsp #include <sys/limits.h>
21 5c860e29 2018-03-12 stsp #include <err.h>
22 5c860e29 2018-03-12 stsp #include <errno.h>
23 5c860e29 2018-03-12 stsp #include <locale.h>
24 5c860e29 2018-03-12 stsp #include <stdio.h>
25 5c860e29 2018-03-12 stsp #include <stdlib.h>
26 5c860e29 2018-03-12 stsp #include <string.h>
27 5c860e29 2018-03-12 stsp #include <unistd.h>
28 c09a553d 2018-03-12 stsp #include <libgen.h>
30 f42b1b34 2018-03-12 stsp #include "got_error.h"
31 f42b1b34 2018-03-12 stsp #include "got_object.h"
32 f42b1b34 2018-03-12 stsp #include "got_refs.h"
33 f42b1b34 2018-03-12 stsp #include "got_repository.h"
34 c09a553d 2018-03-12 stsp #include "got_worktree.h"
35 79109fed 2018-03-27 stsp #include "got_diff.h"
37 5c860e29 2018-03-12 stsp #ifndef nitems
38 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
41 5c860e29 2018-03-12 stsp struct cmd {
42 5c860e29 2018-03-12 stsp const char *cmd_name;
43 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
44 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
45 46a0db7d 2018-03-12 stsp const char *cmd_descr;
48 5c860e29 2018-03-12 stsp __dead void usage(void);
49 c09a553d 2018-03-12 stsp __dead void usage_checkout(void);
50 6f3d1eb0 2018-03-12 stsp __dead void usage_log(void);
51 b00d56cd 2018-04-01 stsp __dead void usage_diff(void);
53 c09a553d 2018-03-12 stsp const struct got_error* cmd_checkout(int, char *[]);
54 d7d4f210 2018-03-12 stsp const struct got_error* cmd_log(int, char *[]);
55 b00d56cd 2018-04-01 stsp const struct got_error* cmd_diff(int, char *[]);
56 d7d4f210 2018-03-12 stsp const struct got_error* cmd_status(int, char *[]);
58 5c860e29 2018-03-12 stsp struct cmd got_commands[] = {
59 c09a553d 2018-03-12 stsp { "checkout", cmd_checkout, usage_checkout,
60 0bb8a95e 2018-03-12 stsp "check out a new work tree from a repository" },
61 1b6b95a8 2018-03-12 stsp { "log", cmd_log, usage_log,
62 1b6b95a8 2018-03-12 stsp "show repository history" },
63 b00d56cd 2018-04-01 stsp { "diff", cmd_diff, usage_diff,
64 b00d56cd 2018-04-01 stsp "compare files and directories" },
65 f42b1b34 2018-03-12 stsp #ifdef notyet
66 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
67 1b6b95a8 2018-03-12 stsp "show modification status of files" },
72 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
74 5c860e29 2018-03-12 stsp struct cmd *cmd;
75 5c860e29 2018-03-12 stsp unsigned int i;
77 1b6b95a8 2018-03-12 stsp int hflag = 0;
79 5c860e29 2018-03-12 stsp setlocale(LC_ALL, "");
81 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
82 5c860e29 2018-03-12 stsp switch (ch) {
88 5c860e29 2018-03-12 stsp /* NOTREACHED */
92 5c860e29 2018-03-12 stsp argc -= optind;
93 5c860e29 2018-03-12 stsp argv += optind;
96 5c860e29 2018-03-12 stsp if (argc <= 0)
99 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
100 d7d4f210 2018-03-12 stsp const struct got_error *error;
102 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
104 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
108 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
110 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
111 d7d4f210 2018-03-12 stsp if (error) {
112 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
119 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
123 5c860e29 2018-03-12 stsp __dead void
124 5c860e29 2018-03-12 stsp usage(void)
128 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
129 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
130 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
131 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
132 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
137 c09a553d 2018-03-12 stsp __dead void
138 c09a553d 2018-03-12 stsp usage_checkout(void)
140 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
141 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
145 92a684f4 2018-03-12 stsp static void
146 92a684f4 2018-03-12 stsp checkout_progress(void *arg, const char *path)
148 92a684f4 2018-03-12 stsp char *worktree_path = arg;
150 92a684f4 2018-03-12 stsp while (path[0] == '/')
153 92a684f4 2018-03-12 stsp printf("A %s/%s\n", worktree_path, path);
156 c09a553d 2018-03-12 stsp const struct got_error *
157 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
159 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
160 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
161 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
162 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
163 c09a553d 2018-03-12 stsp char *repo_path = NULL;
164 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
165 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
168 0bb8a95e 2018-03-12 stsp while ((ch = getopt(argc, argv, "p:")) != -1) {
169 0bb8a95e 2018-03-12 stsp switch (ch) {
171 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
175 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
179 0bb8a95e 2018-03-12 stsp argc -= optind;
180 0bb8a95e 2018-03-12 stsp argv += optind;
182 6715a751 2018-03-16 stsp #ifndef PROFILE
183 c09a553d 2018-03-12 stsp if (pledge("stdio rpath wpath cpath flock", NULL) == -1)
184 c09a553d 2018-03-12 stsp err(1, "pledge");
186 0bb8a95e 2018-03-12 stsp if (argc == 1) {
187 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
188 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
189 76089277 2018-04-01 stsp if (repo_path == NULL)
190 76089277 2018-04-01 stsp return got_error_from_errno();
191 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
192 76089277 2018-04-01 stsp if (cwd == NULL) {
193 76089277 2018-04-01 stsp error = got_error_from_errno();
196 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
197 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
199 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
200 76089277 2018-04-01 stsp if (base == NULL) {
201 76089277 2018-04-01 stsp error = got_error_from_errno();
204 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
205 c09a553d 2018-03-12 stsp if (dotgit)
206 c09a553d 2018-03-12 stsp *dotgit = '\0';
207 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
208 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
213 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
214 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
215 76089277 2018-04-01 stsp if (repo_path == NULL) {
216 76089277 2018-04-01 stsp error = got_error_from_errno();
219 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
220 76089277 2018-04-01 stsp if (worktree_path == NULL) {
221 76089277 2018-04-01 stsp error = got_error_from_errno();
225 c09a553d 2018-03-12 stsp usage_checkout();
227 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
228 76089277 2018-04-01 stsp free(repo_path);
229 c09a553d 2018-03-12 stsp if (error != NULL)
231 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
232 c09a553d 2018-03-12 stsp if (error != NULL)
235 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
236 c09a553d 2018-03-12 stsp if (error != NULL)
239 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
240 c09a553d 2018-03-12 stsp if (error != NULL)
243 92a684f4 2018-03-12 stsp error = got_worktree_checkout_files(worktree, head_ref, repo,
244 92a684f4 2018-03-12 stsp checkout_progress, worktree_path);
245 c09a553d 2018-03-12 stsp if (error != NULL)
248 c09a553d 2018-03-12 stsp printf("checked out %s\n", worktree_path);
251 76089277 2018-04-01 stsp free(repo_path);
252 c09a553d 2018-03-12 stsp free(worktree_path);
253 c09a553d 2018-03-12 stsp return error;
256 f42b1b34 2018-03-12 stsp static const struct got_error *
257 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
258 f42b1b34 2018-03-12 stsp struct got_repository *repo)
260 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
261 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
262 79109fed 2018-03-27 stsp struct got_object *obj;
263 79109fed 2018-03-27 stsp struct got_parent_id *pid;
265 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, commit->tree_id);
267 79109fed 2018-03-27 stsp return err;
269 79109fed 2018-03-27 stsp err = got_object_tree_open(&tree2, repo, obj);
270 79109fed 2018-03-27 stsp got_object_close(obj);
272 79109fed 2018-03-27 stsp return err;
274 79109fed 2018-03-27 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
275 79109fed 2018-03-27 stsp if (pid != NULL) {
276 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
278 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, pid->id);
280 79109fed 2018-03-27 stsp return err;
282 79109fed 2018-03-27 stsp err = got_object_commit_open(&pcommit, repo, obj);
283 79109fed 2018-03-27 stsp got_object_close(obj);
285 79109fed 2018-03-27 stsp return err;
287 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, pcommit->tree_id);
288 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
290 79109fed 2018-03-27 stsp return err;
291 79109fed 2018-03-27 stsp err = got_object_tree_open(&tree1, repo, obj);
292 79109fed 2018-03-27 stsp got_object_close(obj);
294 79109fed 2018-03-27 stsp return err;
297 79109fed 2018-03-27 stsp err = got_diff_tree(tree1, tree2, repo, stdout);
299 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
300 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
301 79109fed 2018-03-27 stsp return err;
304 79109fed 2018-03-27 stsp static const struct got_error *
305 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
306 79109fed 2018-03-27 stsp struct got_repository *repo, int show_patch)
308 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
311 8bf5b3c9 2018-03-17 stsp err = got_object_id_str(&buf, id);
313 8bf5b3c9 2018-03-17 stsp return err;
315 8bf5b3c9 2018-03-17 stsp printf("-----------------------------------------------\n");
316 8bf5b3c9 2018-03-17 stsp printf("commit: %s\n", buf);
317 8bf5b3c9 2018-03-17 stsp printf("Author: %s\n", commit->author);
318 8bf5b3c9 2018-03-17 stsp printf("\n%s\n", commit->logmsg);
320 971751ac 2018-03-27 stsp if (show_patch) {
321 79109fed 2018-03-27 stsp err = print_patch(commit, id, repo);
322 971751ac 2018-03-27 stsp if (err == 0)
323 971751ac 2018-03-27 stsp printf("\n");
327 79109fed 2018-03-27 stsp return err;
330 8bf5b3c9 2018-03-17 stsp struct commit_queue_entry {
331 8bf5b3c9 2018-03-17 stsp TAILQ_ENTRY(commit_queue_entry) entry;
332 8bf5b3c9 2018-03-17 stsp struct got_object_id *id;
333 8bf5b3c9 2018-03-17 stsp struct got_commit_object *commit;
336 f42b1b34 2018-03-12 stsp static const struct got_error *
337 8bf5b3c9 2018-03-17 stsp print_commits(struct got_object *root_obj, struct got_object_id *root_id,
338 64a96a6d 2018-04-01 stsp struct got_repository *repo, int show_patch, int limit)
340 f42b1b34 2018-03-12 stsp const struct got_error *err;
341 8bf5b3c9 2018-03-17 stsp struct got_commit_object *root_commit;
342 8bf5b3c9 2018-03-17 stsp TAILQ_HEAD(, commit_queue_entry) commits;
343 8bf5b3c9 2018-03-17 stsp struct commit_queue_entry *entry;
345 8bf5b3c9 2018-03-17 stsp TAILQ_INIT(&commits);
347 8bf5b3c9 2018-03-17 stsp err = got_object_commit_open(&root_commit, repo, root_obj);
349 f42b1b34 2018-03-12 stsp return err;
351 8bf5b3c9 2018-03-17 stsp entry = calloc(1, sizeof(*entry));
352 8bf5b3c9 2018-03-17 stsp if (entry == NULL)
353 0a585a0d 2018-03-17 stsp return got_error_from_errno();
354 8bf5b3c9 2018-03-17 stsp entry->id = got_object_id_dup(root_id);
355 8bf5b3c9 2018-03-17 stsp if (entry->id == NULL) {
356 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
357 8bf5b3c9 2018-03-17 stsp free(entry);
358 0a585a0d 2018-03-17 stsp return err;
360 8bf5b3c9 2018-03-17 stsp entry->commit = root_commit;
361 8bf5b3c9 2018-03-17 stsp TAILQ_INSERT_HEAD(&commits, entry, entry);
363 8bf5b3c9 2018-03-17 stsp while (!TAILQ_EMPTY(&commits)) {
364 8bf5b3c9 2018-03-17 stsp struct got_parent_id *pid;
366 8bf5b3c9 2018-03-17 stsp entry = TAILQ_FIRST(&commits);
367 79109fed 2018-03-27 stsp err = print_commit(entry->commit, entry->id, repo, show_patch);
369 25470781 2018-04-01 stsp while (!TAILQ_EMPTY(&commits)) {
370 25470781 2018-04-01 stsp entry = TAILQ_FIRST(&commits);
371 25470781 2018-04-01 stsp TAILQ_REMOVE(&commits, entry, entry);
372 25470781 2018-04-01 stsp got_object_commit_close(entry->commit);
373 25470781 2018-04-01 stsp free(entry->id);
374 25470781 2018-04-01 stsp free(entry);
379 64a96a6d 2018-04-01 stsp if (limit && --limit == 0)
382 8bf5b3c9 2018-03-17 stsp SIMPLEQ_FOREACH(pid, &entry->commit->parent_ids, entry) {
383 8bf5b3c9 2018-03-17 stsp struct got_object *obj;
384 8bf5b3c9 2018-03-17 stsp struct got_commit_object *pcommit;
385 8bf5b3c9 2018-03-17 stsp struct commit_queue_entry *pentry;
387 8bf5b3c9 2018-03-17 stsp err = got_object_open(&obj, repo, pid->id);
390 8bf5b3c9 2018-03-17 stsp if (got_object_get_type(obj) != GOT_OBJ_TYPE_COMMIT) {
391 8bf5b3c9 2018-03-17 stsp err = got_error(GOT_ERR_OBJ_TYPE);
395 8bf5b3c9 2018-03-17 stsp err = got_object_commit_open(&pcommit, repo, obj);
396 8bf5b3c9 2018-03-17 stsp got_object_close(obj);
400 8bf5b3c9 2018-03-17 stsp pentry = calloc(1, sizeof(*pentry));
401 8bf5b3c9 2018-03-17 stsp if (pentry == NULL) {
402 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
403 8bf5b3c9 2018-03-17 stsp got_object_commit_close(pcommit);
406 8bf5b3c9 2018-03-17 stsp pentry->id = got_object_id_dup(pid->id);
407 8bf5b3c9 2018-03-17 stsp if (pentry->id == NULL) {
408 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
409 8bf5b3c9 2018-03-17 stsp got_object_commit_close(pcommit);
412 8bf5b3c9 2018-03-17 stsp pentry->commit = pcommit;
413 8bf5b3c9 2018-03-17 stsp TAILQ_INSERT_TAIL(&commits, pentry, entry);
416 8bf5b3c9 2018-03-17 stsp TAILQ_REMOVE(&commits, entry, entry);
417 8bf5b3c9 2018-03-17 stsp got_object_commit_close(entry->commit);
418 8bf5b3c9 2018-03-17 stsp free(entry->id);
419 8bf5b3c9 2018-03-17 stsp free(entry);
422 f42b1b34 2018-03-12 stsp return err;
425 6f3d1eb0 2018-03-12 stsp __dead void
426 6f3d1eb0 2018-03-12 stsp usage_log(void)
428 64a96a6d 2018-04-01 stsp fprintf(stderr, "usage: %s log [-p] [-c commit] [ -l N ] "
429 64a96a6d 2018-04-01 stsp "[repository-path]\n", getprogname());
433 d7d4f210 2018-03-12 stsp const struct got_error *
434 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
436 f42b1b34 2018-03-12 stsp const struct got_error *error;
437 f42b1b34 2018-03-12 stsp struct got_repository *repo;
438 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
439 f42b1b34 2018-03-12 stsp struct got_object *obj;
440 6f3d1eb0 2018-03-12 stsp char *repo_path = NULL;
441 d142fc45 2018-04-01 stsp char *start_commit = NULL;
443 64a96a6d 2018-04-01 stsp int show_patch = 0, limit = 0;
444 64a96a6d 2018-04-01 stsp const char *errstr;
446 6715a751 2018-03-16 stsp #ifndef PROFILE
447 f42b1b34 2018-03-12 stsp if (pledge("stdio rpath wpath cpath", NULL) == -1)
448 f42b1b34 2018-03-12 stsp err(1, "pledge");
451 64a96a6d 2018-04-01 stsp while ((ch = getopt(argc, argv, "pc:l:")) != -1) {
452 79109fed 2018-03-27 stsp switch (ch) {
454 79109fed 2018-03-27 stsp show_patch = 1;
457 d142fc45 2018-04-01 stsp start_commit = optarg;
460 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
461 64a96a6d 2018-04-01 stsp if (errstr != NULL)
462 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
466 79109fed 2018-03-27 stsp /* NOTREACHED */
470 79109fed 2018-03-27 stsp argc -= optind;
471 79109fed 2018-03-27 stsp argv += optind;
473 79109fed 2018-03-27 stsp if (argc == 0) {
474 6f3d1eb0 2018-03-12 stsp repo_path = getcwd(NULL, 0);
475 6f3d1eb0 2018-03-12 stsp if (repo_path == NULL)
476 6f3d1eb0 2018-03-12 stsp err(1, "getcwd");
477 3235492e 2018-04-01 stsp } else if (argc == 1) {
478 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
479 76089277 2018-04-01 stsp if (repo_path == NULL)
480 76089277 2018-04-01 stsp return got_error_from_errno();
482 6f3d1eb0 2018-03-12 stsp usage_log();
484 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
485 76089277 2018-04-01 stsp free(repo_path);
486 d7d4f210 2018-03-12 stsp if (error != NULL)
487 d7d4f210 2018-03-12 stsp return error;
489 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
490 3235492e 2018-04-01 stsp struct got_reference *head_ref;
491 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
492 3235492e 2018-04-01 stsp if (error != NULL)
493 3235492e 2018-04-01 stsp return error;
494 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
495 3235492e 2018-04-01 stsp got_ref_close(head_ref);
496 3235492e 2018-04-01 stsp if (error != NULL)
497 3235492e 2018-04-01 stsp return error;
498 3235492e 2018-04-01 stsp error = got_object_open(&obj, repo, id);
500 d142fc45 2018-04-01 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
501 3235492e 2018-04-01 stsp if (error == NULL) {
502 3235492e 2018-04-01 stsp id = got_object_get_id(obj);
503 3235492e 2018-04-01 stsp if (id == NULL)
504 3235492e 2018-04-01 stsp error = got_error_from_errno();
507 d7d4f210 2018-03-12 stsp if (error != NULL)
508 d7d4f210 2018-03-12 stsp return error;
509 8bf5b3c9 2018-03-17 stsp if (got_object_get_type(obj) == GOT_OBJ_TYPE_COMMIT)
510 64a96a6d 2018-04-01 stsp error = print_commits(obj, id, repo, show_patch, limit);
512 8bf5b3c9 2018-03-17 stsp error = got_error(GOT_ERR_OBJ_TYPE);
513 f42b1b34 2018-03-12 stsp got_object_close(obj);
515 f42b1b34 2018-03-12 stsp got_repo_close(repo);
516 8bf5b3c9 2018-03-17 stsp return error;
519 b00d56cd 2018-04-01 stsp static const struct got_error *
520 b00d56cd 2018-04-01 stsp diff_blobs(struct got_object *obj1, struct got_object *obj2,
521 b00d56cd 2018-04-01 stsp struct got_repository *repo)
523 b00d56cd 2018-04-01 stsp const struct got_error *err;
524 b00d56cd 2018-04-01 stsp struct got_blob_object *blob1 = NULL, *blob2 = NULL;
526 b00d56cd 2018-04-01 stsp err = got_object_blob_open(&blob1, repo, obj1, 8192);
529 b00d56cd 2018-04-01 stsp err = got_object_blob_open(&blob2, repo, obj2, 81992);
533 b00d56cd 2018-04-01 stsp err = got_diff_blob(blob1, blob2, NULL, NULL, stdout);
536 b00d56cd 2018-04-01 stsp got_object_blob_close(blob1);
538 b00d56cd 2018-04-01 stsp got_object_blob_close(blob2);
539 b00d56cd 2018-04-01 stsp return err;
542 b00d56cd 2018-04-01 stsp static const struct got_error *
543 b00d56cd 2018-04-01 stsp diff_trees(struct got_object *obj1, struct got_object *obj2,
544 b00d56cd 2018-04-01 stsp struct got_repository *repo)
546 b00d56cd 2018-04-01 stsp const struct got_error *err;
547 b00d56cd 2018-04-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
549 b00d56cd 2018-04-01 stsp err = got_object_tree_open(&tree1, repo, obj1);
552 b00d56cd 2018-04-01 stsp err = got_object_tree_open(&tree2, repo, obj2);
556 b00d56cd 2018-04-01 stsp err = got_diff_tree(tree1, tree2, repo, stdout);
559 b00d56cd 2018-04-01 stsp got_object_tree_close(tree1);
561 b00d56cd 2018-04-01 stsp got_object_tree_close(tree2);
562 b00d56cd 2018-04-01 stsp return err;
565 b00d56cd 2018-04-01 stsp static const struct got_error *
566 b00d56cd 2018-04-01 stsp diff_commits(struct got_object *obj1, struct got_object *obj2,
567 b00d56cd 2018-04-01 stsp struct got_repository *repo)
569 b00d56cd 2018-04-01 stsp const struct got_error *err;
570 b00d56cd 2018-04-01 stsp struct got_commit_object *commit1 = NULL, *commit2 = NULL;
571 b00d56cd 2018-04-01 stsp struct got_object *tree_obj1 = NULL, *tree_obj2 = NULL;
573 b00d56cd 2018-04-01 stsp err = got_object_commit_open(&commit1, repo, obj1);
576 b00d56cd 2018-04-01 stsp err = got_object_commit_open(&commit2, repo, obj2);
580 b00d56cd 2018-04-01 stsp err = got_object_open(&tree_obj1, repo, commit1->tree_id);
583 b00d56cd 2018-04-01 stsp err = got_object_open(&tree_obj2, repo, commit2->tree_id);
587 b00d56cd 2018-04-01 stsp err = diff_trees(tree_obj1, tree_obj2, repo);
589 b00d56cd 2018-04-01 stsp if (tree_obj1)
590 b00d56cd 2018-04-01 stsp got_object_close(tree_obj1);
591 b00d56cd 2018-04-01 stsp if (tree_obj2)
592 b00d56cd 2018-04-01 stsp got_object_close(tree_obj2);
593 b00d56cd 2018-04-01 stsp if (commit1)
594 b00d56cd 2018-04-01 stsp got_object_commit_close(commit1);
595 b00d56cd 2018-04-01 stsp if (commit2)
596 b00d56cd 2018-04-01 stsp got_object_commit_close(commit2);
597 b00d56cd 2018-04-01 stsp return err;
601 3f8b7d6a 2018-04-01 stsp __dead void
602 3f8b7d6a 2018-04-01 stsp usage_diff(void)
604 3f8b7d6a 2018-04-01 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
605 3f8b7d6a 2018-04-01 stsp getprogname());
609 b00d56cd 2018-04-01 stsp const struct got_error *
610 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
612 b00d56cd 2018-04-01 stsp const struct got_error *error;
613 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
614 b00d56cd 2018-04-01 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
615 b00d56cd 2018-04-01 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
616 b00d56cd 2018-04-01 stsp char *repo_path = NULL;
617 b00d56cd 2018-04-01 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
620 b00d56cd 2018-04-01 stsp #ifndef PROFILE
621 b00d56cd 2018-04-01 stsp if (pledge("stdio rpath wpath cpath", NULL) == -1)
622 b00d56cd 2018-04-01 stsp err(1, "pledge");
625 b00d56cd 2018-04-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
626 b00d56cd 2018-04-01 stsp switch (ch) {
629 b00d56cd 2018-04-01 stsp /* NOTREACHED */
633 b00d56cd 2018-04-01 stsp argc -= optind;
634 b00d56cd 2018-04-01 stsp argv += optind;
636 b00d56cd 2018-04-01 stsp if (argc == 0) {
637 b00d56cd 2018-04-01 stsp usage_diff(); /* TODO show local worktree changes */
638 3f8b7d6a 2018-04-01 stsp } else if (argc == 2) {
639 3f8b7d6a 2018-04-01 stsp repo_path = getcwd(NULL, 0);
640 3f8b7d6a 2018-04-01 stsp if (repo_path == NULL)
641 3f8b7d6a 2018-04-01 stsp err(1, "getcwd");
642 3f8b7d6a 2018-04-01 stsp obj_id_str1 = argv[0];
643 3f8b7d6a 2018-04-01 stsp obj_id_str2 = argv[1];
644 b00d56cd 2018-04-01 stsp } else if (argc == 3) {
645 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
646 76089277 2018-04-01 stsp if (repo_path == NULL)
647 76089277 2018-04-01 stsp return got_error_from_errno();
648 b00d56cd 2018-04-01 stsp obj_id_str1 = argv[1];
649 b00d56cd 2018-04-01 stsp obj_id_str2 = argv[2];
651 b00d56cd 2018-04-01 stsp usage_diff();
653 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
654 76089277 2018-04-01 stsp free(repo_path);
655 b00d56cd 2018-04-01 stsp if (error != NULL)
658 b00d56cd 2018-04-01 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
659 b00d56cd 2018-04-01 stsp if (error == NULL) {
660 b00d56cd 2018-04-01 stsp id1 = got_object_get_id(obj1);
661 b00d56cd 2018-04-01 stsp if (id1 == NULL)
662 b00d56cd 2018-04-01 stsp error = got_error_from_errno();
664 b00d56cd 2018-04-01 stsp if (error != NULL)
667 b00d56cd 2018-04-01 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
668 b00d56cd 2018-04-01 stsp if (error == NULL) {
669 b00d56cd 2018-04-01 stsp id2 = got_object_get_id(obj2);
670 b00d56cd 2018-04-01 stsp if (id2 == NULL)
671 b00d56cd 2018-04-01 stsp error = got_error_from_errno();
673 b00d56cd 2018-04-01 stsp if (error != NULL)
676 b00d56cd 2018-04-01 stsp if (got_object_get_type(obj1) != got_object_get_type(obj2)) {
677 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
681 b00d56cd 2018-04-01 stsp switch (got_object_get_type(obj1)) {
682 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
683 b00d56cd 2018-04-01 stsp error = diff_blobs(obj1, obj2, repo);
685 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
686 b00d56cd 2018-04-01 stsp error = diff_trees(obj1, obj2, repo);
688 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
689 b00d56cd 2018-04-01 stsp error = diff_commits(obj1, obj2, repo);
692 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
697 b00d56cd 2018-04-01 stsp got_object_close(obj1);
699 b00d56cd 2018-04-01 stsp got_object_close(obj2);
705 b00d56cd 2018-04-01 stsp got_repo_close(repo);
706 b00d56cd 2018-04-01 stsp return error;
709 f42b1b34 2018-03-12 stsp #ifdef notyet
710 d7d4f210 2018-03-12 stsp const struct got_error *
711 5c860e29 2018-03-12 stsp cmd_status(int argc __unused, char *argv[] __unused)
713 5c860e29 2018-03-12 stsp git_repository *repo = NULL;
714 5c860e29 2018-03-12 stsp git_status_list *status;
715 5c860e29 2018-03-12 stsp git_status_options statusopts;
718 5c860e29 2018-03-12 stsp git_libgit2_init();
720 5c860e29 2018-03-12 stsp if (git_repository_open_ext(&repo, ".", 0, NULL))
721 5c860e29 2018-03-12 stsp errx(1, "git_repository_open: %s", giterr_last()->message);
723 5c860e29 2018-03-12 stsp if (git_repository_is_bare(repo))
724 5c860e29 2018-03-12 stsp errx(1, "bar repository");
726 5c860e29 2018-03-12 stsp if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
727 5c860e29 2018-03-12 stsp errx(1, "git_status_init_options: %s", giterr_last()->message);
729 5c860e29 2018-03-12 stsp statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
730 5c860e29 2018-03-12 stsp statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
731 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
732 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
734 5c860e29 2018-03-12 stsp if (git_status_list_new(&status, repo, &statusopts))
735 5c860e29 2018-03-12 stsp errx(1, "git_status_list_new: %s", giterr_last()->message);
737 5c860e29 2018-03-12 stsp for (i = 0; i < git_status_list_entrycount(status); i++) {
738 5c860e29 2018-03-12 stsp const git_status_entry *se;
740 5c860e29 2018-03-12 stsp se = git_status_byindex(status, i);
741 5c860e29 2018-03-12 stsp switch (se->status) {
742 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_NEW:
743 5c860e29 2018-03-12 stsp printf("? %s\n", se->index_to_workdir->new_file.path);
745 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_MODIFIED:
746 5c860e29 2018-03-12 stsp printf("M %s\n", se->index_to_workdir->new_file.path);
748 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_DELETED:
749 5c860e29 2018-03-12 stsp printf("R %s\n", se->index_to_workdir->new_file.path);
751 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_RENAMED:
752 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
753 5c860e29 2018-03-12 stsp se->index_to_workdir->old_file.path,
754 5c860e29 2018-03-12 stsp se->index_to_workdir->new_file.path);
756 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_TYPECHANGE:
757 5c860e29 2018-03-12 stsp printf("t %s\n", se->index_to_workdir->new_file.path);
759 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_NEW:
760 5c860e29 2018-03-12 stsp printf("A %s\n", se->head_to_index->new_file.path);
762 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_MODIFIED:
763 5c860e29 2018-03-12 stsp printf("M %s\n", se->head_to_index->old_file.path);
765 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_DELETED:
766 5c860e29 2018-03-12 stsp printf("R %s\n", se->head_to_index->old_file.path);
768 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_RENAMED:
769 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
770 5c860e29 2018-03-12 stsp se->head_to_index->old_file.path,
771 5c860e29 2018-03-12 stsp se->head_to_index->new_file.path);
773 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_TYPECHANGE:
774 5c860e29 2018-03-12 stsp printf("t %s\n", se->head_to_index->old_file.path);
776 5c860e29 2018-03-12 stsp case GIT_STATUS_CURRENT:
782 5c860e29 2018-03-12 stsp git_status_list_free(status);
783 5c860e29 2018-03-12 stsp git_repository_free(repo);
784 5c860e29 2018-03-12 stsp git_libgit2_shutdown();