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>
20 c0768b0f 2018-06-10 stsp #include <sys/types.h>
22 5c860e29 2018-03-12 stsp #include <err.h>
23 5c860e29 2018-03-12 stsp #include <errno.h>
24 5c860e29 2018-03-12 stsp #include <locale.h>
25 5c860e29 2018-03-12 stsp #include <stdio.h>
26 5c860e29 2018-03-12 stsp #include <stdlib.h>
27 5c860e29 2018-03-12 stsp #include <string.h>
28 5c860e29 2018-03-12 stsp #include <unistd.h>
29 c09a553d 2018-03-12 stsp #include <libgen.h>
30 c0768b0f 2018-06-10 stsp #include <time.h>
32 f42b1b34 2018-03-12 stsp #include "got_error.h"
33 f42b1b34 2018-03-12 stsp #include "got_object.h"
34 5261c201 2018-04-01 stsp #include "got_reference.h"
35 f42b1b34 2018-03-12 stsp #include "got_repository.h"
36 c09a553d 2018-03-12 stsp #include "got_worktree.h"
37 79109fed 2018-03-27 stsp #include "got_diff.h"
38 372ccdbb 2018-06-10 stsp #include "got_commit_graph.h"
40 5c860e29 2018-03-12 stsp #ifndef nitems
41 5c860e29 2018-03-12 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
44 5c860e29 2018-03-12 stsp struct cmd {
45 5c860e29 2018-03-12 stsp const char *cmd_name;
46 d7d4f210 2018-03-12 stsp const struct got_error *(*cmd_main)(int, char *[]);
47 1b6b95a8 2018-03-12 stsp void (*cmd_usage)(void);
48 46a0db7d 2018-03-12 stsp const char *cmd_descr;
51 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
52 4ed7e80c 2018-05-20 stsp __dead static void usage_checkout(void);
53 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
54 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
56 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_checkout(int, char *[]);
57 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
58 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
59 4ed7e80c 2018-05-20 stsp #ifdef notyet
60 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_status(int, char *[]);
63 4ed7e80c 2018-05-20 stsp static struct cmd got_commands[] = {
64 c09a553d 2018-03-12 stsp { "checkout", cmd_checkout, usage_checkout,
65 0bb8a95e 2018-03-12 stsp "check out a new work tree from a repository" },
66 1b6b95a8 2018-03-12 stsp { "log", cmd_log, usage_log,
67 1b6b95a8 2018-03-12 stsp "show repository history" },
68 b00d56cd 2018-04-01 stsp { "diff", cmd_diff, usage_diff,
69 b00d56cd 2018-04-01 stsp "compare files and directories" },
70 f42b1b34 2018-03-12 stsp #ifdef notyet
71 1b6b95a8 2018-03-12 stsp { "status", cmd_status, usage_status,
72 1b6b95a8 2018-03-12 stsp "show modification status of files" },
77 5c860e29 2018-03-12 stsp main(int argc, char *argv[])
79 5c860e29 2018-03-12 stsp struct cmd *cmd;
80 5c860e29 2018-03-12 stsp unsigned int i;
82 1b6b95a8 2018-03-12 stsp int hflag = 0;
84 5c860e29 2018-03-12 stsp setlocale(LC_ALL, "");
86 1b6b95a8 2018-03-12 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
87 5c860e29 2018-03-12 stsp switch (ch) {
93 5c860e29 2018-03-12 stsp /* NOTREACHED */
97 5c860e29 2018-03-12 stsp argc -= optind;
98 5c860e29 2018-03-12 stsp argv += optind;
101 5c860e29 2018-03-12 stsp if (argc <= 0)
104 5c860e29 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
105 d7d4f210 2018-03-12 stsp const struct got_error *error;
107 5c860e29 2018-03-12 stsp cmd = &got_commands[i];
109 5c860e29 2018-03-12 stsp if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
113 1b6b95a8 2018-03-12 stsp got_commands[i].cmd_usage();
115 d7d4f210 2018-03-12 stsp error = got_commands[i].cmd_main(argc, argv);
116 d7d4f210 2018-03-12 stsp if (error) {
117 d7d4f210 2018-03-12 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
124 20ecf764 2018-03-12 stsp fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
128 4ed7e80c 2018-05-20 stsp __dead static void
129 5c860e29 2018-03-12 stsp usage(void)
133 987e94ba 2018-03-12 stsp fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
134 987e94ba 2018-03-12 stsp "Available commands:\n", getprogname());
135 46a0db7d 2018-03-12 stsp for (i = 0; i < nitems(got_commands); i++) {
136 46a0db7d 2018-03-12 stsp struct cmd *cmd = &got_commands[i];
137 46a0db7d 2018-03-12 stsp fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
142 4ed7e80c 2018-05-20 stsp __dead static void
143 c09a553d 2018-03-12 stsp usage_checkout(void)
145 0bb8a95e 2018-03-12 stsp fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
146 0bb8a95e 2018-03-12 stsp "[worktree-path]\n", getprogname());
150 92a684f4 2018-03-12 stsp static void
151 92a684f4 2018-03-12 stsp checkout_progress(void *arg, const char *path)
153 92a684f4 2018-03-12 stsp char *worktree_path = arg;
155 92a684f4 2018-03-12 stsp while (path[0] == '/')
158 92a684f4 2018-03-12 stsp printf("A %s/%s\n", worktree_path, path);
161 4ed7e80c 2018-05-20 stsp static const struct got_error *
162 c09a553d 2018-03-12 stsp cmd_checkout(int argc, char *argv[])
164 c09a553d 2018-03-12 stsp const struct got_error *error = NULL;
165 c09a553d 2018-03-12 stsp struct got_repository *repo = NULL;
166 c09a553d 2018-03-12 stsp struct got_reference *head_ref = NULL;
167 c09a553d 2018-03-12 stsp struct got_worktree *worktree = NULL;
168 c09a553d 2018-03-12 stsp char *repo_path = NULL;
169 c09a553d 2018-03-12 stsp char *worktree_path = NULL;
170 0bb8a95e 2018-03-12 stsp const char *path_prefix = "";
173 0bb8a95e 2018-03-12 stsp while ((ch = getopt(argc, argv, "p:")) != -1) {
174 0bb8a95e 2018-03-12 stsp switch (ch) {
176 0bb8a95e 2018-03-12 stsp path_prefix = optarg;
180 0bb8a95e 2018-03-12 stsp /* NOTREACHED */
184 0bb8a95e 2018-03-12 stsp argc -= optind;
185 0bb8a95e 2018-03-12 stsp argv += optind;
187 6715a751 2018-03-16 stsp #ifndef PROFILE
188 2178c42e 2018-04-22 stsp if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
189 c09a553d 2018-03-12 stsp err(1, "pledge");
191 0bb8a95e 2018-03-12 stsp if (argc == 1) {
192 c09a553d 2018-03-12 stsp char *cwd, *base, *dotgit;
193 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
194 76089277 2018-04-01 stsp if (repo_path == NULL)
195 76089277 2018-04-01 stsp return got_error_from_errno();
196 c09a553d 2018-03-12 stsp cwd = getcwd(NULL, 0);
197 76089277 2018-04-01 stsp if (cwd == NULL) {
198 76089277 2018-04-01 stsp error = got_error_from_errno();
201 5d7c1dab 2018-04-01 stsp if (path_prefix[0])
202 5d7c1dab 2018-04-01 stsp base = basename(path_prefix);
204 5d7c1dab 2018-04-01 stsp base = basename(repo_path);
205 76089277 2018-04-01 stsp if (base == NULL) {
206 76089277 2018-04-01 stsp error = got_error_from_errno();
209 c09a553d 2018-03-12 stsp dotgit = strstr(base, ".git");
210 c09a553d 2018-03-12 stsp if (dotgit)
211 c09a553d 2018-03-12 stsp *dotgit = '\0';
212 c09a553d 2018-03-12 stsp if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
213 0a585a0d 2018-03-17 stsp error = got_error_from_errno();
218 0bb8a95e 2018-03-12 stsp } else if (argc == 2) {
219 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
220 76089277 2018-04-01 stsp if (repo_path == NULL) {
221 76089277 2018-04-01 stsp error = got_error_from_errno();
224 f7b38925 2018-04-01 stsp worktree_path = realpath(argv[1], NULL);
225 76089277 2018-04-01 stsp if (worktree_path == NULL) {
226 76089277 2018-04-01 stsp error = got_error_from_errno();
230 c09a553d 2018-03-12 stsp usage_checkout();
232 c09a553d 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
233 c09a553d 2018-03-12 stsp if (error != NULL)
235 c09a553d 2018-03-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
236 c09a553d 2018-03-12 stsp if (error != NULL)
239 0bb8a95e 2018-03-12 stsp error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
240 c09a553d 2018-03-12 stsp if (error != NULL)
243 c09a553d 2018-03-12 stsp error = got_worktree_open(&worktree, worktree_path);
244 c09a553d 2018-03-12 stsp if (error != NULL)
247 92a684f4 2018-03-12 stsp error = got_worktree_checkout_files(worktree, head_ref, repo,
248 92a684f4 2018-03-12 stsp checkout_progress, worktree_path);
249 c09a553d 2018-03-12 stsp if (error != NULL)
252 b65ae19a 2018-04-24 stsp printf("Checked out %s\n", worktree_path);
253 b65ae19a 2018-04-24 stsp printf("Now shut up and hack\n");
256 76089277 2018-04-01 stsp free(repo_path);
257 c09a553d 2018-03-12 stsp free(worktree_path);
258 c09a553d 2018-03-12 stsp return error;
261 f42b1b34 2018-03-12 stsp static const struct got_error *
262 79109fed 2018-03-27 stsp print_patch(struct got_commit_object *commit, struct got_object_id *id,
263 f42b1b34 2018-03-12 stsp struct got_repository *repo)
265 f42b1b34 2018-03-12 stsp const struct got_error *err = NULL;
266 79109fed 2018-03-27 stsp struct got_tree_object *tree1 = NULL, *tree2;
267 79109fed 2018-03-27 stsp struct got_object *obj;
268 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
270 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, commit->tree_id);
272 79109fed 2018-03-27 stsp return err;
274 79109fed 2018-03-27 stsp err = got_object_tree_open(&tree2, repo, obj);
275 79109fed 2018-03-27 stsp got_object_close(obj);
277 79109fed 2018-03-27 stsp return err;
279 79f35eb3 2018-06-11 stsp qid = SIMPLEQ_FIRST(&commit->parent_ids);
280 79f35eb3 2018-06-11 stsp if (qid != NULL) {
281 79109fed 2018-03-27 stsp struct got_commit_object *pcommit;
283 79f35eb3 2018-06-11 stsp err = got_object_open(&obj, repo, qid->id);
285 79109fed 2018-03-27 stsp return err;
287 79109fed 2018-03-27 stsp err = got_object_commit_open(&pcommit, repo, obj);
288 79109fed 2018-03-27 stsp got_object_close(obj);
290 79109fed 2018-03-27 stsp return err;
292 79109fed 2018-03-27 stsp err = got_object_open(&obj, repo, pcommit->tree_id);
293 79109fed 2018-03-27 stsp got_object_commit_close(pcommit);
295 79109fed 2018-03-27 stsp return err;
296 79109fed 2018-03-27 stsp err = got_object_tree_open(&tree1, repo, obj);
297 79109fed 2018-03-27 stsp got_object_close(obj);
299 79109fed 2018-03-27 stsp return err;
302 79109fed 2018-03-27 stsp err = got_diff_tree(tree1, tree2, repo, stdout);
304 79109fed 2018-03-27 stsp got_object_tree_close(tree1);
305 79109fed 2018-03-27 stsp got_object_tree_close(tree2);
306 79109fed 2018-03-27 stsp return err;
310 6c281f94 2018-06-11 stsp get_datestr(time_t *time, char *datebuf)
312 6c281f94 2018-06-11 stsp char *p, *s = ctime_r(time, datebuf);
313 6c281f94 2018-06-11 stsp p = strchr(s, '\n');
319 79109fed 2018-03-27 stsp static const struct got_error *
320 79109fed 2018-03-27 stsp print_commit(struct got_commit_object *commit, struct got_object_id *id,
321 1fd6d7ea 2018-06-13 stsp struct got_repository *repo, int show_patch)
323 79109fed 2018-03-27 stsp const struct got_error *err = NULL;
324 6c281f94 2018-06-11 stsp char *id_str, *datestr, *logmsg, *line;
325 6c281f94 2018-06-11 stsp char datebuf[26];
326 788c352e 2018-06-16 stsp time_t author_time, committer_time;
328 832c249c 2018-06-10 stsp err = got_object_id_str(&id_str, id);
330 8bf5b3c9 2018-03-17 stsp return err;
332 788c352e 2018-06-16 stsp author_time = mktime(&commit->tm_author);
333 788c352e 2018-06-16 stsp committer_time = mktime(&commit->tm_committer);
335 788c352e 2018-06-16 stsp /* This would express the date in committer's timezone. */
336 788c352e 2018-06-16 stsp author_time += commit->tm_author.tm_gmtoff;
337 788c352e 2018-06-16 stsp committer_time += commit->tm_committer.tm_gmtoff;
340 8bf5b3c9 2018-03-17 stsp printf("-----------------------------------------------\n");
341 832c249c 2018-06-10 stsp printf("commit %s\n", id_str);
342 832c249c 2018-06-10 stsp free(id_str);
343 788c352e 2018-06-16 stsp datestr = get_datestr(&author_time, datebuf);
344 788c352e 2018-06-16 stsp printf("author: %s %s UTC\n", commit->author, datestr);
345 6ede4e7a 2018-06-11 stsp if (strcmp(commit->author, commit->committer) != 0 ||
346 788c352e 2018-06-16 stsp author_time != committer_time) {
347 788c352e 2018-06-16 stsp datestr = get_datestr(&committer_time, datebuf);
348 788c352e 2018-06-16 stsp printf("committer: %s %s UTC\n", commit->committer, datestr);
350 3fe1abad 2018-06-10 stsp if (commit->nparents > 1) {
351 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
353 79f35eb3 2018-06-11 stsp SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
354 79f35eb3 2018-06-11 stsp err = got_object_id_str(&id_str, qid->id);
356 a0603db2 2018-06-10 stsp return err;
357 3fe1abad 2018-06-10 stsp printf("parent %d: %s\n", n++, id_str);
358 a0603db2 2018-06-10 stsp free(id_str);
362 832c249c 2018-06-10 stsp logmsg = strdup(commit->logmsg);
363 832c249c 2018-06-10 stsp if (logmsg == NULL)
364 832c249c 2018-06-10 stsp return got_error_from_errno();
367 832c249c 2018-06-10 stsp line = strsep(&logmsg, "\n");
369 832c249c 2018-06-10 stsp printf(" %s\n", line);
370 832c249c 2018-06-10 stsp } while (line);
371 832c249c 2018-06-10 stsp free(logmsg);
373 971751ac 2018-03-27 stsp if (show_patch) {
374 79109fed 2018-03-27 stsp err = print_patch(commit, id, repo);
375 971751ac 2018-03-27 stsp if (err == 0)
376 971751ac 2018-03-27 stsp printf("\n");
379 79109fed 2018-03-27 stsp return err;
382 f42b1b34 2018-03-12 stsp static const struct got_error *
383 8bf5b3c9 2018-03-17 stsp print_commits(struct got_object *root_obj, struct got_object_id *root_id,
384 1fd6d7ea 2018-06-13 stsp struct got_repository *repo, int show_patch, int limit,
385 0ed6ed4c 2018-06-13 stsp int first_parent_traversal)
387 f42b1b34 2018-03-12 stsp const struct got_error *err;
388 372ccdbb 2018-06-10 stsp struct got_commit_graph *graph;
389 372ccdbb 2018-06-10 stsp int ncommits;
391 0ed6ed4c 2018-06-13 stsp err = got_commit_graph_open(&graph, root_id, first_parent_traversal,
394 f42b1b34 2018-03-12 stsp return err;
395 372ccdbb 2018-06-10 stsp err = got_commit_graph_iter_start(graph, root_id);
397 0a585a0d 2018-03-17 stsp return err;
399 372ccdbb 2018-06-10 stsp struct got_commit_object *commit;
400 372ccdbb 2018-06-10 stsp struct got_object_id *id;
402 b43fbaa0 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
404 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
405 9ba79e04 2018-06-11 stsp err = NULL;
408 372ccdbb 2018-06-10 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
410 372ccdbb 2018-06-10 stsp err = got_commit_graph_fetch_commits(&ncommits,
411 372ccdbb 2018-06-10 stsp graph, 1, repo);
417 b43fbaa0 2018-06-11 stsp if (id == NULL)
420 f8e900f3 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
422 b43fbaa0 2018-06-11 stsp return err;
423 1fd6d7ea 2018-06-13 stsp err = print_commit(commit, id, repo, show_patch);
424 b43fbaa0 2018-06-11 stsp got_object_commit_close(commit);
425 372ccdbb 2018-06-10 stsp if (err || (limit && --limit == 0))
427 372ccdbb 2018-06-10 stsp } while (ncommits > 0);
429 372ccdbb 2018-06-10 stsp got_commit_graph_close(graph);
430 f42b1b34 2018-03-12 stsp return err;
433 4ed7e80c 2018-05-20 stsp __dead static void
434 6f3d1eb0 2018-03-12 stsp usage_log(void)
436 6238ee32 2018-06-13 stsp fprintf(stderr, "usage: %s log [-c commit] [-f] [ -l N ] [-p] "
437 64a96a6d 2018-04-01 stsp "[repository-path]\n", getprogname());
441 4ed7e80c 2018-05-20 stsp static const struct got_error *
442 f42b1b34 2018-03-12 stsp cmd_log(int argc, char *argv[])
444 f42b1b34 2018-03-12 stsp const struct got_error *error;
445 f42b1b34 2018-03-12 stsp struct got_repository *repo;
446 3235492e 2018-04-01 stsp struct got_object_id *id = NULL;
447 d1f2edc9 2018-06-13 stsp struct got_object *obj = NULL;
448 6f3d1eb0 2018-03-12 stsp char *repo_path = NULL;
449 d142fc45 2018-04-01 stsp char *start_commit = NULL;
451 1fd6d7ea 2018-06-13 stsp int show_patch = 0, limit = 0, first_parent_traversal = 0;
452 64a96a6d 2018-04-01 stsp const char *errstr;
454 6715a751 2018-03-16 stsp #ifndef PROFILE
455 442a3ddc 2018-04-23 stsp if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
456 f42b1b34 2018-03-12 stsp err(1, "pledge");
459 1fd6d7ea 2018-06-13 stsp while ((ch = getopt(argc, argv, "pc:l:f")) != -1) {
460 79109fed 2018-03-27 stsp switch (ch) {
462 79109fed 2018-03-27 stsp show_patch = 1;
465 d142fc45 2018-04-01 stsp start_commit = optarg;
468 64a96a6d 2018-04-01 stsp limit = strtonum(optarg, 1, INT_MAX, &errstr);
469 64a96a6d 2018-04-01 stsp if (errstr != NULL)
470 64a96a6d 2018-04-01 stsp err(1, "-l option %s", errstr);
473 0ed6ed4c 2018-06-13 stsp first_parent_traversal = 1;
477 79109fed 2018-03-27 stsp /* NOTREACHED */
481 79109fed 2018-03-27 stsp argc -= optind;
482 79109fed 2018-03-27 stsp argv += optind;
484 79109fed 2018-03-27 stsp if (argc == 0) {
485 6f3d1eb0 2018-03-12 stsp repo_path = getcwd(NULL, 0);
486 6f3d1eb0 2018-03-12 stsp if (repo_path == NULL)
487 e1e3f570 2018-04-01 stsp return got_error_from_errno();
488 3235492e 2018-04-01 stsp } else if (argc == 1) {
489 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
490 76089277 2018-04-01 stsp if (repo_path == NULL)
491 76089277 2018-04-01 stsp return got_error_from_errno();
493 6f3d1eb0 2018-03-12 stsp usage_log();
495 f42b1b34 2018-03-12 stsp error = got_repo_open(&repo, repo_path);
496 76089277 2018-04-01 stsp free(repo_path);
497 d7d4f210 2018-03-12 stsp if (error != NULL)
498 d7d4f210 2018-03-12 stsp return error;
500 d142fc45 2018-04-01 stsp if (start_commit == NULL) {
501 3235492e 2018-04-01 stsp struct got_reference *head_ref;
502 3235492e 2018-04-01 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
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_ref_resolve(&id, repo, head_ref);
506 3235492e 2018-04-01 stsp got_ref_close(head_ref);
507 3235492e 2018-04-01 stsp if (error != NULL)
508 3235492e 2018-04-01 stsp return error;
509 3235492e 2018-04-01 stsp error = got_object_open(&obj, repo, id);
511 d1f2edc9 2018-06-13 stsp struct got_reference *ref;
512 d1f2edc9 2018-06-13 stsp error = got_ref_open(&ref, repo, start_commit);
513 3235492e 2018-04-01 stsp if (error == NULL) {
514 d1f2edc9 2018-06-13 stsp error = got_ref_resolve(&id, repo, ref);
515 d1f2edc9 2018-06-13 stsp got_ref_close(ref);
516 d1f2edc9 2018-06-13 stsp if (error != NULL)
517 d1f2edc9 2018-06-13 stsp return error;
518 d1f2edc9 2018-06-13 stsp error = got_object_open(&obj, repo, id);
519 d1f2edc9 2018-06-13 stsp if (error != NULL)
520 d1f2edc9 2018-06-13 stsp return error;
522 d1f2edc9 2018-06-13 stsp if (obj == NULL) {
523 d1f2edc9 2018-06-13 stsp error = got_object_open_by_id_str(&obj, repo,
524 d1f2edc9 2018-06-13 stsp start_commit);
525 d1f2edc9 2018-06-13 stsp if (error != NULL)
526 d1f2edc9 2018-06-13 stsp return error;
527 3235492e 2018-04-01 stsp id = got_object_get_id(obj);
528 3235492e 2018-04-01 stsp if (id == NULL)
529 3235492e 2018-04-01 stsp error = got_error_from_errno();
532 d7d4f210 2018-03-12 stsp if (error != NULL)
533 d7d4f210 2018-03-12 stsp return error;
534 8bf5b3c9 2018-03-17 stsp if (got_object_get_type(obj) == GOT_OBJ_TYPE_COMMIT)
535 a0603db2 2018-06-10 stsp error = print_commits(obj, id, repo, show_patch, limit,
536 1fd6d7ea 2018-06-13 stsp first_parent_traversal);
538 8bf5b3c9 2018-03-17 stsp error = got_error(GOT_ERR_OBJ_TYPE);
539 f42b1b34 2018-03-12 stsp got_object_close(obj);
541 f42b1b34 2018-03-12 stsp got_repo_close(repo);
542 8bf5b3c9 2018-03-17 stsp return error;
545 4ed7e80c 2018-05-20 stsp __dead static void
546 3f8b7d6a 2018-04-01 stsp usage_diff(void)
548 3f8b7d6a 2018-04-01 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
549 3f8b7d6a 2018-04-01 stsp getprogname());
553 4ed7e80c 2018-05-20 stsp static const struct got_error *
554 b00d56cd 2018-04-01 stsp cmd_diff(int argc, char *argv[])
556 b00d56cd 2018-04-01 stsp const struct got_error *error;
557 b00d56cd 2018-04-01 stsp struct got_repository *repo = NULL;
558 b00d56cd 2018-04-01 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
559 b00d56cd 2018-04-01 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
560 b00d56cd 2018-04-01 stsp char *repo_path = NULL;
561 b00d56cd 2018-04-01 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
564 b00d56cd 2018-04-01 stsp #ifndef PROFILE
565 442a3ddc 2018-04-23 stsp if (pledge("stdio rpath wpath cpath flock proc", NULL) == -1)
566 b00d56cd 2018-04-01 stsp err(1, "pledge");
569 b00d56cd 2018-04-01 stsp while ((ch = getopt(argc, argv, "")) != -1) {
570 b00d56cd 2018-04-01 stsp switch (ch) {
573 b00d56cd 2018-04-01 stsp /* NOTREACHED */
577 b00d56cd 2018-04-01 stsp argc -= optind;
578 b00d56cd 2018-04-01 stsp argv += optind;
580 b00d56cd 2018-04-01 stsp if (argc == 0) {
581 b00d56cd 2018-04-01 stsp usage_diff(); /* TODO show local worktree changes */
582 3f8b7d6a 2018-04-01 stsp } else if (argc == 2) {
583 3f8b7d6a 2018-04-01 stsp repo_path = getcwd(NULL, 0);
584 3f8b7d6a 2018-04-01 stsp if (repo_path == NULL)
585 e1e3f570 2018-04-01 stsp return got_error_from_errno();
586 3f8b7d6a 2018-04-01 stsp obj_id_str1 = argv[0];
587 3f8b7d6a 2018-04-01 stsp obj_id_str2 = argv[1];
588 b00d56cd 2018-04-01 stsp } else if (argc == 3) {
589 76089277 2018-04-01 stsp repo_path = realpath(argv[0], NULL);
590 76089277 2018-04-01 stsp if (repo_path == NULL)
591 76089277 2018-04-01 stsp return got_error_from_errno();
592 b00d56cd 2018-04-01 stsp obj_id_str1 = argv[1];
593 b00d56cd 2018-04-01 stsp obj_id_str2 = argv[2];
595 b00d56cd 2018-04-01 stsp usage_diff();
597 b00d56cd 2018-04-01 stsp error = got_repo_open(&repo, repo_path);
598 76089277 2018-04-01 stsp free(repo_path);
599 b00d56cd 2018-04-01 stsp if (error != NULL)
602 b00d56cd 2018-04-01 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
603 b00d56cd 2018-04-01 stsp if (error == NULL) {
604 b00d56cd 2018-04-01 stsp id1 = got_object_get_id(obj1);
605 b00d56cd 2018-04-01 stsp if (id1 == NULL)
606 b00d56cd 2018-04-01 stsp error = got_error_from_errno();
608 b00d56cd 2018-04-01 stsp if (error != NULL)
611 b00d56cd 2018-04-01 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
612 b00d56cd 2018-04-01 stsp if (error == NULL) {
613 b00d56cd 2018-04-01 stsp id2 = got_object_get_id(obj2);
614 b00d56cd 2018-04-01 stsp if (id2 == NULL)
615 b00d56cd 2018-04-01 stsp error = got_error_from_errno();
617 b00d56cd 2018-04-01 stsp if (error != NULL)
620 b00d56cd 2018-04-01 stsp if (got_object_get_type(obj1) != got_object_get_type(obj2)) {
621 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
625 b00d56cd 2018-04-01 stsp switch (got_object_get_type(obj1)) {
626 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_BLOB:
627 11528a82 2018-05-19 stsp error = got_diff_objects_as_blobs(obj1, obj2, repo, stdout);
629 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_TREE:
630 11528a82 2018-05-19 stsp error = got_diff_objects_as_trees(obj1, obj2, repo, stdout);
632 b00d56cd 2018-04-01 stsp case GOT_OBJ_TYPE_COMMIT:
633 11528a82 2018-05-19 stsp error = got_diff_objects_as_commits(obj1, obj2, repo, stdout);
636 b00d56cd 2018-04-01 stsp error = got_error(GOT_ERR_OBJ_TYPE);
641 b00d56cd 2018-04-01 stsp got_object_close(obj1);
643 b00d56cd 2018-04-01 stsp got_object_close(obj2);
649 b00d56cd 2018-04-01 stsp got_repo_close(repo);
650 b00d56cd 2018-04-01 stsp return error;
653 f42b1b34 2018-03-12 stsp #ifdef notyet
654 4ed7e80c 2018-05-20 stsp static const struct got_error *
655 5c860e29 2018-03-12 stsp cmd_status(int argc __unused, char *argv[] __unused)
657 5c860e29 2018-03-12 stsp git_repository *repo = NULL;
658 5c860e29 2018-03-12 stsp git_status_list *status;
659 5c860e29 2018-03-12 stsp git_status_options statusopts;
662 5c860e29 2018-03-12 stsp git_libgit2_init();
664 5c860e29 2018-03-12 stsp if (git_repository_open_ext(&repo, ".", 0, NULL))
665 5c860e29 2018-03-12 stsp errx(1, "git_repository_open: %s", giterr_last()->message);
667 5c860e29 2018-03-12 stsp if (git_repository_is_bare(repo))
668 5c860e29 2018-03-12 stsp errx(1, "bar repository");
670 5c860e29 2018-03-12 stsp if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
671 5c860e29 2018-03-12 stsp errx(1, "git_status_init_options: %s", giterr_last()->message);
673 5c860e29 2018-03-12 stsp statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
674 5c860e29 2018-03-12 stsp statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
675 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
676 5c860e29 2018-03-12 stsp GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
678 5c860e29 2018-03-12 stsp if (git_status_list_new(&status, repo, &statusopts))
679 5c860e29 2018-03-12 stsp errx(1, "git_status_list_new: %s", giterr_last()->message);
681 5c860e29 2018-03-12 stsp for (i = 0; i < git_status_list_entrycount(status); i++) {
682 5c860e29 2018-03-12 stsp const git_status_entry *se;
684 5c860e29 2018-03-12 stsp se = git_status_byindex(status, i);
685 5c860e29 2018-03-12 stsp switch (se->status) {
686 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_NEW:
687 5c860e29 2018-03-12 stsp printf("? %s\n", se->index_to_workdir->new_file.path);
689 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_MODIFIED:
690 5c860e29 2018-03-12 stsp printf("M %s\n", se->index_to_workdir->new_file.path);
692 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_DELETED:
693 5c860e29 2018-03-12 stsp printf("R %s\n", se->index_to_workdir->new_file.path);
695 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_RENAMED:
696 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
697 5c860e29 2018-03-12 stsp se->index_to_workdir->old_file.path,
698 5c860e29 2018-03-12 stsp se->index_to_workdir->new_file.path);
700 5c860e29 2018-03-12 stsp case GIT_STATUS_WT_TYPECHANGE:
701 5c860e29 2018-03-12 stsp printf("t %s\n", se->index_to_workdir->new_file.path);
703 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_NEW:
704 5c860e29 2018-03-12 stsp printf("A %s\n", se->head_to_index->new_file.path);
706 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_MODIFIED:
707 5c860e29 2018-03-12 stsp printf("M %s\n", se->head_to_index->old_file.path);
709 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_DELETED:
710 5c860e29 2018-03-12 stsp printf("R %s\n", se->head_to_index->old_file.path);
712 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_RENAMED:
713 5c860e29 2018-03-12 stsp printf("m %s -> %s\n",
714 5c860e29 2018-03-12 stsp se->head_to_index->old_file.path,
715 5c860e29 2018-03-12 stsp se->head_to_index->new_file.path);
717 5c860e29 2018-03-12 stsp case GIT_STATUS_INDEX_TYPECHANGE:
718 5c860e29 2018-03-12 stsp printf("t %s\n", se->head_to_index->old_file.path);
720 5c860e29 2018-03-12 stsp case GIT_STATUS_CURRENT:
726 5c860e29 2018-03-12 stsp git_status_list_free(status);
727 5c860e29 2018-03-12 stsp git_repository_free(repo);
728 5c860e29 2018-03-12 stsp git_libgit2_shutdown();