2 9f7d7167 2018-04-29 stsp * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
4 9f7d7167 2018-04-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 9f7d7167 2018-04-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 9f7d7167 2018-04-29 stsp * copyright notice and this permission notice appear in all copies.
8 9f7d7167 2018-04-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 9f7d7167 2018-04-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 9f7d7167 2018-04-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 9f7d7167 2018-04-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 9f7d7167 2018-04-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 9f7d7167 2018-04-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 9f7d7167 2018-04-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 80ddbec8 2018-04-29 stsp #include <sys/queue.h>
19 31120ada 2018-04-30 stsp #include <errno.h>
20 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
21 9f7d7167 2018-04-29 stsp #include <curses.h>
22 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
23 9f7d7167 2018-04-29 stsp #include <panel.h>
24 9f7d7167 2018-04-29 stsp #include <locale.h>
25 9f7d7167 2018-04-29 stsp #include <stdlib.h>
26 26ed57b2 2018-05-19 stsp #include <stdio.h>
27 9f7d7167 2018-04-29 stsp #include <getopt.h>
28 9f7d7167 2018-04-29 stsp #include <string.h>
29 9f7d7167 2018-04-29 stsp #include <err.h>
30 80ddbec8 2018-04-29 stsp #include <unistd.h>
31 26ed57b2 2018-05-19 stsp #include <util.h>
32 26ed57b2 2018-05-19 stsp #include <limits.h>
33 61e69b96 2018-05-20 stsp #include <wchar.h>
35 9f7d7167 2018-04-29 stsp #include "got_error.h"
36 80ddbec8 2018-04-29 stsp #include "got_object.h"
37 80ddbec8 2018-04-29 stsp #include "got_reference.h"
38 80ddbec8 2018-04-29 stsp #include "got_repository.h"
39 80ddbec8 2018-04-29 stsp #include "got_diff.h"
40 511a516b 2018-05-19 stsp #include "got_opentemp.h"
43 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
46 9f7d7167 2018-04-29 stsp #ifndef nitems
47 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
50 9f7d7167 2018-04-29 stsp struct tog_cmd {
51 c2301be8 2018-04-30 stsp const char *name;
52 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
53 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
54 c2301be8 2018-04-30 stsp const char *descr;
57 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
58 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
59 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
60 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
62 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
63 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
64 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
66 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
67 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
68 9f7d7167 2018-04-29 stsp "show repository history" },
69 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
70 9f7d7167 2018-04-29 stsp "compare files and directories" },
71 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
72 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
75 fed328cc 2018-05-20 stsp static struct tog_view {
76 26ed57b2 2018-05-19 stsp WINDOW *window;
77 26ed57b2 2018-05-19 stsp PANEL *panel;
78 fed328cc 2018-05-20 stsp } tog_log_view, tog_diff_view;
80 cd0acaa7 2018-05-20 stsp static const struct got_error *
81 cd0acaa7 2018-05-20 stsp show_diff_view(struct got_object *, struct got_object *,
82 cd0acaa7 2018-05-20 stsp struct got_repository *);
83 cd0acaa7 2018-05-20 stsp static const struct got_error *
84 cd0acaa7 2018-05-20 stsp show_log_view(struct got_object_id *, struct got_repository *);
86 4ed7e80c 2018-05-20 stsp __dead static void
87 9f7d7167 2018-04-29 stsp usage_log(void)
90 80ddbec8 2018-04-29 stsp fprintf(stderr, "usage: %s log [-c commit] [repository-path]\n",
91 9f7d7167 2018-04-29 stsp getprogname());
95 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
96 80ddbec8 2018-04-29 stsp static const struct got_error *
97 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
99 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
101 963b370f 2018-05-20 stsp *ws = NULL;
102 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
103 963b370f 2018-05-20 stsp if (*wlen == (size_t)-1)
104 963b370f 2018-05-20 stsp return got_error_from_errno();
106 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
107 963b370f 2018-05-20 stsp if (*ws == NULL)
108 963b370f 2018-05-20 stsp return got_error_from_errno();
110 963b370f 2018-05-20 stsp if (mbstowcs(*ws, s, *wlen) != *wlen)
111 963b370f 2018-05-20 stsp err = got_error_from_errno();
115 963b370f 2018-05-20 stsp *ws = NULL;
118 963b370f 2018-05-20 stsp return err;
121 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
122 963b370f 2018-05-20 stsp static const struct got_error *
123 963b370f 2018-05-20 stsp format_line(wchar_t **wlinep, int *widthp, char *line, int wlimit)
125 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
126 963b370f 2018-05-20 stsp int cols = 0;
127 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
128 963b370f 2018-05-20 stsp size_t wlen;
131 963b370f 2018-05-20 stsp *wlinep = NULL;
133 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
135 963b370f 2018-05-20 stsp return err;
138 963b370f 2018-05-20 stsp while (i < wlen && cols <= wlimit) {
139 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
140 963b370f 2018-05-20 stsp switch (width) {
145 963b370f 2018-05-20 stsp cols += width;
148 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
149 963b370f 2018-05-20 stsp cols += TABSIZE;
152 963b370f 2018-05-20 stsp err = got_error_from_errno();
155 963b370f 2018-05-20 stsp if (cols <= COLS) {
157 963b370f 2018-05-20 stsp if (widthp)
158 963b370f 2018-05-20 stsp *widthp = cols;
161 963b370f 2018-05-20 stsp wline[i] = L'\0';
164 963b370f 2018-05-20 stsp free(wline);
166 963b370f 2018-05-20 stsp *wlinep = wline;
167 963b370f 2018-05-20 stsp return err;
170 963b370f 2018-05-20 stsp static const struct got_error *
171 0553a4e3 2018-04-30 stsp draw_commit(struct got_commit_object *commit, struct got_object_id *id)
173 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
174 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
175 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
176 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
177 bb737323 2018-05-20 stsp int author_width, logmsg_width;
178 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
179 80ddbec8 2018-04-29 stsp char *line = NULL;
180 6d9fbc00 2018-04-29 stsp char *id_str = NULL;
181 bb737323 2018-05-20 stsp size_t id_len;
182 bb737323 2018-05-20 stsp int col, limit;
183 bb737323 2018-05-20 stsp static const size_t id_display_cols = 8;
184 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
185 9c2eaf34 2018-05-20 stsp const int avail = COLS;
187 80ddbec8 2018-04-29 stsp err = got_object_id_str(&id_str, id);
189 80ddbec8 2018-04-29 stsp return err;
190 881b2d3e 2018-04-30 stsp id_len = strlen(id_str);
191 bb737323 2018-05-20 stsp if (avail < id_display_cols) {
192 bb737323 2018-05-20 stsp limit = MIN(id_len, avail);
193 bb737323 2018-05-20 stsp waddnstr(tog_log_view.window, id_str, limit);
195 bb737323 2018-05-20 stsp limit = MIN(id_display_cols, id_len);
196 bb737323 2018-05-20 stsp waddnstr(tog_log_view.window, id_str, limit);
198 bb737323 2018-05-20 stsp col = limit + 1;
199 9c2eaf34 2018-05-20 stsp while (col <= avail && col < id_display_cols + 2) {
200 bb737323 2018-05-20 stsp waddch(tog_log_view.window, ' ');
203 9c2eaf34 2018-05-20 stsp if (col > avail)
206 6d9fbc00 2018-04-29 stsp author0 = strdup(commit->author);
207 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
208 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
211 6d9fbc00 2018-04-29 stsp author = author0;
212 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
213 6d9fbc00 2018-04-29 stsp if (smallerthan)
214 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
216 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
218 6d9fbc00 2018-04-29 stsp *at = '\0';
220 bb737323 2018-05-20 stsp limit = MIN(avail, author_display_cols);
221 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
224 bb737323 2018-05-20 stsp waddwstr(tog_log_view.window, wauthor);
225 bb737323 2018-05-20 stsp col += author_width;
226 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
227 bb737323 2018-05-20 stsp waddch(tog_log_view.window, ' ');
229 bb737323 2018-05-20 stsp author_width++;
231 9c2eaf34 2018-05-20 stsp if (col > avail)
234 bb737323 2018-05-20 stsp logmsg0 = strdup(commit->logmsg);
235 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
236 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
239 bb737323 2018-05-20 stsp logmsg = logmsg0;
240 bb737323 2018-05-20 stsp while (*logmsg == '\n')
242 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
243 bb737323 2018-05-20 stsp if (newline)
244 bb737323 2018-05-20 stsp *newline = '\0';
245 bb737323 2018-05-20 stsp limit = avail - col;
246 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
249 bb737323 2018-05-20 stsp waddwstr(tog_log_view.window, wlogmsg);
250 bb737323 2018-05-20 stsp col += logmsg_width;
251 bb737323 2018-05-20 stsp while (col <= avail) {
252 bb737323 2018-05-20 stsp waddch(tog_log_view.window, ' ');
256 80ddbec8 2018-04-29 stsp free(logmsg0);
257 bb737323 2018-05-20 stsp free(wlogmsg);
258 6d9fbc00 2018-04-29 stsp free(author0);
259 bb737323 2018-05-20 stsp free(wauthor);
260 80ddbec8 2018-04-29 stsp free(line);
261 6d9fbc00 2018-04-29 stsp free(id_str);
262 80ddbec8 2018-04-29 stsp return err;
265 80ddbec8 2018-04-29 stsp struct commit_queue_entry {
266 80ddbec8 2018-04-29 stsp TAILQ_ENTRY(commit_queue_entry) entry;
267 80ddbec8 2018-04-29 stsp struct got_object_id *id;
268 80ddbec8 2018-04-29 stsp struct got_commit_object *commit;
270 0553a4e3 2018-04-30 stsp TAILQ_HEAD(commit_queue, commit_queue_entry);
272 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
273 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
274 899d86c2 2018-05-10 stsp struct got_object_id *id)
276 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
278 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
279 80ddbec8 2018-04-29 stsp if (entry == NULL)
280 899d86c2 2018-05-10 stsp return NULL;
282 899d86c2 2018-05-10 stsp entry->id = id;
283 99db9666 2018-05-07 stsp entry->commit = commit;
284 899d86c2 2018-05-10 stsp return entry;
287 99db9666 2018-05-07 stsp static void
288 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
290 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
292 99db9666 2018-05-07 stsp entry = TAILQ_FIRST(commits);
293 99db9666 2018-05-07 stsp TAILQ_REMOVE(commits, entry, entry);
294 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
295 99db9666 2018-05-07 stsp free(entry->id);
296 99db9666 2018-05-07 stsp free(entry);
299 99db9666 2018-05-07 stsp static void
300 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
302 99db9666 2018-05-07 stsp while (!TAILQ_EMPTY(commits))
303 99db9666 2018-05-07 stsp pop_commit(commits);
306 c4972b91 2018-05-07 stsp static const struct got_error *
307 899d86c2 2018-05-10 stsp fetch_parent_commit(struct commit_queue_entry **pentry,
308 899d86c2 2018-05-10 stsp struct commit_queue_entry *entry, struct got_repository *repo)
310 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
311 899d86c2 2018-05-10 stsp struct got_commit_object *commit;
312 899d86c2 2018-05-10 stsp struct got_object_id *id;
313 79f35eb3 2018-06-11 stsp struct got_object_qid *qid;
315 899d86c2 2018-05-10 stsp *pentry = NULL;
317 c4972b91 2018-05-07 stsp /* Follow the first parent (TODO: handle merge commits). */
318 79f35eb3 2018-06-11 stsp qid = SIMPLEQ_FIRST(&entry->commit->parent_ids);
319 79f35eb3 2018-06-11 stsp if (qid == NULL)
320 c4972b91 2018-05-07 stsp return NULL;
322 736b910f 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, qid->id);
324 c4972b91 2018-05-07 stsp return err;
326 79f35eb3 2018-06-11 stsp id = got_object_id_dup(qid->id);
327 899d86c2 2018-05-10 stsp if (id == NULL) {
328 c4972b91 2018-05-07 stsp err = got_error_from_errno();
329 899d86c2 2018-05-10 stsp got_object_commit_close(commit);
330 899d86c2 2018-05-10 stsp return err;;
333 899d86c2 2018-05-10 stsp *pentry = alloc_commit_queue_entry(commit, id);
334 899d86c2 2018-05-10 stsp if (*pentry == NULL) {
335 c4972b91 2018-05-07 stsp err = got_error_from_errno();
336 899d86c2 2018-05-10 stsp got_object_commit_close(commit);
339 899d86c2 2018-05-10 stsp return err;;
342 899d86c2 2018-05-10 stsp static const struct got_error *
343 899d86c2 2018-05-10 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
345 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
346 899d86c2 2018-05-10 stsp struct got_reference *head_ref;
348 899d86c2 2018-05-10 stsp *head_id = NULL;
350 899d86c2 2018-05-10 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
352 899d86c2 2018-05-10 stsp return err;
354 899d86c2 2018-05-10 stsp err = got_ref_resolve(head_id, repo, head_ref);
355 899d86c2 2018-05-10 stsp got_ref_close(head_ref);
357 899d86c2 2018-05-10 stsp *head_id = NULL;
358 899d86c2 2018-05-10 stsp return err;
361 c4972b91 2018-05-07 stsp return NULL;
364 99db9666 2018-05-07 stsp static const struct got_error *
365 899d86c2 2018-05-10 stsp prepend_commits(int *ncommits, struct commit_queue *commits,
366 899d86c2 2018-05-10 stsp struct got_object_id *first_id, struct got_object_id *last_id,
367 899d86c2 2018-05-10 stsp int limit, struct got_repository *repo)
369 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
370 736b910f 2018-06-11 stsp struct got_object *last_obj = NULL;
371 899d86c2 2018-05-10 stsp struct got_commit_object *commit = NULL;
372 899d86c2 2018-05-10 stsp struct got_object_id *id = NULL;
373 899d86c2 2018-05-10 stsp struct commit_queue_entry *entry, *old_head_entry;
375 899d86c2 2018-05-10 stsp *ncommits = 0;
377 736b910f 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, first_id);
381 899d86c2 2018-05-10 stsp err = got_object_open(&last_obj, repo, last_id);
384 899d86c2 2018-05-10 stsp if (got_object_get_type(last_obj) != GOT_OBJ_TYPE_COMMIT) {
385 899d86c2 2018-05-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
389 899d86c2 2018-05-10 stsp id = got_object_id_dup(first_id);
390 899d86c2 2018-05-10 stsp if (id == NULL) {
391 899d86c2 2018-05-10 stsp err = got_error_from_errno();
395 899d86c2 2018-05-10 stsp entry = alloc_commit_queue_entry(commit, id);
396 899d86c2 2018-05-10 stsp if (entry == NULL)
397 899d86c2 2018-05-10 stsp return got_error_from_errno();
399 899d86c2 2018-05-10 stsp old_head_entry = TAILQ_FIRST(commits);
400 899d86c2 2018-05-10 stsp if (old_head_entry)
401 899d86c2 2018-05-10 stsp TAILQ_INSERT_BEFORE(old_head_entry, entry, entry);
403 899d86c2 2018-05-10 stsp TAILQ_INSERT_HEAD(commits, entry, entry);
405 899d86c2 2018-05-10 stsp *ncommits = 1;
408 899d86c2 2018-05-10 stsp * Fetch parent commits.
409 899d86c2 2018-05-10 stsp * XXX If first and last commit aren't ancestrally related this loop
410 899d86c2 2018-05-10 stsp * we will keep iterating until a root commit is encountered.
412 899d86c2 2018-05-10 stsp while (1) {
413 899d86c2 2018-05-10 stsp struct commit_queue_entry *pentry;
415 899d86c2 2018-05-10 stsp err = fetch_parent_commit(&pentry, entry, repo);
418 899d86c2 2018-05-10 stsp if (pentry == NULL)
422 899d86c2 2018-05-10 stsp * Fill up to old HEAD commit if commit queue was not empty.
423 899d86c2 2018-05-10 stsp * We must not leave a gap in history.
425 899d86c2 2018-05-10 stsp if (old_head_entry &&
426 899d86c2 2018-05-10 stsp got_object_id_cmp(pentry->id, old_head_entry->id) == 0)
429 899d86c2 2018-05-10 stsp TAILQ_INSERT_AFTER(commits, entry, pentry, entry);
430 899d86c2 2018-05-10 stsp (*ncommits)++;
431 899d86c2 2018-05-10 stsp if (*ncommits >= limit)
434 899d86c2 2018-05-10 stsp /* Fill up to last requested commit if queue was empty. */
435 899d86c2 2018-05-10 stsp if (old_head_entry == NULL &&
436 899d86c2 2018-05-10 stsp got_object_id_cmp(pentry->id, last_id) == 0)
439 899d86c2 2018-05-10 stsp entry = pentry;
443 899d86c2 2018-05-10 stsp if (last_obj)
444 899d86c2 2018-05-10 stsp got_object_close(last_obj);
445 899d86c2 2018-05-10 stsp return err;
448 899d86c2 2018-05-10 stsp static const struct got_error *
449 899d86c2 2018-05-10 stsp fetch_commits(struct commit_queue_entry **start_entry,
450 899d86c2 2018-05-10 stsp struct got_object_id *start_id, struct commit_queue *commits,
451 899d86c2 2018-05-10 stsp int limit, struct got_repository *repo)
453 99db9666 2018-05-07 stsp const struct got_error *err;
454 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
455 99db9666 2018-05-07 stsp int ncommits = 0;
456 899d86c2 2018-05-10 stsp struct got_object_id *head_id = NULL;
458 899d86c2 2018-05-10 stsp *start_entry = NULL;
460 899d86c2 2018-05-10 stsp err = get_head_commit_id(&head_id, repo);
462 99db9666 2018-05-07 stsp return err;
464 899d86c2 2018-05-10 stsp /* Prepend HEAD commit and all ancestors up to start commit. */
465 899d86c2 2018-05-10 stsp err = prepend_commits(&ncommits, commits, head_id, start_id, limit,
468 99db9666 2018-05-07 stsp return err;
470 899d86c2 2018-05-10 stsp if (got_object_id_cmp(head_id, start_id) == 0)
471 899d86c2 2018-05-10 stsp *start_entry = TAILQ_FIRST(commits);
473 899d86c2 2018-05-10 stsp *start_entry = TAILQ_LAST(commits, commit_queue);
475 899d86c2 2018-05-10 stsp if (ncommits >= limit)
476 899d86c2 2018-05-10 stsp return NULL;
478 899d86c2 2018-05-10 stsp /* Append more commits from start commit up to the requested limit. */
479 899d86c2 2018-05-10 stsp entry = TAILQ_LAST(commits, commit_queue);
480 899d86c2 2018-05-10 stsp while (entry && ncommits < limit) {
481 899d86c2 2018-05-10 stsp struct commit_queue_entry *pentry;
483 899d86c2 2018-05-10 stsp err = fetch_parent_commit(&pentry, entry, repo);
486 899d86c2 2018-05-10 stsp if (pentry)
487 899d86c2 2018-05-10 stsp TAILQ_INSERT_TAIL(commits, pentry, entry);
488 899d86c2 2018-05-10 stsp entry = pentry;
489 0553a4e3 2018-04-30 stsp ncommits++;
493 899d86c2 2018-05-10 stsp *start_entry = NULL;
494 0553a4e3 2018-04-30 stsp return err;
497 0553a4e3 2018-04-30 stsp static const struct got_error *
498 cd0acaa7 2018-05-20 stsp draw_commits(struct commit_queue_entry **last, struct commit_queue_entry **selected,
499 cd0acaa7 2018-05-20 stsp struct commit_queue_entry *first, int selected_idx, int limit)
501 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
502 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
503 0553a4e3 2018-04-30 stsp int ncommits = 0;
505 9c2de6ef 2018-05-20 stsp werase(tog_log_view.window);
507 899d86c2 2018-05-10 stsp entry = first;
508 899d86c2 2018-05-10 stsp *last = first;
509 899d86c2 2018-05-10 stsp while (entry) {
510 899d86c2 2018-05-10 stsp if (ncommits == limit)
512 cd0acaa7 2018-05-20 stsp if (ncommits == selected_idx) {
513 0553a4e3 2018-04-30 stsp wstandout(tog_log_view.window);
514 cd0acaa7 2018-05-20 stsp *selected = entry;
516 0553a4e3 2018-04-30 stsp err = draw_commit(entry->commit, entry->id);
517 cd0acaa7 2018-05-20 stsp if (ncommits == selected_idx)
518 0553a4e3 2018-04-30 stsp wstandend(tog_log_view.window);
521 0553a4e3 2018-04-30 stsp ncommits++;
522 899d86c2 2018-05-10 stsp *last = entry;
523 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
526 80ddbec8 2018-04-29 stsp update_panels();
527 80ddbec8 2018-04-29 stsp doupdate();
529 80ddbec8 2018-04-29 stsp return err;
532 07b55e75 2018-05-10 stsp static void
533 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
534 07b55e75 2018-05-10 stsp struct commit_queue *commits)
536 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
537 07b55e75 2018-05-10 stsp int nscrolled = 0;
539 07b55e75 2018-05-10 stsp entry = TAILQ_FIRST(commits);
540 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
543 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
544 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
545 07b55e75 2018-05-10 stsp entry = TAILQ_PREV(entry, commit_queue, entry);
546 07b55e75 2018-05-10 stsp if (entry) {
547 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
548 07b55e75 2018-05-10 stsp nscrolled++;
553 aa075928 2018-05-10 stsp static const struct got_error *
554 16482c3b 2018-05-20 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
555 aa075928 2018-05-10 stsp struct commit_queue_entry *last_displayed_entry,
556 aa075928 2018-05-10 stsp struct commit_queue *commits, struct got_repository *repo)
558 aa075928 2018-05-10 stsp const struct got_error *err = NULL;
559 dd0a52c1 2018-05-20 stsp struct commit_queue_entry *pentry;
560 aa075928 2018-05-10 stsp int nscrolled = 0;
563 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(last_displayed_entry, entry);
564 aa075928 2018-05-10 stsp if (pentry == NULL) {
565 dd0a52c1 2018-05-20 stsp err = fetch_parent_commit(&pentry,
566 dd0a52c1 2018-05-20 stsp last_displayed_entry, repo);
567 9a6bf2a5 2018-05-20 stsp if (err || pentry == NULL)
569 aa075928 2018-05-10 stsp TAILQ_INSERT_TAIL(commits, pentry, entry);
571 dd0a52c1 2018-05-20 stsp last_displayed_entry = pentry;
573 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
574 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
576 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
577 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
579 dd0a52c1 2018-05-20 stsp return err;
583 4a7f7875 2018-05-10 stsp num_parents(struct commit_queue_entry *entry)
585 4a7f7875 2018-05-10 stsp int nparents = 0;
587 4a7f7875 2018-05-10 stsp while (entry) {
588 4a7f7875 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
589 4a7f7875 2018-05-10 stsp nparents++;
592 4a7f7875 2018-05-10 stsp return nparents;
595 cd0acaa7 2018-05-20 stsp static const struct got_error *
596 cd0acaa7 2018-05-20 stsp show_commit(struct commit_queue_entry *entry, struct got_repository *repo)
598 cd0acaa7 2018-05-20 stsp const struct got_error *err;
599 350efba7 2018-05-20 stsp struct commit_queue_entry *pentry;
600 cd0acaa7 2018-05-20 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
602 cd0acaa7 2018-05-20 stsp err = got_object_open(&obj2, repo, entry->id);
604 cd0acaa7 2018-05-20 stsp return err;
606 350efba7 2018-05-20 stsp pentry = TAILQ_NEXT(entry, entry);
607 350efba7 2018-05-20 stsp if (pentry == NULL) {
608 350efba7 2018-05-20 stsp err = fetch_parent_commit(&pentry, entry, repo);
610 350efba7 2018-05-20 stsp return err;
612 350efba7 2018-05-20 stsp if (pentry) {
613 350efba7 2018-05-20 stsp err = got_object_open(&obj1, repo, pentry->id);
618 cd0acaa7 2018-05-20 stsp err = show_diff_view(obj1, obj2, repo);
621 cd0acaa7 2018-05-20 stsp got_object_close(obj1);
623 cd0acaa7 2018-05-20 stsp got_object_close(obj2);
624 cd0acaa7 2018-05-20 stsp return err;
627 80ddbec8 2018-04-29 stsp static const struct got_error *
628 80ddbec8 2018-04-29 stsp show_log_view(struct got_object_id *start_id, struct got_repository *repo)
630 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
631 c4972b91 2018-05-07 stsp struct got_object_id *id;
632 4a7f7875 2018-05-10 stsp int ch, done = 0, selected = 0, nparents;
633 0553a4e3 2018-04-30 stsp struct commit_queue commits;
634 899d86c2 2018-05-10 stsp struct commit_queue_entry *first_displayed_entry = NULL;
635 899d86c2 2018-05-10 stsp struct commit_queue_entry *last_displayed_entry = NULL;
636 cd0acaa7 2018-05-20 stsp struct commit_queue_entry *selected_entry = NULL;
638 c4972b91 2018-05-07 stsp id = got_object_id_dup(start_id);
639 c4972b91 2018-05-07 stsp if (id == NULL)
640 c4972b91 2018-05-07 stsp return got_error_from_errno();
642 80ddbec8 2018-04-29 stsp if (tog_log_view.window == NULL) {
643 80ddbec8 2018-04-29 stsp tog_log_view.window = newwin(0, 0, 0, 0);
644 80ddbec8 2018-04-29 stsp if (tog_log_view.window == NULL)
645 80ddbec8 2018-04-29 stsp return got_error_from_errno();
646 00a838fa 2018-04-29 stsp keypad(tog_log_view.window, TRUE);
648 80ddbec8 2018-04-29 stsp if (tog_log_view.panel == NULL) {
649 80ddbec8 2018-04-29 stsp tog_log_view.panel = new_panel(tog_log_view.window);
650 80ddbec8 2018-04-29 stsp if (tog_log_view.panel == NULL)
651 80ddbec8 2018-04-29 stsp return got_error_from_errno();
653 cd0acaa7 2018-05-20 stsp show_panel(tog_log_view.panel);
655 899d86c2 2018-05-10 stsp TAILQ_INIT(&commits);
656 899d86c2 2018-05-10 stsp err = fetch_commits(&first_displayed_entry, id, &commits, LINES, repo);
659 899d86c2 2018-05-10 stsp while (!done) {
660 cd0acaa7 2018-05-20 stsp err = draw_commits(&last_displayed_entry, &selected_entry,
661 cd0acaa7 2018-05-20 stsp first_displayed_entry, selected, LINES);
665 80ddbec8 2018-04-29 stsp nodelay(stdscr, FALSE);
666 80ddbec8 2018-04-29 stsp ch = wgetch(tog_log_view.window);
667 f7182337 2018-05-20 stsp nodelay(stdscr, TRUE);
668 80ddbec8 2018-04-29 stsp switch (ch) {
670 31120ada 2018-04-30 stsp if (errno) {
671 31120ada 2018-04-30 stsp err = got_error_from_errno();
679 80ddbec8 2018-04-29 stsp case KEY_UP:
680 80ddbec8 2018-04-29 stsp if (selected > 0)
681 80ddbec8 2018-04-29 stsp selected--;
682 8ec9698d 2018-05-10 stsp if (selected > 0)
684 07b55e75 2018-05-10 stsp scroll_up(&first_displayed_entry, 1, &commits);
686 48531068 2018-05-10 stsp case KEY_PPAGE:
687 dfc1d240 2018-05-10 stsp if (TAILQ_FIRST(&commits) ==
688 dfc1d240 2018-05-10 stsp first_displayed_entry) {
689 dfc1d240 2018-05-10 stsp selected = 0;
692 48531068 2018-05-10 stsp scroll_up(&first_displayed_entry, LINES,
696 80ddbec8 2018-04-29 stsp case KEY_DOWN:
697 80ee4603 2018-05-10 stsp nparents = num_parents(first_displayed_entry);
698 06abe2cd 2018-05-10 stsp if (selected < LINES - 1 &&
699 15c91275 2018-05-20 stsp selected < nparents - 1) {
700 15c91275 2018-05-20 stsp selected++;
703 15c91275 2018-05-20 stsp err = scroll_down(&first_displayed_entry, 1,
704 15c91275 2018-05-20 stsp last_displayed_entry, &commits, repo);
708 4a7f7875 2018-05-10 stsp case KEY_NPAGE:
709 e50ee4f1 2018-05-10 stsp err = scroll_down(&first_displayed_entry, LINES,
710 e50ee4f1 2018-05-10 stsp last_displayed_entry, &commits, repo);
713 dd0a52c1 2018-05-20 stsp if (last_displayed_entry->commit->nparents > 0)
715 dd0a52c1 2018-05-20 stsp /* can't scroll any further; move cursor down */
716 4a7f7875 2018-05-10 stsp nparents = num_parents(first_displayed_entry);
717 dd0a52c1 2018-05-20 stsp if (selected < LINES - 1 ||
718 dd0a52c1 2018-05-20 stsp selected < nparents - 1)
719 dd0a52c1 2018-05-20 stsp selected = MIN(LINES - 1, nparents - 1);
721 d6df9be4 2018-04-30 stsp case KEY_RESIZE:
722 31120ada 2018-04-30 stsp if (selected > LINES)
723 31120ada 2018-04-30 stsp selected = LINES - 1;
725 cd0acaa7 2018-05-20 stsp case KEY_ENTER:
727 cd0acaa7 2018-05-20 stsp err = show_commit(selected_entry, repo);
730 cd0acaa7 2018-05-20 stsp show_panel(tog_log_view.panel);
737 0553a4e3 2018-04-30 stsp free_commits(&commits);
738 80ddbec8 2018-04-29 stsp return err;
741 4ed7e80c 2018-05-20 stsp static const struct got_error *
742 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
744 80ddbec8 2018-04-29 stsp const struct got_error *error;
745 80ddbec8 2018-04-29 stsp struct got_repository *repo;
746 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
747 80ddbec8 2018-04-29 stsp char *repo_path = NULL;
748 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
751 80ddbec8 2018-04-29 stsp #ifndef PROFILE
752 80ddbec8 2018-04-29 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
753 80ddbec8 2018-04-29 stsp err(1, "pledge");
756 80ddbec8 2018-04-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
757 80ddbec8 2018-04-29 stsp switch (ch) {
759 80ddbec8 2018-04-29 stsp start_commit = optarg;
763 80ddbec8 2018-04-29 stsp /* NOTREACHED */
767 80ddbec8 2018-04-29 stsp argc -= optind;
768 80ddbec8 2018-04-29 stsp argv += optind;
770 80ddbec8 2018-04-29 stsp if (argc == 0) {
771 80ddbec8 2018-04-29 stsp repo_path = getcwd(NULL, 0);
772 80ddbec8 2018-04-29 stsp if (repo_path == NULL)
773 80ddbec8 2018-04-29 stsp return got_error_from_errno();
774 80ddbec8 2018-04-29 stsp } else if (argc == 1) {
775 80ddbec8 2018-04-29 stsp repo_path = realpath(argv[0], NULL);
776 80ddbec8 2018-04-29 stsp if (repo_path == NULL)
777 80ddbec8 2018-04-29 stsp return got_error_from_errno();
779 80ddbec8 2018-04-29 stsp usage_log();
781 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
782 80ddbec8 2018-04-29 stsp free(repo_path);
783 80ddbec8 2018-04-29 stsp if (error != NULL)
784 80ddbec8 2018-04-29 stsp return error;
786 80ddbec8 2018-04-29 stsp if (start_commit == NULL) {
787 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
788 80ddbec8 2018-04-29 stsp if (error != NULL)
789 80ddbec8 2018-04-29 stsp return error;
791 80ddbec8 2018-04-29 stsp struct got_object *obj;
792 80ddbec8 2018-04-29 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
793 80ddbec8 2018-04-29 stsp if (error == NULL) {
794 899d86c2 2018-05-10 stsp start_id = got_object_get_id(obj);
795 899d86c2 2018-05-10 stsp if (start_id == NULL)
796 80ddbec8 2018-04-29 stsp error = got_error_from_errno();
799 80ddbec8 2018-04-29 stsp if (error != NULL)
800 80ddbec8 2018-04-29 stsp return error;
801 899d86c2 2018-05-10 stsp error = show_log_view(start_id, repo);
802 899d86c2 2018-05-10 stsp free(start_id);
803 80ddbec8 2018-04-29 stsp got_repo_close(repo);
804 80ddbec8 2018-04-29 stsp return error;
807 4ed7e80c 2018-05-20 stsp __dead static void
808 9f7d7167 2018-04-29 stsp usage_diff(void)
811 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
812 9f7d7167 2018-04-29 stsp getprogname());
816 b304db33 2018-05-20 stsp static char *
817 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
819 b304db33 2018-05-20 stsp char *line;
820 b304db33 2018-05-20 stsp size_t linelen;
821 b304db33 2018-05-20 stsp size_t lineno;
822 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
824 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
826 b304db33 2018-05-20 stsp *len = linelen;
827 b304db33 2018-05-20 stsp return line;
830 4ed7e80c 2018-05-20 stsp static const struct got_error *
831 26ed57b2 2018-05-19 stsp draw_diff(FILE *f, int *first_displayed_line, int *last_displayed_line,
832 26ed57b2 2018-05-19 stsp int *eof, int max_lines)
834 61e69b96 2018-05-20 stsp const struct got_error *err;
835 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
836 b304db33 2018-05-20 stsp char *line;
837 b304db33 2018-05-20 stsp size_t len;
838 61e69b96 2018-05-20 stsp wchar_t *wline;
842 9c2de6ef 2018-05-20 stsp werase(tog_diff_view.window);
845 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
846 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
847 26ed57b2 2018-05-19 stsp if (line == NULL) {
851 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
852 26ed57b2 2018-05-19 stsp free(line);
856 e0b650dd 2018-05-20 stsp err = format_line(&wline, &width, line, COLS);
858 61e69b96 2018-05-20 stsp free(line);
859 61e69b96 2018-05-20 stsp return err;
861 61e69b96 2018-05-20 stsp waddwstr(tog_diff_view.window, wline);
862 e0b650dd 2018-05-20 stsp if (width < COLS)
863 e0b650dd 2018-05-20 stsp waddch(tog_diff_view.window, '\n');
864 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
865 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
866 26ed57b2 2018-05-19 stsp free(line);
868 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
870 26ed57b2 2018-05-19 stsp update_panels();
871 26ed57b2 2018-05-19 stsp doupdate();
873 26ed57b2 2018-05-19 stsp return NULL;
876 4ed7e80c 2018-05-20 stsp static const struct got_error *
877 26ed57b2 2018-05-19 stsp show_diff_view(struct got_object *obj1, struct got_object *obj2,
878 26ed57b2 2018-05-19 stsp struct got_repository *repo)
880 26ed57b2 2018-05-19 stsp const struct got_error *err;
882 26ed57b2 2018-05-19 stsp int ch, done = 0, first_displayed_line = 1, last_displayed_line = LINES;
883 b304db33 2018-05-20 stsp int eof, i;
885 cd0acaa7 2018-05-20 stsp if (obj1 != NULL && obj2 != NULL &&
886 cd0acaa7 2018-05-20 stsp got_object_get_type(obj1) != got_object_get_type(obj2))
887 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
889 511a516b 2018-05-19 stsp f = got_opentemp();
890 26ed57b2 2018-05-19 stsp if (f == NULL)
891 26ed57b2 2018-05-19 stsp return got_error_from_errno();
893 cd0acaa7 2018-05-20 stsp switch (got_object_get_type(obj1 ? obj1 : obj2)) {
894 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
895 11528a82 2018-05-19 stsp err = got_diff_objects_as_blobs(obj1, obj2, repo, f);
897 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
898 11528a82 2018-05-19 stsp err = got_diff_objects_as_trees(obj1, obj2, repo, f);
900 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_COMMIT:
901 11528a82 2018-05-19 stsp err = got_diff_objects_as_commits(obj1, obj2, repo, f);
904 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
909 26ed57b2 2018-05-19 stsp if (tog_diff_view.window == NULL) {
910 26ed57b2 2018-05-19 stsp tog_diff_view.window = newwin(0, 0, 0, 0);
911 26ed57b2 2018-05-19 stsp if (tog_diff_view.window == NULL)
912 26ed57b2 2018-05-19 stsp return got_error_from_errno();
913 26ed57b2 2018-05-19 stsp keypad(tog_diff_view.window, TRUE);
915 26ed57b2 2018-05-19 stsp if (tog_diff_view.panel == NULL) {
916 26ed57b2 2018-05-19 stsp tog_diff_view.panel = new_panel(tog_diff_view.window);
917 26ed57b2 2018-05-19 stsp if (tog_diff_view.panel == NULL)
918 26ed57b2 2018-05-19 stsp return got_error_from_errno();
920 26ed57b2 2018-05-19 stsp show_panel(tog_diff_view.panel);
922 26ed57b2 2018-05-19 stsp while (!done) {
923 26ed57b2 2018-05-19 stsp err = draw_diff(f, &first_displayed_line, &last_displayed_line,
924 26ed57b2 2018-05-19 stsp &eof, LINES);
927 26ed57b2 2018-05-19 stsp nodelay(stdscr, FALSE);
928 26ed57b2 2018-05-19 stsp ch = wgetch(tog_diff_view.window);
929 f7182337 2018-05-20 stsp nodelay(stdscr, TRUE);
930 26ed57b2 2018-05-19 stsp switch (ch) {
935 26ed57b2 2018-05-19 stsp case KEY_UP:
936 925e6f23 2018-05-20 stsp case KEY_BACKSPACE:
937 26ed57b2 2018-05-19 stsp if (first_displayed_line > 1)
938 b304db33 2018-05-20 stsp first_displayed_line--;
940 b304db33 2018-05-20 stsp case KEY_PPAGE:
942 d56caa55 2018-05-20 stsp while (i++ < LINES - 1 &&
943 d56caa55 2018-05-20 stsp first_displayed_line > 1)
944 26ed57b2 2018-05-19 stsp first_displayed_line--;
947 26ed57b2 2018-05-19 stsp case KEY_DOWN:
948 925e6f23 2018-05-20 stsp case KEY_ENTER:
951 26ed57b2 2018-05-19 stsp first_displayed_line++;
953 b304db33 2018-05-20 stsp case KEY_NPAGE:
956 b304db33 2018-05-20 stsp while (!eof && i++ < LINES - 1) {
957 b304db33 2018-05-20 stsp char *line = parse_next_line(f, NULL);
958 b304db33 2018-05-20 stsp first_displayed_line++;
959 b304db33 2018-05-20 stsp if (line == NULL)
968 26ed57b2 2018-05-19 stsp return err;
971 4ed7e80c 2018-05-20 stsp static const struct got_error *
972 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
974 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
975 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
976 26ed57b2 2018-05-19 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
977 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
978 26ed57b2 2018-05-19 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
981 26ed57b2 2018-05-19 stsp #ifndef PROFILE
982 26ed57b2 2018-05-19 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
983 26ed57b2 2018-05-19 stsp err(1, "pledge");
986 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
987 26ed57b2 2018-05-19 stsp switch (ch) {
990 26ed57b2 2018-05-19 stsp /* NOTREACHED */
994 26ed57b2 2018-05-19 stsp argc -= optind;
995 26ed57b2 2018-05-19 stsp argv += optind;
997 26ed57b2 2018-05-19 stsp if (argc == 0) {
998 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
999 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
1000 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
1001 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1002 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1003 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[0];
1004 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[1];
1005 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
1006 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
1007 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1008 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1009 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[1];
1010 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[2];
1012 26ed57b2 2018-05-19 stsp usage_diff();
1014 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
1015 26ed57b2 2018-05-19 stsp free(repo_path);
1016 26ed57b2 2018-05-19 stsp if (error)
1017 26ed57b2 2018-05-19 stsp goto done;
1019 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
1020 26ed57b2 2018-05-19 stsp if (error)
1021 26ed57b2 2018-05-19 stsp goto done;
1023 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
1024 26ed57b2 2018-05-19 stsp if (error)
1025 26ed57b2 2018-05-19 stsp goto done;
1027 26ed57b2 2018-05-19 stsp error = show_diff_view(obj1, obj2, repo);
1029 26ed57b2 2018-05-19 stsp got_repo_close(repo);
1031 26ed57b2 2018-05-19 stsp got_object_close(obj1);
1033 26ed57b2 2018-05-19 stsp got_object_close(obj2);
1034 26ed57b2 2018-05-19 stsp return error;
1037 4ed7e80c 2018-05-20 stsp __dead static void
1038 9f7d7167 2018-04-29 stsp usage_blame(void)
1041 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s blame [repository-path] blob-object\n",
1042 9f7d7167 2018-04-29 stsp getprogname());
1046 4ed7e80c 2018-05-20 stsp static const struct got_error *
1047 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
1049 9f7d7167 2018-04-29 stsp return got_error(GOT_ERR_NOT_IMPL);
1052 5c5136c5 2018-05-20 stsp static void
1053 9f7d7167 2018-04-29 stsp init_curses(void)
1055 9f7d7167 2018-04-29 stsp initscr();
1059 9f7d7167 2018-04-29 stsp intrflush(stdscr, FALSE);
1060 9f7d7167 2018-04-29 stsp keypad(stdscr, TRUE);
1061 1f475ad8 2018-05-10 stsp curs_set(0);
1064 4ed7e80c 2018-05-20 stsp __dead static void
1065 9f7d7167 2018-04-29 stsp usage(void)
1069 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
1070 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
1071 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
1072 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
1073 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
1078 c2301be8 2018-04-30 stsp static char **
1079 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
1081 c2301be8 2018-04-30 stsp char **argv;
1082 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
1084 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
1085 c2301be8 2018-04-30 stsp if (argv == NULL)
1086 c2301be8 2018-04-30 stsp err(1, "calloc");
1087 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
1088 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
1089 c2301be8 2018-04-30 stsp err(1, "calloc");
1090 c2301be8 2018-04-30 stsp if (arg1) {
1091 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
1092 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
1093 c2301be8 2018-04-30 stsp err(1, "calloc");
1096 c2301be8 2018-04-30 stsp return argv;
1100 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
1102 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
1103 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
1104 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
1105 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
1107 9f7d7167 2018-04-29 stsp setlocale(LC_ALL, "");
1109 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
1110 9f7d7167 2018-04-29 stsp switch (ch) {
1112 9f7d7167 2018-04-29 stsp hflag = 1;
1116 9f7d7167 2018-04-29 stsp /* NOTREACHED */
1120 9f7d7167 2018-04-29 stsp argc -= optind;
1121 9f7d7167 2018-04-29 stsp argv += optind;
1122 9f7d7167 2018-04-29 stsp optind = 0;
1123 c2301be8 2018-04-30 stsp optreset = 1;
1125 c2301be8 2018-04-30 stsp if (argc == 0) {
1126 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
1127 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
1128 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
1133 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
1134 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
1135 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
1136 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
1137 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
1138 9f7d7167 2018-04-29 stsp if (hflag)
1139 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
1143 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
1144 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
1145 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
1146 c2301be8 2018-04-30 stsp if (repo_path) {
1147 c2301be8 2018-04-30 stsp struct got_repository *repo;
1148 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
1149 c2301be8 2018-04-30 stsp if (error == NULL)
1150 c2301be8 2018-04-30 stsp got_repo_close(repo);
1152 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
1153 c2301be8 2018-04-30 stsp if (error) {
1154 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
1155 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
1156 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
1157 ad7de8d9 2018-04-30 stsp free(repo_path);
1160 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
1161 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
1163 c2301be8 2018-04-30 stsp free(repo_path);
1167 5c5136c5 2018-05-20 stsp init_curses();
1169 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
1170 9f7d7167 2018-04-29 stsp if (error)
1171 9f7d7167 2018-04-29 stsp goto done;
1174 c2301be8 2018-04-30 stsp free(cmd_argv);
1175 9f7d7167 2018-04-29 stsp if (error)
1176 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);