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 5261c201 2018-04-01 stsp #include "got_reference.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 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
49 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
50 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
51 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
53 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
54 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
55 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
56 4ed7e80c 2018-05-20 stsp #ifdef notyet
57 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
60 4ed7e80c 2018-05-20 stsp static struct cmd got_commands[] = {
61 c09a553d 2018-03-12 stsp { "checkout", cmd_checkout, usage_checkout,
62 0bb8a95e 2018-03-12 stsp "check out a new work tree from a repository" },
63 1b6b95a8 2018-03-12 stsp { "log", cmd_log, usage_log,
64 1b6b95a8 2018-03-12 stsp "show repository history" },
65 b00d56cd 2018-04-01 stsp { "diff", cmd_diff, usage_diff,
66 b00d56cd 2018-04-01 stsp "compare files and directories" },
67 f42b1b34 2018-03-12 stsp #ifdef notyet
68 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
69 1b6b95a8 2018-03-12 stsp "show modification status of files" },
74 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
76 5c860e29 2018-03-12 stsp struct cmd *cmd;
77 5c860e29 2018-03-12 stsp unsigned int i;
79 1b6b95a8 2018-03-12 stsp int hflag = 0;
81 5c860e29 2018-03-12 stsp setlocale(LC_ALL, "");
83 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
84 5c860e29 2018-03-12 stsp switch (ch) {
90 5c860e29 2018-03-12 stsp /* NOTREACHED */
94 5c860e29 2018-03-12 stsp argc -= optind;
95 5c860e29 2018-03-12 stsp argv += optind;
98 5c860e29 2018-03-12 stsp if (argc <= 0)
101 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
102 d7d4f210 2018-03-12 stsp const struct got_error *error;
104 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
106 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
110 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
112 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
113 d7d4f210 2018-03-12 stsp if (error) {
114 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
121 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
125 4ed7e80c 2018-05-20 stsp __dead static void
126 5c860e29 2018-03-12 stsp usage(void)
130 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
131 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
132 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
133 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
134 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
139 4ed7e80c 2018-05-20 stsp __dead static void
140 c09a553d 2018-03-12 stsp usage_checkout(void)
142 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
143 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
147 92a684f4 2018-03-12 stsp static void
148 92a684f4 2018-03-12 stsp checkout_progress(void *arg, const char *path)
150 92a684f4 2018-03-12 stsp char *worktree_path = arg;
152 92a684f4 2018-03-12 stsp while (path[0] == '/')
155 92a684f4 2018-03-12 stsp printf("A %s/%s\n", worktree_path, path);
158 4ed7e80c 2018-05-20 stsp static const struct got_error *
159 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
161 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
162 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
163 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
164 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
165 c09a553d 2018-03-12 stsp char *repo_path = NULL;
166 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
167 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
170 0bb8a95e 2018-03-12 stsp while ((ch = getopt(argc, argv, "p:")) != -1) {
171 0bb8a95e 2018-03-12 stsp switch (ch) {
173 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
177 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
181 0bb8a95e 2018-03-12 stsp argc -= optind;
182 0bb8a95e 2018-03-12 stsp argv += optind;
184 6715a751 2018-03-16 stsp #ifndef PROFILE
185 2178c42e 2018-04-22 stsp if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
186 c09a553d 2018-03-12 stsp err(1, "pledge");
188 0bb8a95e 2018-03-12 stsp if (argc == 1) {
189 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
190 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
191 76089277 2018-04-01 stsp if (repo_path == NULL)
192 76089277 2018-04-01 stsp return got_error_from_errno();
193 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
194 76089277 2018-04-01 stsp if (cwd == NULL) {
195 76089277 2018-04-01 stsp error = got_error_from_errno();
198 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
199 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
201 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
202 76089277 2018-04-01 stsp if (base == NULL) {
203 76089277 2018-04-01 stsp error = got_error_from_errno();
206 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
207 c09a553d 2018-03-12 stsp if (dotgit)
208 c09a553d 2018-03-12 stsp *dotgit = '\0';
209 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
210 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
215 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
216 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
217 76089277 2018-04-01 stsp if (repo_path == NULL) {
218 76089277 2018-04-01 stsp error = got_error_from_errno();
221 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
222 76089277 2018-04-01 stsp if (worktree_path == NULL) {
223 76089277 2018-04-01 stsp error = got_error_from_errno();
227 c09a553d 2018-03-12 stsp usage_checkout();
229 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
230 c09a553d 2018-03-12 stsp if (error != NULL)
232 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
233 c09a553d 2018-03-12 stsp if (error != NULL)
236 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
237 c09a553d 2018-03-12 stsp if (error != NULL)
240 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
241 c09a553d 2018-03-12 stsp if (error != NULL)
244 92a684f4 2018-03-12 stsp error = got_worktree_checkout_files(worktree, head_ref, repo,
245 92a684f4 2018-03-12 stsp checkout_progress, worktree_path);
246 c09a553d 2018-03-12 stsp if (error != NULL)
249 b65ae19a 2018-04-24 stsp printf("Checked out %s\n", worktree_path);
250 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
253 76089277 2018-04-01 stsp free(repo_path);
254 c09a553d 2018-03-12 stsp free(worktree_path);
255 c09a553d 2018-03-12 stsp return error;
258 f42b1b34 2018-03-12 stsp static const struct got_error *
259 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
260 f42b1b34 2018-03-12 stsp struct got_repository *repo)
262 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
263 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
264 79109fed 2018-03-27 stsp struct got_object *obj;
265 79109fed 2018-03-27 stsp struct got_parent_id *pid;
267 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, commit->tree_id);
269 79109fed 2018-03-27 stsp return err;
271 79109fed 2018-03-27 stsp err = got_object_tree_open(&tree2, repo, obj);
272 79109fed 2018-03-27 stsp got_object_close(obj);
274 79109fed 2018-03-27 stsp return err;
276 79109fed 2018-03-27 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
277 79109fed 2018-03-27 stsp if (pid != NULL) {
278 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
280 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, pid->id);
282 79109fed 2018-03-27 stsp return err;
284 79109fed 2018-03-27 stsp err = got_object_commit_open(&pcommit, repo, obj);
285 79109fed 2018-03-27 stsp got_object_close(obj);
287 79109fed 2018-03-27 stsp return err;
289 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, pcommit->tree_id);
290 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
292 79109fed 2018-03-27 stsp return err;
293 79109fed 2018-03-27 stsp err = got_object_tree_open(&tree1, repo, obj);
294 79109fed 2018-03-27 stsp got_object_close(obj);
296 79109fed 2018-03-27 stsp return err;
299 79109fed 2018-03-27 stsp err = got_diff_tree(tree1, tree2, repo, stdout);
301 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
302 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
303 79109fed 2018-03-27 stsp return err;
306 79109fed 2018-03-27 stsp static const struct got_error *
307 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
308 79109fed 2018-03-27 stsp struct got_repository *repo, int show_patch)
310 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
313 8bf5b3c9 2018-03-17 stsp err = got_object_id_str(&buf, id);
315 8bf5b3c9 2018-03-17 stsp return err;
317 8bf5b3c9 2018-03-17 stsp printf("-----------------------------------------------\n");
318 b65ae19a 2018-04-24 stsp printf("commit %s\n", buf);
319 b65ae19a 2018-04-24 stsp printf("author: %s\n", commit->author);
320 f3d135e1 2018-04-01 stsp if (strcmp(commit->author, commit->committer) != 0)
321 b65ae19a 2018-04-24 stsp printf("committer: %s\n", commit->committer);
322 8bf5b3c9 2018-03-17 stsp printf("\n%s\n", commit->logmsg);
324 971751ac 2018-03-27 stsp if (show_patch) {
325 79109fed 2018-03-27 stsp err = print_patch(commit, id, repo);
326 971751ac 2018-03-27 stsp if (err == 0)
327 971751ac 2018-03-27 stsp printf("\n");
331 79109fed 2018-03-27 stsp return err;
334 8bf5b3c9 2018-03-17 stsp struct commit_queue_entry {
335 8bf5b3c9 2018-03-17 stsp TAILQ_ENTRY(commit_queue_entry) entry;
336 8bf5b3c9 2018-03-17 stsp struct got_object_id *id;
337 8bf5b3c9 2018-03-17 stsp struct got_commit_object *commit;
340 f42b1b34 2018-03-12 stsp static const struct got_error *
341 8bf5b3c9 2018-03-17 stsp print_commits(struct got_object *root_obj, struct got_object_id *root_id,
342 64a96a6d 2018-04-01 stsp struct got_repository *repo, int show_patch, int limit)
344 f42b1b34 2018-03-12 stsp const struct got_error *err;
345 8bf5b3c9 2018-03-17 stsp struct got_commit_object *root_commit;
346 8bf5b3c9 2018-03-17 stsp TAILQ_HEAD(, commit_queue_entry) commits;
347 8bf5b3c9 2018-03-17 stsp struct commit_queue_entry *entry;
349 8bf5b3c9 2018-03-17 stsp TAILQ_INIT(&commits);
351 8bf5b3c9 2018-03-17 stsp err = got_object_commit_open(&root_commit, repo, root_obj);
353 f42b1b34 2018-03-12 stsp return err;
355 8bf5b3c9 2018-03-17 stsp entry = calloc(1, sizeof(*entry));
356 8bf5b3c9 2018-03-17 stsp if (entry == NULL)
357 0a585a0d 2018-03-17 stsp return got_error_from_errno();
358 8bf5b3c9 2018-03-17 stsp entry->id = got_object_id_dup(root_id);
359 8bf5b3c9 2018-03-17 stsp if (entry->id == NULL) {
360 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
361 8bf5b3c9 2018-03-17 stsp free(entry);
362 0a585a0d 2018-03-17 stsp return err;
364 8bf5b3c9 2018-03-17 stsp entry->commit = root_commit;
365 8bf5b3c9 2018-03-17 stsp TAILQ_INSERT_HEAD(&commits, entry, entry);
367 8bf5b3c9 2018-03-17 stsp while (!TAILQ_EMPTY(&commits)) {
368 8bf5b3c9 2018-03-17 stsp struct got_parent_id *pid;
369 7e665116 2018-04-02 stsp struct got_object *obj;
370 7e665116 2018-04-02 stsp struct got_commit_object *pcommit;
371 7e665116 2018-04-02 stsp struct commit_queue_entry *pentry;
373 8bf5b3c9 2018-03-17 stsp entry = TAILQ_FIRST(&commits);
375 79109fed 2018-03-27 stsp err = print_commit(entry->commit, entry->id, repo, show_patch);
379 64a96a6d 2018-04-01 stsp if (limit && --limit == 0)
382 7e665116 2018-04-02 stsp if (entry->commit->nparents == 0)
385 7e665116 2018-04-02 stsp /* Follow the first parent (TODO: handle merge commits). */
386 7e665116 2018-04-02 stsp pid = SIMPLEQ_FIRST(&entry->commit->parent_ids);
387 7e665116 2018-04-02 stsp err = got_object_open(&obj, repo, pid->id);
390 7e665116 2018-04-02 stsp if (got_object_get_type(obj) != GOT_OBJ_TYPE_COMMIT) {
391 7e665116 2018-04-02 stsp err = got_error(GOT_ERR_OBJ_TYPE);
395 7e665116 2018-04-02 stsp err = got_object_commit_open(&pcommit, repo, obj);
396 7e665116 2018-04-02 stsp got_object_close(obj);
400 7e665116 2018-04-02 stsp pentry = calloc(1, sizeof(*pentry));
401 7e665116 2018-04-02 stsp if (pentry == NULL) {
402 7e665116 2018-04-02 stsp err = got_error_from_errno();
403 7e665116 2018-04-02 stsp got_object_commit_close(pcommit);
406 7e665116 2018-04-02 stsp pentry->id = got_object_id_dup(pid->id);
407 7e665116 2018-04-02 stsp if (pentry->id == NULL) {
408 7e665116 2018-04-02 stsp err = got_error_from_errno();
409 7e665116 2018-04-02 stsp got_object_commit_close(pcommit);
412 7e665116 2018-04-02 stsp pentry->commit = pcommit;
413 7e665116 2018-04-02 stsp TAILQ_INSERT_TAIL(&commits, pentry, entry);
415 8bf5b3c9 2018-03-17 stsp TAILQ_REMOVE(&commits, entry, entry);
416 8bf5b3c9 2018-03-17 stsp got_object_commit_close(entry->commit);
417 8bf5b3c9 2018-03-17 stsp free(entry->id);
418 8bf5b3c9 2018-03-17 stsp free(entry);
421 675d71c4 2018-04-02 stsp while (!TAILQ_EMPTY(&commits)) {
422 675d71c4 2018-04-02 stsp entry = TAILQ_FIRST(&commits);
423 675d71c4 2018-04-02 stsp TAILQ_REMOVE(&commits, entry, entry);
424 675d71c4 2018-04-02 stsp got_object_commit_close(entry->commit);
425 675d71c4 2018-04-02 stsp free(entry->id);
426 675d71c4 2018-04-02 stsp free(entry);
429 f42b1b34 2018-03-12 stsp return err;
432 4ed7e80c 2018-05-20 stsp __dead static void
433 6f3d1eb0 2018-03-12 stsp usage_log(void)
435 64a96a6d 2018-04-01 stsp fprintf(stderr, "usage: %s log [-p] [-c commit] [ -l N ] "
436 64a96a6d 2018-04-01 stsp "[repository-path]\n", getprogname());
440 4ed7e80c 2018-05-20 stsp static const struct got_error *
441 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
443 f42b1b34 2018-03-12 stsp const struct got_error *error;
444 f42b1b34 2018-03-12 stsp struct got_repository *repo;
445 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
446 f42b1b34 2018-03-12 stsp struct got_object *obj;
447 6f3d1eb0 2018-03-12 stsp char *repo_path = NULL;
448 d142fc45 2018-04-01 stsp char *start_commit = NULL;
450 64a96a6d 2018-04-01 stsp int show_patch = 0, limit = 0;
451 64a96a6d 2018-04-01 stsp const char *errstr;
453 6715a751 2018-03-16 stsp #ifndef PROFILE
454 442a3ddc 2018-04-23 stsp if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
455 f42b1b34 2018-03-12 stsp err(1, "pledge");
458 64a96a6d 2018-04-01 stsp while ((ch = getopt(argc, argv, "pc:l:")) != -1) {
459 79109fed 2018-03-27 stsp switch (ch) {
461 79109fed 2018-03-27 stsp show_patch = 1;
464 d142fc45 2018-04-01 stsp start_commit = optarg;
467 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
468 64a96a6d 2018-04-01 stsp if (errstr != NULL)
469 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
473 79109fed 2018-03-27 stsp /* NOTREACHED */
477 79109fed 2018-03-27 stsp argc -= optind;
478 79109fed 2018-03-27 stsp argv += optind;
480 79109fed 2018-03-27 stsp if (argc == 0) {
481 6f3d1eb0 2018-03-12 stsp repo_path = getcwd(NULL, 0);
482 6f3d1eb0 2018-03-12 stsp if (repo_path == NULL)
483 e1e3f570 2018-04-01 stsp return got_error_from_errno();
484 3235492e 2018-04-01 stsp } else if (argc == 1) {
485 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
486 76089277 2018-04-01 stsp if (repo_path == NULL)
487 76089277 2018-04-01 stsp return got_error_from_errno();
489 6f3d1eb0 2018-03-12 stsp usage_log();
491 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
492 76089277 2018-04-01 stsp free(repo_path);
493 d7d4f210 2018-03-12 stsp if (error != NULL)
494 d7d4f210 2018-03-12 stsp return error;
496 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
497 3235492e 2018-04-01 stsp struct got_reference *head_ref;
498 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
499 3235492e 2018-04-01 stsp if (error != NULL)
500 3235492e 2018-04-01 stsp return error;
501 3235492e 2018-04-01 stsp error = got_ref_resolve(&id, repo, head_ref);
502 3235492e 2018-04-01 stsp got_ref_close(head_ref);
503 3235492e 2018-04-01 stsp if (error != NULL)
504 3235492e 2018-04-01 stsp return error;
505 3235492e 2018-04-01 stsp error = got_object_open(&obj, repo, id);
507 d142fc45 2018-04-01 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
508 3235492e 2018-04-01 stsp if (error == NULL) {
509 3235492e 2018-04-01 stsp id = got_object_get_id(obj);
510 3235492e 2018-04-01 stsp if (id == NULL)
511 3235492e 2018-04-01 stsp error = got_error_from_errno();
514 d7d4f210 2018-03-12 stsp if (error != NULL)
515 d7d4f210 2018-03-12 stsp return error;
516 8bf5b3c9 2018-03-17 stsp if (got_object_get_type(obj) == GOT_OBJ_TYPE_COMMIT)
517 64a96a6d 2018-04-01 stsp error = print_commits(obj, id, repo, show_patch, limit);
519 8bf5b3c9 2018-03-17 stsp error = got_error(GOT_ERR_OBJ_TYPE);
520 f42b1b34 2018-03-12 stsp got_object_close(obj);
522 f42b1b34 2018-03-12 stsp got_repo_close(repo);
523 8bf5b3c9 2018-03-17 stsp return error;
526 4ed7e80c 2018-05-20 stsp __dead static void
527 3f8b7d6a 2018-04-01 stsp usage_diff(void)
529 3f8b7d6a 2018-04-01 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
530 3f8b7d6a 2018-04-01 stsp getprogname());
534 4ed7e80c 2018-05-20 stsp static const struct got_error *
535 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
537 b00d56cd 2018-04-01 stsp const struct got_error *error;
538 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
539 b00d56cd 2018-04-01 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
540 b00d56cd 2018-04-01 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
541 b00d56cd 2018-04-01 stsp char *repo_path = NULL;
542 b00d56cd 2018-04-01 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
545 b00d56cd 2018-04-01 stsp #ifndef PROFILE
546 442a3ddc 2018-04-23 stsp if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
547 b00d56cd 2018-04-01 stsp err(1, "pledge");
550 b00d56cd 2018-04-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
551 b00d56cd 2018-04-01 stsp switch (ch) {
554 b00d56cd 2018-04-01 stsp /* NOTREACHED */
558 b00d56cd 2018-04-01 stsp argc -= optind;
559 b00d56cd 2018-04-01 stsp argv += optind;
561 b00d56cd 2018-04-01 stsp if (argc == 0) {
562 b00d56cd 2018-04-01 stsp usage_diff(); /* TODO show local worktree changes */
563 3f8b7d6a 2018-04-01 stsp } else if (argc == 2) {
564 3f8b7d6a 2018-04-01 stsp repo_path = getcwd(NULL, 0);
565 3f8b7d6a 2018-04-01 stsp if (repo_path == NULL)
566 e1e3f570 2018-04-01 stsp return got_error_from_errno();
567 3f8b7d6a 2018-04-01 stsp obj_id_str1 = argv[0];
568 3f8b7d6a 2018-04-01 stsp obj_id_str2 = argv[1];
569 b00d56cd 2018-04-01 stsp } else if (argc == 3) {
570 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
571 76089277 2018-04-01 stsp if (repo_path == NULL)
572 76089277 2018-04-01 stsp return got_error_from_errno();
573 b00d56cd 2018-04-01 stsp obj_id_str1 = argv[1];
574 b00d56cd 2018-04-01 stsp obj_id_str2 = argv[2];
576 b00d56cd 2018-04-01 stsp usage_diff();
578 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
579 76089277 2018-04-01 stsp free(repo_path);
580 b00d56cd 2018-04-01 stsp if (error != NULL)
583 b00d56cd 2018-04-01 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
584 b00d56cd 2018-04-01 stsp if (error == NULL) {
585 b00d56cd 2018-04-01 stsp id1 = got_object_get_id(obj1);
586 b00d56cd 2018-04-01 stsp if (id1 == NULL)
587 b00d56cd 2018-04-01 stsp error = got_error_from_errno();
589 b00d56cd 2018-04-01 stsp if (error != NULL)
592 b00d56cd 2018-04-01 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
593 b00d56cd 2018-04-01 stsp if (error == NULL) {
594 b00d56cd 2018-04-01 stsp id2 = got_object_get_id(obj2);
595 b00d56cd 2018-04-01 stsp if (id2 == NULL)
596 b00d56cd 2018-04-01 stsp error = got_error_from_errno();
598 b00d56cd 2018-04-01 stsp if (error != NULL)
601 b00d56cd 2018-04-01 stsp if (got_object_get_type(obj1) != got_object_get_type(obj2)) {
602 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
606 b00d56cd 2018-04-01 stsp switch (got_object_get_type(obj1)) {
607 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
608 11528a82 2018-05-19 stsp error = got_diff_objects_as_blobs(obj1, obj2, repo, stdout);
610 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
611 11528a82 2018-05-19 stsp error = got_diff_objects_as_trees(obj1, obj2, repo, stdout);
613 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
614 11528a82 2018-05-19 stsp error = got_diff_objects_as_commits(obj1, obj2, repo, stdout);
617 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
622 b00d56cd 2018-04-01 stsp got_object_close(obj1);
624 b00d56cd 2018-04-01 stsp got_object_close(obj2);
630 b00d56cd 2018-04-01 stsp got_repo_close(repo);
631 b00d56cd 2018-04-01 stsp return error;
634 f42b1b34 2018-03-12 stsp #ifdef notyet
635 4ed7e80c 2018-05-20 stsp static const struct got_error *
636 5c860e29 2018-03-12 stsp cmd_status(int argc __unused, char *argv[] __unused)
638 5c860e29 2018-03-12 stsp git_repository *repo = NULL;
639 5c860e29 2018-03-12 stsp git_status_list *status;
640 5c860e29 2018-03-12 stsp git_status_options statusopts;
643 5c860e29 2018-03-12 stsp git_libgit2_init();
645 5c860e29 2018-03-12 stsp if (git_repository_open_ext(&repo, ".", 0, NULL))
646 5c860e29 2018-03-12 stsp errx(1, "git_repository_open: %s", giterr_last()->message);
648 5c860e29 2018-03-12 stsp if (git_repository_is_bare(repo))
649 5c860e29 2018-03-12 stsp errx(1, "bar repository");
651 5c860e29 2018-03-12 stsp if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
652 5c860e29 2018-03-12 stsp errx(1, "git_status_init_options: %s", giterr_last()->message);
654 5c860e29 2018-03-12 stsp statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
655 5c860e29 2018-03-12 stsp statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
656 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
657 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
659 5c860e29 2018-03-12 stsp if (git_status_list_new(&status, repo, &statusopts))
660 5c860e29 2018-03-12 stsp errx(1, "git_status_list_new: %s", giterr_last()->message);
662 5c860e29 2018-03-12 stsp for (i = 0; i < git_status_list_entrycount(status); i++) {
663 5c860e29 2018-03-12 stsp const git_status_entry *se;
665 5c860e29 2018-03-12 stsp se = git_status_byindex(status, i);
666 5c860e29 2018-03-12 stsp switch (se->status) {
667 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_NEW:
668 5c860e29 2018-03-12 stsp printf("? %s\n", se->index_to_workdir->new_file.path);
670 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_MODIFIED:
671 5c860e29 2018-03-12 stsp printf("M %s\n", se->index_to_workdir->new_file.path);
673 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_DELETED:
674 5c860e29 2018-03-12 stsp printf("R %s\n", se->index_to_workdir->new_file.path);
676 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_RENAMED:
677 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
678 5c860e29 2018-03-12 stsp se->index_to_workdir->old_file.path,
679 5c860e29 2018-03-12 stsp se->index_to_workdir->new_file.path);
681 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_TYPECHANGE:
682 5c860e29 2018-03-12 stsp printf("t %s\n", se->index_to_workdir->new_file.path);
684 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_NEW:
685 5c860e29 2018-03-12 stsp printf("A %s\n", se->head_to_index->new_file.path);
687 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_MODIFIED:
688 5c860e29 2018-03-12 stsp printf("M %s\n", se->head_to_index->old_file.path);
690 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_DELETED:
691 5c860e29 2018-03-12 stsp printf("R %s\n", se->head_to_index->old_file.path);
693 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_RENAMED:
694 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
695 5c860e29 2018-03-12 stsp se->head_to_index->old_file.path,
696 5c860e29 2018-03-12 stsp se->head_to_index->new_file.path);
698 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_TYPECHANGE:
699 5c860e29 2018-03-12 stsp printf("t %s\n", se->head_to_index->old_file.path);
701 5c860e29 2018-03-12 stsp case GIT_STATUS_CURRENT:
707 5c860e29 2018-03-12 stsp git_status_list_free(status);
708 5c860e29 2018-03-12 stsp git_repository_free(repo);
709 5c860e29 2018-03-12 stsp git_libgit2_shutdown();