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>
18 ffd1d5e5 2018-06-23 stsp #include <sys/stat.h>
20 31120ada 2018-04-30 stsp #include <errno.h>
21 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
22 9f7d7167 2018-04-29 stsp #include <curses.h>
23 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
24 9f7d7167 2018-04-29 stsp #include <panel.h>
25 9f7d7167 2018-04-29 stsp #include <locale.h>
26 9f7d7167 2018-04-29 stsp #include <stdlib.h>
27 26ed57b2 2018-05-19 stsp #include <stdio.h>
28 9f7d7167 2018-04-29 stsp #include <getopt.h>
29 9f7d7167 2018-04-29 stsp #include <string.h>
30 9f7d7167 2018-04-29 stsp #include <err.h>
31 80ddbec8 2018-04-29 stsp #include <unistd.h>
32 26ed57b2 2018-05-19 stsp #include <util.h>
33 26ed57b2 2018-05-19 stsp #include <limits.h>
34 61e69b96 2018-05-20 stsp #include <wchar.h>
35 788c352e 2018-06-16 stsp #include <time.h>
36 84451b3e 2018-07-10 stsp #include <pthread.h>
38 9f7d7167 2018-04-29 stsp #include "got_error.h"
39 80ddbec8 2018-04-29 stsp #include "got_object.h"
40 80ddbec8 2018-04-29 stsp #include "got_reference.h"
41 80ddbec8 2018-04-29 stsp #include "got_repository.h"
42 80ddbec8 2018-04-29 stsp #include "got_diff.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 9ba79e04 2018-06-11 stsp #include "got_commit_graph.h"
45 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
46 a70480e0 2018-06-23 stsp #include "got_blame.h"
49 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
52 9f7d7167 2018-04-29 stsp #ifndef nitems
53 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
56 9f7d7167 2018-04-29 stsp struct tog_cmd {
57 c2301be8 2018-04-30 stsp const char *name;
58 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
59 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
60 c2301be8 2018-04-30 stsp const char *descr;
63 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
64 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
65 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
66 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
67 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
69 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
70 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
71 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
72 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
74 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
75 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
76 9f7d7167 2018-04-29 stsp "show repository history" },
77 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
78 9f7d7167 2018-04-29 stsp "compare files and directories" },
79 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
80 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
81 ffd1d5e5 2018-06-23 stsp { "tree", cmd_tree, usage_tree,
82 ffd1d5e5 2018-06-23 stsp "browse trees in repository" },
85 fed328cc 2018-05-20 stsp static struct tog_view {
86 26ed57b2 2018-05-19 stsp WINDOW *window;
87 26ed57b2 2018-05-19 stsp PANEL *panel;
88 ffd1d5e5 2018-06-23 stsp } tog_log_view, tog_diff_view, tog_blame_view, tog_tree_view;
90 cd0acaa7 2018-05-20 stsp static const struct got_error *
91 cd0acaa7 2018-05-20 stsp show_diff_view(struct got_object *, struct got_object *,
92 cd0acaa7 2018-05-20 stsp struct got_repository *);
93 cd0acaa7 2018-05-20 stsp static const struct got_error *
94 cd0acaa7 2018-05-20 stsp show_log_view(struct got_object_id *, struct got_repository *);
95 a70480e0 2018-06-23 stsp static const struct got_error *
96 a70480e0 2018-06-23 stsp show_blame_view(const char *, struct got_object_id *, struct got_repository *);
97 ffd1d5e5 2018-06-23 stsp static const struct got_error *
98 ffd1d5e5 2018-06-23 stsp show_tree_view(struct got_tree_object *, struct got_object_id *,
99 ffd1d5e5 2018-06-23 stsp struct got_repository *);
101 4ed7e80c 2018-05-20 stsp __dead static void
102 9f7d7167 2018-04-29 stsp usage_log(void)
105 80ddbec8 2018-04-29 stsp fprintf(stderr, "usage: %s log [-c commit] [repository-path]\n",
106 9f7d7167 2018-04-29 stsp getprogname());
110 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
111 80ddbec8 2018-04-29 stsp static const struct got_error *
112 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
114 00dfcb92 2018-06-11 stsp char *vis = NULL;
115 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
117 963b370f 2018-05-20 stsp *ws = NULL;
118 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
119 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
120 00dfcb92 2018-06-11 stsp int vislen;
121 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
122 00dfcb92 2018-06-11 stsp return got_error_from_errno();
124 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
125 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
127 00dfcb92 2018-06-11 stsp return err;
128 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
129 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
130 a7f50699 2018-06-11 stsp err = got_error_from_errno(); /* give up */
135 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
136 a7f50699 2018-06-11 stsp if (*ws == NULL) {
137 a7f50699 2018-06-11 stsp err = got_error_from_errno();
141 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
142 963b370f 2018-05-20 stsp err = got_error_from_errno();
147 963b370f 2018-05-20 stsp *ws = NULL;
150 963b370f 2018-05-20 stsp return err;
153 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
154 963b370f 2018-05-20 stsp static const struct got_error *
155 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
157 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
158 963b370f 2018-05-20 stsp int cols = 0;
159 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
160 963b370f 2018-05-20 stsp size_t wlen;
163 963b370f 2018-05-20 stsp *wlinep = NULL;
164 b700b5d6 2018-07-10 stsp *widthp = 0;
166 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
168 963b370f 2018-05-20 stsp return err;
171 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
172 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
173 963b370f 2018-05-20 stsp switch (width) {
179 b700b5d6 2018-07-10 stsp if (cols + width <= wlimit) {
180 b700b5d6 2018-07-10 stsp cols += width;
185 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
186 b700b5d6 2018-07-10 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
190 963b370f 2018-05-20 stsp err = got_error_from_errno();
194 963b370f 2018-05-20 stsp wline[i] = L'\0';
195 b700b5d6 2018-07-10 stsp if (widthp)
196 b700b5d6 2018-07-10 stsp *widthp = cols;
199 963b370f 2018-05-20 stsp free(wline);
201 963b370f 2018-05-20 stsp *wlinep = wline;
202 963b370f 2018-05-20 stsp return err;
205 963b370f 2018-05-20 stsp static const struct got_error *
206 0553a4e3 2018-04-30 stsp draw_commit(struct got_commit_object *commit, struct got_object_id *id)
208 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
209 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
210 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
211 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
212 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
213 bb737323 2018-05-20 stsp int author_width, logmsg_width;
214 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
215 80ddbec8 2018-04-29 stsp char *line = NULL;
216 bb737323 2018-05-20 stsp int col, limit;
217 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
218 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
219 9c2eaf34 2018-05-20 stsp const int avail = COLS;
221 b39d25c7 2018-07-10 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &commit->tm_committer)
222 b39d25c7 2018-07-10 stsp >= sizeof(datebuf))
223 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
225 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
226 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
228 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
229 b39d25c7 2018-07-10 stsp waddnstr(tog_log_view.window, datebuf, limit);
230 b39d25c7 2018-07-10 stsp col = limit + 1;
231 b39d25c7 2018-07-10 stsp if (col > avail)
234 6d9fbc00 2018-04-29 stsp author0 = strdup(commit->author);
235 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
236 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
239 6d9fbc00 2018-04-29 stsp author = author0;
240 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
241 6d9fbc00 2018-04-29 stsp if (smallerthan)
242 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
244 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
246 6d9fbc00 2018-04-29 stsp *at = '\0';
248 b39d25c7 2018-07-10 stsp limit = avail - col;
249 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
252 bb737323 2018-05-20 stsp waddwstr(tog_log_view.window, wauthor);
253 bb737323 2018-05-20 stsp col += author_width;
254 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
255 bb737323 2018-05-20 stsp waddch(tog_log_view.window, ' ');
257 bb737323 2018-05-20 stsp author_width++;
259 9c2eaf34 2018-05-20 stsp if (col > avail)
262 bb737323 2018-05-20 stsp logmsg0 = strdup(commit->logmsg);
263 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
264 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
267 bb737323 2018-05-20 stsp logmsg = logmsg0;
268 bb737323 2018-05-20 stsp while (*logmsg == '\n')
270 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
271 bb737323 2018-05-20 stsp if (newline)
272 bb737323 2018-05-20 stsp *newline = '\0';
273 bb737323 2018-05-20 stsp limit = avail - col;
274 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
277 bb737323 2018-05-20 stsp waddwstr(tog_log_view.window, wlogmsg);
278 bb737323 2018-05-20 stsp col += logmsg_width;
279 bb737323 2018-05-20 stsp while (col <= avail) {
280 bb737323 2018-05-20 stsp waddch(tog_log_view.window, ' ');
284 80ddbec8 2018-04-29 stsp free(logmsg0);
285 bb737323 2018-05-20 stsp free(wlogmsg);
286 6d9fbc00 2018-04-29 stsp free(author0);
287 bb737323 2018-05-20 stsp free(wauthor);
288 80ddbec8 2018-04-29 stsp free(line);
289 80ddbec8 2018-04-29 stsp return err;
292 80ddbec8 2018-04-29 stsp struct commit_queue_entry {
293 80ddbec8 2018-04-29 stsp TAILQ_ENTRY(commit_queue_entry) entry;
294 80ddbec8 2018-04-29 stsp struct got_object_id *id;
295 80ddbec8 2018-04-29 stsp struct got_commit_object *commit;
297 0553a4e3 2018-04-30 stsp TAILQ_HEAD(commit_queue, commit_queue_entry);
299 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
300 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
301 899d86c2 2018-05-10 stsp struct got_object_id *id)
303 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
305 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
306 80ddbec8 2018-04-29 stsp if (entry == NULL)
307 899d86c2 2018-05-10 stsp return NULL;
309 899d86c2 2018-05-10 stsp entry->id = id;
310 99db9666 2018-05-07 stsp entry->commit = commit;
311 899d86c2 2018-05-10 stsp return entry;
314 99db9666 2018-05-07 stsp static void
315 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
317 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
319 99db9666 2018-05-07 stsp entry = TAILQ_FIRST(commits);
320 99db9666 2018-05-07 stsp TAILQ_REMOVE(commits, entry, entry);
321 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
322 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
323 99db9666 2018-05-07 stsp free(entry);
326 99db9666 2018-05-07 stsp static void
327 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
329 99db9666 2018-05-07 stsp while (!TAILQ_EMPTY(commits))
330 99db9666 2018-05-07 stsp pop_commit(commits);
333 c4972b91 2018-05-07 stsp static const struct got_error *
334 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
335 9ba79e04 2018-06-11 stsp struct got_object_id *start_id, struct got_repository *repo)
337 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
338 899d86c2 2018-05-10 stsp struct got_object_id *id;
339 9ba79e04 2018-06-11 stsp struct commit_queue_entry *entry;
341 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_start(graph, start_id);
343 c4972b91 2018-05-07 stsp return err;
345 9ba79e04 2018-06-11 stsp entry = TAILQ_LAST(commits, commit_queue);
346 9ba79e04 2018-06-11 stsp if (entry && got_object_id_cmp(entry->id, start_id) == 0) {
347 9ba79e04 2018-06-11 stsp int nfetched;
349 9ba79e04 2018-06-11 stsp /* Start ID's commit is already on the queue; skip over it. */
350 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
351 9ba79e04 2018-06-11 stsp if (err && err->code != GOT_ERR_ITER_NEED_MORE)
352 9ba79e04 2018-06-11 stsp return err;
354 9ba79e04 2018-06-11 stsp err = got_commit_graph_fetch_commits(&nfetched, graph, 1, repo);
356 9ba79e04 2018-06-11 stsp return err;
359 9ba79e04 2018-06-11 stsp while (1) {
360 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
362 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
364 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_NEED_MORE)
365 9ba79e04 2018-06-11 stsp err = NULL;
369 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
373 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
374 9ba79e04 2018-06-11 stsp if (entry == NULL) {
375 9ba79e04 2018-06-11 stsp err = got_error_from_errno();
379 9ba79e04 2018-06-11 stsp TAILQ_INSERT_TAIL(commits, entry, entry);
382 9ba79e04 2018-06-11 stsp return err;
385 99db9666 2018-05-07 stsp static const struct got_error *
386 9ba79e04 2018-06-11 stsp fetch_next_commit(struct commit_queue_entry **pentry,
387 9ba79e04 2018-06-11 stsp struct commit_queue_entry *entry, struct commit_queue *commits,
388 9ba79e04 2018-06-11 stsp struct got_commit_graph *graph, struct got_repository *repo)
390 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
391 9ba79e04 2018-06-11 stsp struct got_object_qid *qid;
393 9ba79e04 2018-06-11 stsp *pentry = NULL;
395 9ba79e04 2018-06-11 stsp /* Populate commit graph with entry's parent commits. */
396 9ba79e04 2018-06-11 stsp SIMPLEQ_FOREACH(qid, &entry->commit->parent_ids, entry) {
397 9ba79e04 2018-06-11 stsp int nfetched;
398 9ba79e04 2018-06-11 stsp err = got_commit_graph_fetch_commits_up_to(&nfetched,
399 9ba79e04 2018-06-11 stsp graph, qid->id, repo);
401 9ba79e04 2018-06-11 stsp return err;
404 9ba79e04 2018-06-11 stsp /* Append outstanding commits to queue in graph sort order. */
405 9ba79e04 2018-06-11 stsp err = queue_commits(graph, commits, entry->id, repo);
407 9ba79e04 2018-06-11 stsp if (err->code == GOT_ERR_ITER_COMPLETED)
408 9ba79e04 2018-06-11 stsp err = NULL;
409 9ba79e04 2018-06-11 stsp return err;
412 9ba79e04 2018-06-11 stsp /* Next entry to display should now be available. */
413 9ba79e04 2018-06-11 stsp *pentry = TAILQ_NEXT(entry, entry);
414 9ba79e04 2018-06-11 stsp if (*pentry == NULL)
415 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_NO_OBJ);
417 9ba79e04 2018-06-11 stsp return NULL;
420 899d86c2 2018-05-10 stsp static const struct got_error *
421 9ba79e04 2018-06-11 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
423 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
424 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
426 9ba79e04 2018-06-11 stsp *head_id = NULL;
428 9ba79e04 2018-06-11 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
430 99db9666 2018-05-07 stsp return err;
432 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
433 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
435 9ba79e04 2018-06-11 stsp *head_id = NULL;
436 99db9666 2018-05-07 stsp return err;
439 9ba79e04 2018-06-11 stsp return NULL;
442 0553a4e3 2018-04-30 stsp static const struct got_error *
443 cd0acaa7 2018-05-20 stsp draw_commits(struct commit_queue_entry **last, struct commit_queue_entry **selected,
444 cd0acaa7 2018-05-20 stsp struct commit_queue_entry *first, int selected_idx, int limit)
446 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
447 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
448 867c6645 2018-07-10 stsp int ncommits;
449 867c6645 2018-07-10 stsp char *id_str, *header;
450 867c6645 2018-07-10 stsp size_t header_len;
452 867c6645 2018-07-10 stsp entry = first;
453 867c6645 2018-07-10 stsp *selected = NULL;
454 867c6645 2018-07-10 stsp ncommits = 0;
455 867c6645 2018-07-10 stsp while (entry) {
456 867c6645 2018-07-10 stsp if (++ncommits - 1 == selected_idx) {
457 867c6645 2018-07-10 stsp *selected = entry;
460 867c6645 2018-07-10 stsp entry = TAILQ_NEXT(entry, entry);
462 867c6645 2018-07-10 stsp if (*selected == NULL)
463 867c6645 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
465 867c6645 2018-07-10 stsp err = got_object_id_str(&id_str, (*selected)->id);
467 867c6645 2018-07-10 stsp return err;
469 867c6645 2018-07-10 stsp if (asprintf(&header, "commit: %s", id_str) == -1) {
470 867c6645 2018-07-10 stsp err = got_error_from_errno();
471 867c6645 2018-07-10 stsp free(id_str);
472 867c6645 2018-07-10 stsp return err;
475 9c2de6ef 2018-05-20 stsp werase(tog_log_view.window);
477 867c6645 2018-07-10 stsp header_len = strlen(header);
478 867c6645 2018-07-10 stsp if (header_len > COLS) {
479 867c6645 2018-07-10 stsp id_str[COLS + 1] = '\0';
480 867c6645 2018-07-10 stsp header_len = COLS;
482 867c6645 2018-07-10 stsp wprintw(tog_log_view.window, header);
483 867c6645 2018-07-10 stsp while (header_len < COLS) {
484 867c6645 2018-07-10 stsp waddch(tog_log_view.window, ' ');
485 867c6645 2018-07-10 stsp header_len++;
487 867c6645 2018-07-10 stsp free(id_str);
488 867c6645 2018-07-10 stsp free(header);
490 899d86c2 2018-05-10 stsp entry = first;
491 899d86c2 2018-05-10 stsp *last = first;
492 867c6645 2018-07-10 stsp ncommits = 0;
493 899d86c2 2018-05-10 stsp while (entry) {
494 867c6645 2018-07-10 stsp if (ncommits == limit - 1)
496 cd0acaa7 2018-05-20 stsp if (ncommits == selected_idx) {
497 0553a4e3 2018-04-30 stsp wstandout(tog_log_view.window);
498 cd0acaa7 2018-05-20 stsp *selected = entry;
500 0553a4e3 2018-04-30 stsp err = draw_commit(entry->commit, entry->id);
501 cd0acaa7 2018-05-20 stsp if (ncommits == selected_idx)
502 0553a4e3 2018-04-30 stsp wstandend(tog_log_view.window);
505 0553a4e3 2018-04-30 stsp ncommits++;
506 899d86c2 2018-05-10 stsp *last = entry;
507 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
510 80ddbec8 2018-04-29 stsp update_panels();
511 80ddbec8 2018-04-29 stsp doupdate();
513 80ddbec8 2018-04-29 stsp return err;
516 07b55e75 2018-05-10 stsp static void
517 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
518 07b55e75 2018-05-10 stsp struct commit_queue *commits)
520 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
521 07b55e75 2018-05-10 stsp int nscrolled = 0;
523 07b55e75 2018-05-10 stsp entry = TAILQ_FIRST(commits);
524 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
527 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
528 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
529 07b55e75 2018-05-10 stsp entry = TAILQ_PREV(entry, commit_queue, entry);
530 07b55e75 2018-05-10 stsp if (entry) {
531 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
532 07b55e75 2018-05-10 stsp nscrolled++;
537 aa075928 2018-05-10 stsp static const struct got_error *
538 16482c3b 2018-05-20 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
539 aa075928 2018-05-10 stsp struct commit_queue_entry *last_displayed_entry,
540 9ba79e04 2018-06-11 stsp struct commit_queue *commits, struct got_commit_graph *graph,
541 9ba79e04 2018-06-11 stsp struct got_repository *repo)
543 aa075928 2018-05-10 stsp const struct got_error *err = NULL;
544 dd0a52c1 2018-05-20 stsp struct commit_queue_entry *pentry;
545 aa075928 2018-05-10 stsp int nscrolled = 0;
548 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(last_displayed_entry, entry);
549 aa075928 2018-05-10 stsp if (pentry == NULL) {
550 9ba79e04 2018-06-11 stsp err = fetch_next_commit(&pentry, last_displayed_entry,
551 9ba79e04 2018-06-11 stsp commits, graph, repo);
552 9a6bf2a5 2018-05-20 stsp if (err || pentry == NULL)
555 dd0a52c1 2018-05-20 stsp last_displayed_entry = pentry;
557 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
558 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
560 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
561 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
563 dd0a52c1 2018-05-20 stsp return err;
567 4a7f7875 2018-05-10 stsp num_parents(struct commit_queue_entry *entry)
569 4a7f7875 2018-05-10 stsp int nparents = 0;
571 4a7f7875 2018-05-10 stsp while (entry) {
572 4a7f7875 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
573 4a7f7875 2018-05-10 stsp nparents++;
576 4a7f7875 2018-05-10 stsp return nparents;
579 cd0acaa7 2018-05-20 stsp static const struct got_error *
580 cd0acaa7 2018-05-20 stsp show_commit(struct commit_queue_entry *entry, struct got_repository *repo)
582 cd0acaa7 2018-05-20 stsp const struct got_error *err;
583 cd0acaa7 2018-05-20 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
584 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
586 cd0acaa7 2018-05-20 stsp err = got_object_open(&obj2, repo, entry->id);
588 cd0acaa7 2018-05-20 stsp return err;
590 9ba79e04 2018-06-11 stsp parent_id = SIMPLEQ_FIRST(&entry->commit->parent_ids);
591 9ba79e04 2018-06-11 stsp if (parent_id) {
592 9ba79e04 2018-06-11 stsp err = got_object_open(&obj1, repo, parent_id->id);
597 cd0acaa7 2018-05-20 stsp err = show_diff_view(obj1, obj2, repo);
600 cd0acaa7 2018-05-20 stsp got_object_close(obj1);
602 cd0acaa7 2018-05-20 stsp got_object_close(obj2);
603 cd0acaa7 2018-05-20 stsp return err;
606 80ddbec8 2018-04-29 stsp static const struct got_error *
607 9343a5fb 2018-06-23 stsp browse_commit(struct commit_queue_entry *entry, struct got_repository *repo)
609 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
610 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
612 9343a5fb 2018-06-23 stsp err = got_object_open_as_tree(&tree, repo, entry->commit->tree_id);
614 9343a5fb 2018-06-23 stsp return err;
616 9343a5fb 2018-06-23 stsp err = show_tree_view(tree, entry->id, repo);
617 9343a5fb 2018-06-23 stsp got_object_tree_close(tree);
618 9343a5fb 2018-06-23 stsp return err;
621 9343a5fb 2018-06-23 stsp static const struct got_error *
622 80ddbec8 2018-04-29 stsp show_log_view(struct got_object_id *start_id, struct got_repository *repo)
624 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
625 9ba79e04 2018-06-11 stsp struct got_object_id *head_id = NULL;
626 9ba79e04 2018-06-11 stsp int ch, done = 0, selected = 0, nparents, nfetched;
627 9ba79e04 2018-06-11 stsp struct got_commit_graph *graph;
628 0553a4e3 2018-04-30 stsp struct commit_queue commits;
629 9ba79e04 2018-06-11 stsp struct commit_queue_entry *entry = NULL;
630 899d86c2 2018-05-10 stsp struct commit_queue_entry *first_displayed_entry = NULL;
631 899d86c2 2018-05-10 stsp struct commit_queue_entry *last_displayed_entry = NULL;
632 cd0acaa7 2018-05-20 stsp struct commit_queue_entry *selected_entry = NULL;
634 80ddbec8 2018-04-29 stsp if (tog_log_view.window == NULL) {
635 80ddbec8 2018-04-29 stsp tog_log_view.window = newwin(0, 0, 0, 0);
636 80ddbec8 2018-04-29 stsp if (tog_log_view.window == NULL)
637 80ddbec8 2018-04-29 stsp return got_error_from_errno();
638 00a838fa 2018-04-29 stsp keypad(tog_log_view.window, TRUE);
640 80ddbec8 2018-04-29 stsp if (tog_log_view.panel == NULL) {
641 80ddbec8 2018-04-29 stsp tog_log_view.panel = new_panel(tog_log_view.window);
642 80ddbec8 2018-04-29 stsp if (tog_log_view.panel == NULL)
643 80ddbec8 2018-04-29 stsp return got_error_from_errno();
645 cd0acaa7 2018-05-20 stsp show_panel(tog_log_view.panel);
647 9ba79e04 2018-06-11 stsp err = get_head_commit_id(&head_id, repo);
649 9ba79e04 2018-06-11 stsp return err;
651 899d86c2 2018-05-10 stsp TAILQ_INIT(&commits);
653 5489743f 2018-06-13 stsp err = got_commit_graph_open(&graph, head_id, 0, repo);
657 9ba79e04 2018-06-11 stsp /* Populate commit graph with a sufficient number of commits. */
658 9ba79e04 2018-06-11 stsp err = got_commit_graph_fetch_commits_up_to(&nfetched, graph, start_id,
662 9ba79e04 2018-06-11 stsp err = got_commit_graph_fetch_commits(&nfetched, graph, LINES, repo);
667 9ba79e04 2018-06-11 stsp * Open the initial batch of commits, sorted in commit graph order.
668 9ba79e04 2018-06-11 stsp * We keep all commits open throughout the lifetime of the log view
669 9ba79e04 2018-06-11 stsp * in order to avoid having to re-fetch commits from disk while
670 9ba79e04 2018-06-11 stsp * updating the display.
672 9ba79e04 2018-06-11 stsp err = queue_commits(graph, &commits, head_id, repo);
673 9ba79e04 2018-06-11 stsp if (err && err->code != GOT_ERR_ITER_COMPLETED)
676 9ba79e04 2018-06-11 stsp /* Find entry corresponding to the first commit to display. */
677 9ba79e04 2018-06-11 stsp TAILQ_FOREACH(entry, &commits, entry) {
678 9ba79e04 2018-06-11 stsp if (got_object_id_cmp(entry->id, start_id) == 0) {
679 9ba79e04 2018-06-11 stsp first_displayed_entry = entry;
683 9ba79e04 2018-06-11 stsp if (first_displayed_entry == NULL) {
684 9ba79e04 2018-06-11 stsp err = got_error(GOT_ERR_NO_OBJ);
688 867c6645 2018-07-10 stsp selected_entry = first_displayed_entry;
689 899d86c2 2018-05-10 stsp while (!done) {
690 cd0acaa7 2018-05-20 stsp err = draw_commits(&last_displayed_entry, &selected_entry,
691 cd0acaa7 2018-05-20 stsp first_displayed_entry, selected, LINES);
695 80ddbec8 2018-04-29 stsp nodelay(stdscr, FALSE);
696 80ddbec8 2018-04-29 stsp ch = wgetch(tog_log_view.window);
697 f7182337 2018-05-20 stsp nodelay(stdscr, TRUE);
698 80ddbec8 2018-04-29 stsp switch (ch) {
700 31120ada 2018-04-30 stsp if (errno) {
701 31120ada 2018-04-30 stsp err = got_error_from_errno();
709 80ddbec8 2018-04-29 stsp case KEY_UP:
710 80ddbec8 2018-04-29 stsp if (selected > 0)
711 80ddbec8 2018-04-29 stsp selected--;
712 8ec9698d 2018-05-10 stsp if (selected > 0)
714 07b55e75 2018-05-10 stsp scroll_up(&first_displayed_entry, 1, &commits);
716 48531068 2018-05-10 stsp case KEY_PPAGE:
717 dfc1d240 2018-05-10 stsp if (TAILQ_FIRST(&commits) ==
718 dfc1d240 2018-05-10 stsp first_displayed_entry) {
719 dfc1d240 2018-05-10 stsp selected = 0;
722 48531068 2018-05-10 stsp scroll_up(&first_displayed_entry, LINES,
726 80ddbec8 2018-04-29 stsp case KEY_DOWN:
727 80ee4603 2018-05-10 stsp nparents = num_parents(first_displayed_entry);
728 867c6645 2018-07-10 stsp if (selected < LINES - 2 &&
729 15c91275 2018-05-20 stsp selected < nparents - 1) {
730 15c91275 2018-05-20 stsp selected++;
733 15c91275 2018-05-20 stsp err = scroll_down(&first_displayed_entry, 1,
734 9ba79e04 2018-06-11 stsp last_displayed_entry, &commits, graph,
739 4a7f7875 2018-05-10 stsp case KEY_NPAGE:
740 e50ee4f1 2018-05-10 stsp err = scroll_down(&first_displayed_entry, LINES,
741 9ba79e04 2018-06-11 stsp last_displayed_entry, &commits, graph,
745 dd0a52c1 2018-05-20 stsp if (last_displayed_entry->commit->nparents > 0)
747 dd0a52c1 2018-05-20 stsp /* can't scroll any further; move cursor down */
748 4a7f7875 2018-05-10 stsp nparents = num_parents(first_displayed_entry);
749 867c6645 2018-07-10 stsp if (selected < LINES - 2 ||
750 dd0a52c1 2018-05-20 stsp selected < nparents - 1)
751 867c6645 2018-07-10 stsp selected = MIN(LINES - 2, nparents - 1);
753 d6df9be4 2018-04-30 stsp case KEY_RESIZE:
754 867c6645 2018-07-10 stsp if (selected > LINES - 1)
755 867c6645 2018-07-10 stsp selected = LINES - 2;
757 cd0acaa7 2018-05-20 stsp case KEY_ENTER:
759 cd0acaa7 2018-05-20 stsp err = show_commit(selected_entry, repo);
762 9343a5fb 2018-06-23 stsp show_panel(tog_log_view.panel);
765 9343a5fb 2018-06-23 stsp err = browse_commit(selected_entry, repo);
768 cd0acaa7 2018-05-20 stsp show_panel(tog_log_view.panel);
775 9ba79e04 2018-06-11 stsp free(head_id);
777 9ba79e04 2018-06-11 stsp got_commit_graph_close(graph);
778 0553a4e3 2018-04-30 stsp free_commits(&commits);
779 80ddbec8 2018-04-29 stsp return err;
782 4ed7e80c 2018-05-20 stsp static const struct got_error *
783 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
785 80ddbec8 2018-04-29 stsp const struct got_error *error;
786 80ddbec8 2018-04-29 stsp struct got_repository *repo;
787 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
788 80ddbec8 2018-04-29 stsp char *repo_path = NULL;
789 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
792 80ddbec8 2018-04-29 stsp #ifndef PROFILE
793 80ddbec8 2018-04-29 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
794 80ddbec8 2018-04-29 stsp err(1, "pledge");
797 80ddbec8 2018-04-29 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
798 80ddbec8 2018-04-29 stsp switch (ch) {
800 80ddbec8 2018-04-29 stsp start_commit = optarg;
804 80ddbec8 2018-04-29 stsp /* NOTREACHED */
808 80ddbec8 2018-04-29 stsp argc -= optind;
809 80ddbec8 2018-04-29 stsp argv += optind;
811 80ddbec8 2018-04-29 stsp if (argc == 0) {
812 80ddbec8 2018-04-29 stsp repo_path = getcwd(NULL, 0);
813 80ddbec8 2018-04-29 stsp if (repo_path == NULL)
814 80ddbec8 2018-04-29 stsp return got_error_from_errno();
815 80ddbec8 2018-04-29 stsp } else if (argc == 1) {
816 80ddbec8 2018-04-29 stsp repo_path = realpath(argv[0], NULL);
817 80ddbec8 2018-04-29 stsp if (repo_path == NULL)
818 80ddbec8 2018-04-29 stsp return got_error_from_errno();
820 80ddbec8 2018-04-29 stsp usage_log();
822 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
823 80ddbec8 2018-04-29 stsp free(repo_path);
824 80ddbec8 2018-04-29 stsp if (error != NULL)
825 80ddbec8 2018-04-29 stsp return error;
827 80ddbec8 2018-04-29 stsp if (start_commit == NULL) {
828 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
829 80ddbec8 2018-04-29 stsp if (error != NULL)
830 80ddbec8 2018-04-29 stsp return error;
832 80ddbec8 2018-04-29 stsp struct got_object *obj;
833 80ddbec8 2018-04-29 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
834 80ddbec8 2018-04-29 stsp if (error == NULL) {
835 899d86c2 2018-05-10 stsp start_id = got_object_get_id(obj);
836 899d86c2 2018-05-10 stsp if (start_id == NULL)
837 80ddbec8 2018-04-29 stsp error = got_error_from_errno();
840 80ddbec8 2018-04-29 stsp if (error != NULL)
841 80ddbec8 2018-04-29 stsp return error;
842 899d86c2 2018-05-10 stsp error = show_log_view(start_id, repo);
843 899d86c2 2018-05-10 stsp free(start_id);
844 80ddbec8 2018-04-29 stsp got_repo_close(repo);
845 80ddbec8 2018-04-29 stsp return error;
848 4ed7e80c 2018-05-20 stsp __dead static void
849 9f7d7167 2018-04-29 stsp usage_diff(void)
852 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
853 9f7d7167 2018-04-29 stsp getprogname());
857 b304db33 2018-05-20 stsp static char *
858 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
860 b304db33 2018-05-20 stsp char *line;
861 b304db33 2018-05-20 stsp size_t linelen;
862 b304db33 2018-05-20 stsp size_t lineno;
863 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
865 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
867 b304db33 2018-05-20 stsp *len = linelen;
868 b304db33 2018-05-20 stsp return line;
871 4ed7e80c 2018-05-20 stsp static const struct got_error *
872 a70480e0 2018-06-23 stsp draw_file(WINDOW *window, FILE *f, int *first_displayed_line,
873 a70480e0 2018-06-23 stsp int *last_displayed_line, int *eof, int max_lines)
875 61e69b96 2018-05-20 stsp const struct got_error *err;
876 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
877 b304db33 2018-05-20 stsp char *line;
878 b304db33 2018-05-20 stsp size_t len;
879 61e69b96 2018-05-20 stsp wchar_t *wline;
883 a70480e0 2018-06-23 stsp werase(window);
886 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
887 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
888 26ed57b2 2018-05-19 stsp if (line == NULL) {
892 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
893 26ed57b2 2018-05-19 stsp free(line);
897 e0b650dd 2018-05-20 stsp err = format_line(&wline, &width, line, COLS);
899 61e69b96 2018-05-20 stsp free(line);
900 61e69b96 2018-05-20 stsp return err;
902 a70480e0 2018-06-23 stsp waddwstr(window, wline);
903 e0b650dd 2018-05-20 stsp if (width < COLS)
904 a70480e0 2018-06-23 stsp waddch(window, '\n');
905 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
906 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
907 26ed57b2 2018-05-19 stsp free(line);
909 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
911 26ed57b2 2018-05-19 stsp update_panels();
912 26ed57b2 2018-05-19 stsp doupdate();
914 26ed57b2 2018-05-19 stsp return NULL;
917 4ed7e80c 2018-05-20 stsp static const struct got_error *
918 26ed57b2 2018-05-19 stsp show_diff_view(struct got_object *obj1, struct got_object *obj2,
919 26ed57b2 2018-05-19 stsp struct got_repository *repo)
921 26ed57b2 2018-05-19 stsp const struct got_error *err;
923 26ed57b2 2018-05-19 stsp int ch, done = 0, first_displayed_line = 1, last_displayed_line = LINES;
924 b304db33 2018-05-20 stsp int eof, i;
926 cd0acaa7 2018-05-20 stsp if (obj1 != NULL && obj2 != NULL &&
927 cd0acaa7 2018-05-20 stsp got_object_get_type(obj1) != got_object_get_type(obj2))
928 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
930 511a516b 2018-05-19 stsp f = got_opentemp();
931 26ed57b2 2018-05-19 stsp if (f == NULL)
932 26ed57b2 2018-05-19 stsp return got_error_from_errno();
934 cd0acaa7 2018-05-20 stsp switch (got_object_get_type(obj1 ? obj1 : obj2)) {
935 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
936 11528a82 2018-05-19 stsp err = got_diff_objects_as_blobs(obj1, obj2, repo, f);
938 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
939 11528a82 2018-05-19 stsp err = got_diff_objects_as_trees(obj1, obj2, repo, f);
941 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_COMMIT:
942 11528a82 2018-05-19 stsp err = got_diff_objects_as_commits(obj1, obj2, repo, f);
945 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
950 26ed57b2 2018-05-19 stsp if (tog_diff_view.window == NULL) {
951 26ed57b2 2018-05-19 stsp tog_diff_view.window = newwin(0, 0, 0, 0);
952 26ed57b2 2018-05-19 stsp if (tog_diff_view.window == NULL)
953 26ed57b2 2018-05-19 stsp return got_error_from_errno();
954 26ed57b2 2018-05-19 stsp keypad(tog_diff_view.window, TRUE);
956 26ed57b2 2018-05-19 stsp if (tog_diff_view.panel == NULL) {
957 26ed57b2 2018-05-19 stsp tog_diff_view.panel = new_panel(tog_diff_view.window);
958 26ed57b2 2018-05-19 stsp if (tog_diff_view.panel == NULL)
959 26ed57b2 2018-05-19 stsp return got_error_from_errno();
961 26ed57b2 2018-05-19 stsp show_panel(tog_diff_view.panel);
963 26ed57b2 2018-05-19 stsp while (!done) {
964 a70480e0 2018-06-23 stsp err = draw_file(tog_diff_view.window, f, &first_displayed_line,
965 a70480e0 2018-06-23 stsp &last_displayed_line, &eof, LINES);
968 26ed57b2 2018-05-19 stsp nodelay(stdscr, FALSE);
969 26ed57b2 2018-05-19 stsp ch = wgetch(tog_diff_view.window);
970 f7182337 2018-05-20 stsp nodelay(stdscr, TRUE);
971 26ed57b2 2018-05-19 stsp switch (ch) {
976 26ed57b2 2018-05-19 stsp case KEY_UP:
977 925e6f23 2018-05-20 stsp case KEY_BACKSPACE:
978 26ed57b2 2018-05-19 stsp if (first_displayed_line > 1)
979 b304db33 2018-05-20 stsp first_displayed_line--;
981 b304db33 2018-05-20 stsp case KEY_PPAGE:
983 d56caa55 2018-05-20 stsp while (i++ < LINES - 1 &&
984 d56caa55 2018-05-20 stsp first_displayed_line > 1)
985 26ed57b2 2018-05-19 stsp first_displayed_line--;
988 26ed57b2 2018-05-19 stsp case KEY_DOWN:
989 925e6f23 2018-05-20 stsp case KEY_ENTER:
992 26ed57b2 2018-05-19 stsp first_displayed_line++;
994 b304db33 2018-05-20 stsp case KEY_NPAGE:
997 b304db33 2018-05-20 stsp while (!eof && i++ < LINES - 1) {
998 b304db33 2018-05-20 stsp char *line = parse_next_line(f, NULL);
999 b304db33 2018-05-20 stsp first_displayed_line++;
1000 b304db33 2018-05-20 stsp if (line == NULL)
1008 26ed57b2 2018-05-19 stsp fclose(f);
1009 26ed57b2 2018-05-19 stsp return err;
1012 4ed7e80c 2018-05-20 stsp static const struct got_error *
1013 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
1015 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
1016 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
1017 26ed57b2 2018-05-19 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1018 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
1019 26ed57b2 2018-05-19 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
1022 26ed57b2 2018-05-19 stsp #ifndef PROFILE
1023 26ed57b2 2018-05-19 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
1024 26ed57b2 2018-05-19 stsp err(1, "pledge");
1027 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1028 26ed57b2 2018-05-19 stsp switch (ch) {
1031 26ed57b2 2018-05-19 stsp /* NOTREACHED */
1035 26ed57b2 2018-05-19 stsp argc -= optind;
1036 26ed57b2 2018-05-19 stsp argv += optind;
1038 26ed57b2 2018-05-19 stsp if (argc == 0) {
1039 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
1040 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
1041 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
1042 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1043 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1044 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[0];
1045 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[1];
1046 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
1047 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
1048 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1049 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1050 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[1];
1051 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[2];
1053 26ed57b2 2018-05-19 stsp usage_diff();
1055 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
1056 26ed57b2 2018-05-19 stsp free(repo_path);
1057 26ed57b2 2018-05-19 stsp if (error)
1058 26ed57b2 2018-05-19 stsp goto done;
1060 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
1061 26ed57b2 2018-05-19 stsp if (error)
1062 26ed57b2 2018-05-19 stsp goto done;
1064 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
1065 26ed57b2 2018-05-19 stsp if (error)
1066 26ed57b2 2018-05-19 stsp goto done;
1068 26ed57b2 2018-05-19 stsp error = show_diff_view(obj1, obj2, repo);
1070 26ed57b2 2018-05-19 stsp got_repo_close(repo);
1072 26ed57b2 2018-05-19 stsp got_object_close(obj1);
1074 26ed57b2 2018-05-19 stsp got_object_close(obj2);
1075 26ed57b2 2018-05-19 stsp return error;
1078 4ed7e80c 2018-05-20 stsp __dead static void
1079 9f7d7167 2018-04-29 stsp usage_blame(void)
1082 a70480e0 2018-06-23 stsp fprintf(stderr, "usage: %s blame [-c commit] [repository-path] path\n",
1083 9f7d7167 2018-04-29 stsp getprogname());
1087 84451b3e 2018-07-10 stsp struct tog_blame_line {
1088 84451b3e 2018-07-10 stsp int annotated;
1089 84451b3e 2018-07-10 stsp struct got_object_id *id;
1092 4ed7e80c 2018-05-20 stsp static const struct got_error *
1093 3f60a8ef 2018-07-10 stsp draw_blame(WINDOW *window, FILE *f, const char *path,
1094 18430de3 2018-07-10 stsp struct tog_blame_line *lines, int nlines, int blame_complete,
1095 b700b5d6 2018-07-10 stsp int selected_line, int *first_displayed_line, int *last_displayed_line,
1096 18430de3 2018-07-10 stsp int *eof, int max_lines)
1098 84451b3e 2018-07-10 stsp const struct got_error *err;
1099 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
1100 84451b3e 2018-07-10 stsp char *line;
1101 84451b3e 2018-07-10 stsp size_t len;
1102 84451b3e 2018-07-10 stsp wchar_t *wline;
1103 b700b5d6 2018-07-10 stsp int width, wlimit;
1104 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
1105 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
1107 84451b3e 2018-07-10 stsp rewind(f);
1108 84451b3e 2018-07-10 stsp werase(window);
1110 18430de3 2018-07-10 stsp if (asprintf(&line, "[%d-%d/%d] annotation of %s%s",
1111 18430de3 2018-07-10 stsp *first_displayed_line, *last_displayed_line, nlines,
1112 18430de3 2018-07-10 stsp path, blame_complete ? "" : " in progress...") == -1)
1113 3f60a8ef 2018-07-10 stsp return got_error_from_errno();
1114 3f60a8ef 2018-07-10 stsp err = format_line(&wline, &width, line, COLS);
1115 3f60a8ef 2018-07-10 stsp free(line);
1117 3f60a8ef 2018-07-10 stsp return err;
1118 3f60a8ef 2018-07-10 stsp waddwstr(window, wline);
1119 3f60a8ef 2018-07-10 stsp if (width < COLS)
1120 3f60a8ef 2018-07-10 stsp waddch(window, '\n');
1123 3f60a8ef 2018-07-10 stsp while (nprinted < max_lines - 1) {
1124 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
1125 84451b3e 2018-07-10 stsp if (line == NULL) {
1129 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
1130 84451b3e 2018-07-10 stsp free(line);
1134 b700b5d6 2018-07-10 stsp wlimit = COLS < 9 ? 0 : COLS - 9;
1135 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
1136 84451b3e 2018-07-10 stsp if (err) {
1137 84451b3e 2018-07-10 stsp free(line);
1138 84451b3e 2018-07-10 stsp return err;
1141 b700b5d6 2018-07-10 stsp if (nprinted == selected_line - 1)
1142 b700b5d6 2018-07-10 stsp wstandout(window);
1144 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
1145 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
1146 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
1147 ee41ec32 2018-07-10 stsp waddstr(window, " ");
1148 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
1149 84451b3e 2018-07-10 stsp char *id_str;
1150 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
1151 84451b3e 2018-07-10 stsp if (err) {
1152 84451b3e 2018-07-10 stsp free(line);
1153 84451b3e 2018-07-10 stsp return err;
1155 84451b3e 2018-07-10 stsp wprintw(window, "%.8s ", id_str);
1156 84451b3e 2018-07-10 stsp free(id_str);
1157 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
1159 ee41ec32 2018-07-10 stsp waddstr(window, "........ ");
1160 ee41ec32 2018-07-10 stsp prev_id = NULL;
1163 84451b3e 2018-07-10 stsp waddwstr(window, wline);
1164 b700b5d6 2018-07-10 stsp while (width < wlimit) {
1165 b700b5d6 2018-07-10 stsp waddch(window, ' '); /* width == wlimit - 1 ? '\n' : ' '); */
1168 b700b5d6 2018-07-10 stsp if (nprinted == selected_line - 1)
1169 b700b5d6 2018-07-10 stsp wstandend(window);
1170 84451b3e 2018-07-10 stsp if (++nprinted == 1)
1171 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
1172 84451b3e 2018-07-10 stsp free(line);
1174 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
1176 84451b3e 2018-07-10 stsp update_panels();
1177 84451b3e 2018-07-10 stsp doupdate();
1179 84451b3e 2018-07-10 stsp return NULL;
1182 84451b3e 2018-07-10 stsp struct tog_blame_cb_args {
1183 84451b3e 2018-07-10 stsp pthread_mutex_t *mutex;
1184 84451b3e 2018-07-10 stsp struct tog_blame_line *lines; /* one per line */
1185 84451b3e 2018-07-10 stsp int nlines;
1188 3f60a8ef 2018-07-10 stsp const char *path;
1189 84451b3e 2018-07-10 stsp WINDOW *window;
1190 84451b3e 2018-07-10 stsp int *first_displayed_line;
1191 84451b3e 2018-07-10 stsp int *last_displayed_line;
1192 b700b5d6 2018-07-10 stsp int *selected_line;
1193 18430de3 2018-07-10 stsp int *quit;
1196 84451b3e 2018-07-10 stsp static const struct got_error *
1197 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
1199 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
1200 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
1201 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
1204 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
1205 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
1206 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
1208 84451b3e 2018-07-10 stsp if (pthread_mutex_lock(a->mutex) != 0)
1209 84451b3e 2018-07-10 stsp return got_error_from_errno();
1211 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
1212 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
1213 d68a0a7d 2018-07-10 stsp goto done;
1216 d68a0a7d 2018-07-10 stsp if (lineno == -1)
1217 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
1219 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
1220 d68a0a7d 2018-07-10 stsp if (line->annotated)
1221 d68a0a7d 2018-07-10 stsp goto done;
1223 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
1224 84451b3e 2018-07-10 stsp if (line->id == NULL) {
1225 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1226 84451b3e 2018-07-10 stsp goto done;
1228 84451b3e 2018-07-10 stsp line->annotated = 1;
1230 18430de3 2018-07-10 stsp err = draw_blame(a->window, a->f, a->path, a->lines, a->nlines, 0,
1231 b700b5d6 2018-07-10 stsp *a->selected_line, a->first_displayed_line, a->last_displayed_line,
1232 b700b5d6 2018-07-10 stsp &eof, LINES);
1234 84451b3e 2018-07-10 stsp if (pthread_mutex_unlock(a->mutex) != 0)
1235 84451b3e 2018-07-10 stsp return got_error_from_errno();
1236 84451b3e 2018-07-10 stsp return err;
1239 84451b3e 2018-07-10 stsp struct tog_blame_thread_args {
1240 84451b3e 2018-07-10 stsp const char *path;
1241 84451b3e 2018-07-10 stsp struct got_object_id *commit_id;
1242 84451b3e 2018-07-10 stsp struct got_repository *repo;
1243 84451b3e 2018-07-10 stsp void *blame_cb_args;
1244 18430de3 2018-07-10 stsp int *complete;
1247 84451b3e 2018-07-10 stsp static void *
1248 84451b3e 2018-07-10 stsp blame_thread(void *arg)
1250 18430de3 2018-07-10 stsp const struct got_error *err;
1251 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
1252 18430de3 2018-07-10 stsp struct tog_blame_cb_args *a = ta->blame_cb_args;
1255 18430de3 2018-07-10 stsp err = got_blame_incremental(ta->path, ta->commit_id, ta->repo,
1256 18430de3 2018-07-10 stsp blame_cb, ta->blame_cb_args);
1257 18430de3 2018-07-10 stsp *ta->complete = 1;
1259 18430de3 2018-07-10 stsp return (void *)err;
1261 18430de3 2018-07-10 stsp if (pthread_mutex_lock(a->mutex) != 0)
1262 18430de3 2018-07-10 stsp return (void *)got_error_from_errno();
1264 18430de3 2018-07-10 stsp err = draw_blame(a->window, a->f, a->path, a->lines, a->nlines, 1,
1265 b700b5d6 2018-07-10 stsp *a->selected_line, a->first_displayed_line, a->last_displayed_line,
1266 b700b5d6 2018-07-10 stsp &eof, LINES);
1268 18430de3 2018-07-10 stsp if (pthread_mutex_unlock(a->mutex) != 0 && err == NULL)
1269 18430de3 2018-07-10 stsp err = got_error_from_errno();
1271 18430de3 2018-07-10 stsp return (void *)err;
1275 84451b3e 2018-07-10 stsp static const struct got_error *
1276 b880a918 2018-07-10 stsp open_blamed_commit_and_parent(struct got_object **pobj, struct got_object **obj,
1277 b880a918 2018-07-10 stsp struct tog_blame_line *lines, int first_displayed_line,
1278 b880a918 2018-07-10 stsp int selected_line, struct got_repository *repo)
1280 b880a918 2018-07-10 stsp const struct got_error *err = NULL;
1281 b880a918 2018-07-10 stsp struct tog_blame_line *line;
1282 b880a918 2018-07-10 stsp struct got_commit_object *commit = NULL;
1283 b880a918 2018-07-10 stsp struct got_object_qid *pid;
1285 b880a918 2018-07-10 stsp *pobj = NULL;
1286 b880a918 2018-07-10 stsp *obj = NULL;
1288 b880a918 2018-07-10 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
1289 b880a918 2018-07-10 stsp if (!line->annotated || line->id == NULL)
1290 b880a918 2018-07-10 stsp return NULL;
1292 b880a918 2018-07-10 stsp err = got_object_open(obj, repo, line->id);
1294 b880a918 2018-07-10 stsp goto done;
1296 b880a918 2018-07-10 stsp err = got_object_commit_open(&commit, repo, *obj);
1298 b880a918 2018-07-10 stsp goto done;
1300 b880a918 2018-07-10 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
1301 b880a918 2018-07-10 stsp if (pid) {
1302 b880a918 2018-07-10 stsp err = got_object_open(pobj, repo, pid->id);
1304 b880a918 2018-07-10 stsp goto done;
1307 b880a918 2018-07-10 stsp if (commit)
1308 b880a918 2018-07-10 stsp got_object_commit_close(commit);
1309 b880a918 2018-07-10 stsp return err;
1312 b880a918 2018-07-10 stsp static const struct got_error *
1313 a70480e0 2018-06-23 stsp show_blame_view(const char *path, struct got_object_id *commit_id,
1314 a70480e0 2018-06-23 stsp struct got_repository *repo)
1316 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
1317 a70480e0 2018-06-23 stsp int ch, done = 0, first_displayed_line = 1, last_displayed_line = LINES;
1318 b700b5d6 2018-07-10 stsp int selected_line = first_displayed_line;
1319 18430de3 2018-07-10 stsp int eof, i, blame_complete = 0;
1320 b880a918 2018-07-10 stsp struct got_object *obj = NULL, *pobj = NULL;
1321 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
1322 84451b3e 2018-07-10 stsp FILE *f = NULL;
1323 67c4c153 2018-07-10 stsp size_t filesize, nlines = 0;
1324 84451b3e 2018-07-10 stsp struct tog_blame_line *lines = NULL;
1325 84451b3e 2018-07-10 stsp pthread_t thread = NULL;
1326 84451b3e 2018-07-10 stsp pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
1327 84451b3e 2018-07-10 stsp struct tog_blame_cb_args blame_cb_args;
1328 84451b3e 2018-07-10 stsp struct tog_blame_thread_args blame_thread_args;
1329 bd24772e 2018-07-11 stsp struct got_repository *blame_thread_repo = NULL;
1331 84451b3e 2018-07-10 stsp err = got_object_open_by_path(&obj, repo, commit_id, path);
1333 84451b3e 2018-07-10 stsp goto done;
1334 84451b3e 2018-07-10 stsp if (got_object_get_type(obj) != GOT_OBJ_TYPE_BLOB) {
1335 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1336 84451b3e 2018-07-10 stsp goto done;
1339 84451b3e 2018-07-10 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
1341 a70480e0 2018-06-23 stsp goto done;
1342 84451b3e 2018-07-10 stsp f = got_opentemp();
1343 84451b3e 2018-07-10 stsp if (f == NULL) {
1344 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1345 84451b3e 2018-07-10 stsp goto done;
1347 84451b3e 2018-07-10 stsp err = got_object_blob_dump_to_file(&filesize, &nlines, f, blob);
1349 84451b3e 2018-07-10 stsp goto done;
1351 84451b3e 2018-07-10 stsp lines = calloc(nlines, sizeof(*lines));
1352 84451b3e 2018-07-10 stsp if (lines == NULL) {
1353 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1354 84451b3e 2018-07-10 stsp goto done;
1357 bd24772e 2018-07-11 stsp err = got_repo_open(&blame_thread_repo, got_repo_get_path(repo));
1359 bd24772e 2018-07-11 stsp goto done;
1361 a70480e0 2018-06-23 stsp if (tog_blame_view.window == NULL) {
1362 a70480e0 2018-06-23 stsp tog_blame_view.window = newwin(0, 0, 0, 0);
1363 a70480e0 2018-06-23 stsp if (tog_blame_view.window == NULL)
1364 a70480e0 2018-06-23 stsp return got_error_from_errno();
1365 a70480e0 2018-06-23 stsp keypad(tog_blame_view.window, TRUE);
1367 a70480e0 2018-06-23 stsp if (tog_blame_view.panel == NULL) {
1368 a70480e0 2018-06-23 stsp tog_blame_view.panel = new_panel(tog_blame_view.window);
1369 a70480e0 2018-06-23 stsp if (tog_blame_view.panel == NULL)
1370 a70480e0 2018-06-23 stsp return got_error_from_errno();
1372 a70480e0 2018-06-23 stsp show_panel(tog_blame_view.panel);
1374 84451b3e 2018-07-10 stsp if (pthread_mutex_init(&mutex, NULL) != 0) {
1375 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1376 84451b3e 2018-07-10 stsp goto done;
1378 84451b3e 2018-07-10 stsp blame_cb_args.lines = lines;
1379 84451b3e 2018-07-10 stsp blame_cb_args.nlines = nlines;
1380 84451b3e 2018-07-10 stsp blame_cb_args.mutex = &mutex;
1381 84451b3e 2018-07-10 stsp blame_cb_args.f = f;
1382 3f60a8ef 2018-07-10 stsp blame_cb_args.path = path;
1383 84451b3e 2018-07-10 stsp blame_cb_args.window = tog_blame_view.window;
1384 84451b3e 2018-07-10 stsp blame_cb_args.first_displayed_line = &first_displayed_line;
1385 b700b5d6 2018-07-10 stsp blame_cb_args.selected_line = &selected_line;
1386 84451b3e 2018-07-10 stsp blame_cb_args.last_displayed_line = &last_displayed_line;
1387 18430de3 2018-07-10 stsp blame_cb_args.quit = &done;
1389 84451b3e 2018-07-10 stsp blame_thread_args.path = path;
1390 84451b3e 2018-07-10 stsp blame_thread_args.commit_id = commit_id;
1391 bd24772e 2018-07-11 stsp blame_thread_args.repo = blame_thread_repo;
1392 84451b3e 2018-07-10 stsp blame_thread_args.blame_cb_args = &blame_cb_args;
1393 18430de3 2018-07-10 stsp blame_thread_args.complete = &blame_complete;
1395 84451b3e 2018-07-10 stsp if (pthread_create(&thread, NULL, blame_thread,
1396 84451b3e 2018-07-10 stsp &blame_thread_args) != 0) {
1397 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1398 84451b3e 2018-07-10 stsp goto done;
1401 a70480e0 2018-06-23 stsp while (!done) {
1402 84451b3e 2018-07-10 stsp if (pthread_mutex_lock(&mutex) != 0) {
1403 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1404 84451b3e 2018-07-10 stsp goto done;
1406 3f60a8ef 2018-07-10 stsp err = draw_blame(tog_blame_view.window, f, path, lines, nlines,
1407 b700b5d6 2018-07-10 stsp blame_complete, selected_line, &first_displayed_line,
1408 b700b5d6 2018-07-10 stsp &last_displayed_line, &eof, LINES);
1409 84451b3e 2018-07-10 stsp if (pthread_mutex_unlock(&mutex) != 0) {
1410 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1411 84451b3e 2018-07-10 stsp goto done;
1415 a70480e0 2018-06-23 stsp nodelay(stdscr, FALSE);
1416 a70480e0 2018-06-23 stsp ch = wgetch(tog_blame_view.window);
1417 a70480e0 2018-06-23 stsp nodelay(stdscr, TRUE);
1418 84451b3e 2018-07-10 stsp if (pthread_mutex_lock(&mutex) != 0) {
1419 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1420 84451b3e 2018-07-10 stsp goto done;
1422 a70480e0 2018-06-23 stsp switch (ch) {
1427 a70480e0 2018-06-23 stsp case KEY_UP:
1428 b700b5d6 2018-07-10 stsp if (selected_line > 1)
1429 b700b5d6 2018-07-10 stsp selected_line--;
1430 b700b5d6 2018-07-10 stsp else if (selected_line == 1 &&
1431 b700b5d6 2018-07-10 stsp first_displayed_line > 1)
1432 a70480e0 2018-06-23 stsp first_displayed_line--;
1434 a70480e0 2018-06-23 stsp case KEY_PPAGE:
1435 b700b5d6 2018-07-10 stsp if (first_displayed_line == 1) {
1436 b700b5d6 2018-07-10 stsp selected_line = 1;
1439 b700b5d6 2018-07-10 stsp if (first_displayed_line > LINES - 1)
1440 b700b5d6 2018-07-10 stsp first_displayed_line -= (LINES - 1);
1442 b700b5d6 2018-07-10 stsp first_displayed_line = 1;
1445 a70480e0 2018-06-23 stsp case KEY_DOWN:
1446 b700b5d6 2018-07-10 stsp if (selected_line < LINES - 1)
1447 b700b5d6 2018-07-10 stsp selected_line++;
1448 b700b5d6 2018-07-10 stsp else if (last_displayed_line < nlines)
1449 b700b5d6 2018-07-10 stsp first_displayed_line++;
1451 a70480e0 2018-06-23 stsp case KEY_ENTER:
1452 a70480e0 2018-06-23 stsp case '\r':
1453 b880a918 2018-07-10 stsp err = open_blamed_commit_and_parent(&pobj, &obj,
1454 b880a918 2018-07-10 stsp lines, first_displayed_line, selected_line,
1457 ad6a6c43 2018-07-10 stsp goto done;
1458 b880a918 2018-07-10 stsp if (pobj == NULL && obj == NULL)
1460 b880a918 2018-07-10 stsp err = show_diff_view(pobj, obj, repo);
1461 b880a918 2018-07-10 stsp if (pobj) {
1462 b880a918 2018-07-10 stsp got_object_close(pobj);
1463 b880a918 2018-07-10 stsp pobj = NULL;
1465 b880a918 2018-07-10 stsp got_object_close(obj);
1466 b880a918 2018-07-10 stsp obj = NULL;
1467 ad6a6c43 2018-07-10 stsp show_panel(tog_blame_view.panel);
1469 ad6a6c43 2018-07-10 stsp goto done;
1471 a70480e0 2018-06-23 stsp case KEY_NPAGE:
1473 b700b5d6 2018-07-10 stsp if (last_displayed_line >= nlines &&
1474 b700b5d6 2018-07-10 stsp selected_line < LINES - 1) {
1475 b700b5d6 2018-07-10 stsp selected_line = LINES - 1;
1478 b700b5d6 2018-07-10 stsp if (last_displayed_line + LINES - 1 <= nlines)
1479 b700b5d6 2018-07-10 stsp first_displayed_line += LINES - 1;
1481 b700b5d6 2018-07-10 stsp first_displayed_line =
1482 b700b5d6 2018-07-10 stsp nlines - (LINES - 2);
1487 84451b3e 2018-07-10 stsp if (pthread_mutex_unlock(&mutex) != 0) {
1488 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1489 84451b3e 2018-07-10 stsp goto done;
1493 67c4c153 2018-07-10 stsp if (thread) {
1494 67c4c153 2018-07-10 stsp if (pthread_join(thread, (void **)&err) != 0)
1495 67c4c153 2018-07-10 stsp err = got_error_from_errno();
1496 75b7a700 2018-07-10 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
1497 75b7a700 2018-07-10 stsp err = NULL;
1499 bd24772e 2018-07-11 stsp if (blame_thread_repo)
1500 bd24772e 2018-07-11 stsp got_repo_close(blame_thread_repo);
1502 84451b3e 2018-07-10 stsp got_object_blob_close(blob);
1504 b880a918 2018-07-10 stsp got_object_close(pobj);
1506 b880a918 2018-07-10 stsp got_object_close(obj);
1508 84451b3e 2018-07-10 stsp fclose(f);
1509 67c4c153 2018-07-10 stsp for (i = 0; i < nlines; i++)
1510 67c4c153 2018-07-10 stsp free(lines[i].id);
1511 84451b3e 2018-07-10 stsp free(lines);
1512 a70480e0 2018-06-23 stsp return err;
1515 a70480e0 2018-06-23 stsp static const struct got_error *
1516 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
1518 a70480e0 2018-06-23 stsp const struct got_error *error;
1519 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
1520 a70480e0 2018-06-23 stsp char *repo_path = NULL;
1521 a70480e0 2018-06-23 stsp char *path = NULL;
1522 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
1523 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
1526 a70480e0 2018-06-23 stsp #ifndef PROFILE
1527 a70480e0 2018-06-23 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
1528 a70480e0 2018-06-23 stsp err(1, "pledge");
1531 a70480e0 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
1532 a70480e0 2018-06-23 stsp switch (ch) {
1534 a70480e0 2018-06-23 stsp commit_id_str = optarg;
1538 a70480e0 2018-06-23 stsp /* NOTREACHED */
1542 a70480e0 2018-06-23 stsp argc -= optind;
1543 a70480e0 2018-06-23 stsp argv += optind;
1545 a70480e0 2018-06-23 stsp if (argc == 0) {
1546 a70480e0 2018-06-23 stsp usage_blame();
1547 a70480e0 2018-06-23 stsp } else if (argc == 1) {
1548 a70480e0 2018-06-23 stsp repo_path = getcwd(NULL, 0);
1549 a70480e0 2018-06-23 stsp if (repo_path == NULL)
1550 a70480e0 2018-06-23 stsp return got_error_from_errno();
1551 a70480e0 2018-06-23 stsp path = argv[0];
1552 a70480e0 2018-06-23 stsp } else if (argc == 2) {
1553 a70480e0 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
1554 a70480e0 2018-06-23 stsp if (repo_path == NULL)
1555 a70480e0 2018-06-23 stsp return got_error_from_errno();
1556 a70480e0 2018-06-23 stsp path = argv[1];
1558 a70480e0 2018-06-23 stsp usage_blame();
1560 a70480e0 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
1561 a70480e0 2018-06-23 stsp free(repo_path);
1562 a70480e0 2018-06-23 stsp if (error != NULL)
1563 66b4983c 2018-06-23 stsp return error;
1565 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
1566 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
1567 a70480e0 2018-06-23 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1568 a70480e0 2018-06-23 stsp if (error != NULL)
1569 66b4983c 2018-06-23 stsp goto done;
1570 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
1571 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
1573 a70480e0 2018-06-23 stsp struct got_object *obj;
1574 a70480e0 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_str);
1575 a70480e0 2018-06-23 stsp if (error != NULL)
1576 66b4983c 2018-06-23 stsp goto done;
1577 a70480e0 2018-06-23 stsp commit_id = got_object_get_id(obj);
1578 a19e88aa 2018-06-23 stsp if (commit_id == NULL)
1579 66b4983c 2018-06-23 stsp error = got_error_from_errno();
1580 a19e88aa 2018-06-23 stsp got_object_close(obj);
1582 a19e88aa 2018-06-23 stsp if (error != NULL)
1583 a19e88aa 2018-06-23 stsp goto done;
1585 a70480e0 2018-06-23 stsp error = show_blame_view(path, commit_id, repo);
1587 a70480e0 2018-06-23 stsp free(commit_id);
1589 a70480e0 2018-06-23 stsp got_repo_close(repo);
1590 a70480e0 2018-06-23 stsp return error;
1593 ffd1d5e5 2018-06-23 stsp static const struct got_error *
1594 ffd1d5e5 2018-06-23 stsp draw_tree_entries(struct got_tree_entry **first_displayed_entry,
1595 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
1596 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
1597 ce52c690 2018-06-23 stsp WINDOW *window, const char *label, const char *parent_path,
1598 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
1600 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
1601 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
1602 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
1603 ffd1d5e5 2018-06-23 stsp int width, n;
1605 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
1607 ffd1d5e5 2018-06-23 stsp werase(window);
1609 ffd1d5e5 2018-06-23 stsp if (limit == 0)
1610 ffd1d5e5 2018-06-23 stsp return NULL;
1612 ffd1d5e5 2018-06-23 stsp err = format_line(&wline, &width, label, COLS);
1614 ffd1d5e5 2018-06-23 stsp return err;
1615 ffd1d5e5 2018-06-23 stsp waddwstr(window, wline);
1616 ffd1d5e5 2018-06-23 stsp if (width < COLS)
1617 ffd1d5e5 2018-06-23 stsp waddch(window, '\n');
1618 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
1619 ffd1d5e5 2018-06-23 stsp return NULL;
1620 ce52c690 2018-06-23 stsp err = format_line(&wline, &width, parent_path, COLS);
1622 ce52c690 2018-06-23 stsp return err;
1623 ce52c690 2018-06-23 stsp waddwstr(window, wline);
1624 ce52c690 2018-06-23 stsp if (width < COLS)
1625 ce52c690 2018-06-23 stsp waddch(window, '\n');
1626 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
1627 ffd1d5e5 2018-06-23 stsp return NULL;
1628 a1eca9bb 2018-06-23 stsp waddch(window, '\n');
1629 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
1630 a1eca9bb 2018-06-23 stsp return NULL;
1632 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
1633 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
1634 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
1635 ffd1d5e5 2018-06-23 stsp wstandout(window);
1636 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
1638 ffd1d5e5 2018-06-23 stsp waddstr(window, " ..\n"); /* parent directory */
1639 ffd1d5e5 2018-06-23 stsp if (selected == 0)
1640 ffd1d5e5 2018-06-23 stsp wstandend(window);
1641 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
1642 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
1643 ffd1d5e5 2018-06-23 stsp return NULL;
1647 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
1648 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
1651 ffd1d5e5 2018-06-23 stsp while (te) {
1652 ce52c690 2018-06-23 stsp char *line = NULL;
1653 ffd1d5e5 2018-06-23 stsp if (asprintf(&line, " %s%s",
1654 ffd1d5e5 2018-06-23 stsp te->name, S_ISDIR(te->mode) ? "/" : "") == -1)
1655 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
1656 ffd1d5e5 2018-06-23 stsp err = format_line(&wline, &width, line, COLS);
1657 ffd1d5e5 2018-06-23 stsp if (err) {
1658 ffd1d5e5 2018-06-23 stsp free(line);
1661 ffd1d5e5 2018-06-23 stsp if (n == selected) {
1662 ffd1d5e5 2018-06-23 stsp wstandout(window);
1663 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
1665 ffd1d5e5 2018-06-23 stsp waddwstr(window, wline);
1666 ffd1d5e5 2018-06-23 stsp if (width < COLS)
1667 ffd1d5e5 2018-06-23 stsp waddch(window, '\n');
1668 ffd1d5e5 2018-06-23 stsp if (n == selected)
1669 ffd1d5e5 2018-06-23 stsp wstandend(window);
1670 ffd1d5e5 2018-06-23 stsp free(line);
1672 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
1673 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
1674 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
1676 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
1679 ffd1d5e5 2018-06-23 stsp return err;
1682 ffd1d5e5 2018-06-23 stsp static void
1683 ffd1d5e5 2018-06-23 stsp tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
1684 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
1686 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
1689 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL)
1692 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
1693 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
1694 ffd1d5e5 2018-06-23 stsp if (!isroot)
1695 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
1699 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
1700 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
1701 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
1702 ffd1d5e5 2018-06-23 stsp prev = te;
1703 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
1705 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
1706 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
1708 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
1709 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
1712 ffd1d5e5 2018-06-23 stsp static void
1713 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
1714 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
1715 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
1717 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *next;
1718 ffd1d5e5 2018-06-23 stsp int n = 0;
1720 ffd1d5e5 2018-06-23 stsp if (SIMPLEQ_NEXT(last_displayed_entry, entry) == NULL)
1723 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
1724 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
1726 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
1727 ffd1d5e5 2018-06-23 stsp while (next) {
1728 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = next;
1729 ffd1d5e5 2018-06-23 stsp if (++n >= maxscroll)
1731 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(next, entry);
1735 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree {
1736 d9765a41 2018-06-23 stsp TAILQ_ENTRY(tog_parent_tree) entry;
1737 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree;
1738 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *first_displayed_entry;
1739 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *selected_entry;
1740 ffd1d5e5 2018-06-23 stsp int selected;
1743 d9765a41 2018-06-23 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
1745 ffd1d5e5 2018-06-23 stsp static const struct got_error *
1746 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
1747 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
1749 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
1750 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
1751 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
1753 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
1754 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
1756 ce52c690 2018-06-23 stsp len += strlen(te->name);
1758 ce52c690 2018-06-23 stsp *path = calloc(1, len);
1759 ffd1d5e5 2018-06-23 stsp if (path == NULL)
1760 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
1762 ce52c690 2018-06-23 stsp (*path)[0] = '/';
1763 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
1764 d9765a41 2018-06-23 stsp while (pt) {
1765 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
1766 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
1767 cb2ebc8a 2018-06-23 stsp goto done;
1769 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
1770 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
1771 cb2ebc8a 2018-06-23 stsp goto done;
1773 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
1776 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
1777 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
1778 ce52c690 2018-06-23 stsp goto done;
1782 ce52c690 2018-06-23 stsp if (err) {
1783 ce52c690 2018-06-23 stsp free(*path);
1784 ce52c690 2018-06-23 stsp *path = NULL;
1786 ce52c690 2018-06-23 stsp return err;
1789 ce52c690 2018-06-23 stsp static const struct got_error *
1790 ce52c690 2018-06-23 stsp blame_tree_entry(struct got_tree_entry *te, struct tog_parent_trees *parents,
1791 ce52c690 2018-06-23 stsp struct got_object_id *commit_id, struct got_repository *repo)
1793 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
1794 ce52c690 2018-06-23 stsp char *path;
1796 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
1798 ce52c690 2018-06-23 stsp return err;
1800 cb2ebc8a 2018-06-23 stsp err = show_blame_view(path, commit_id, repo);
1801 cb2ebc8a 2018-06-23 stsp free(path);
1802 cb2ebc8a 2018-06-23 stsp return err;
1805 ffd1d5e5 2018-06-23 stsp static const struct got_error *
1806 ffd1d5e5 2018-06-23 stsp show_tree_view(struct got_tree_object *root, struct got_object_id *commit_id,
1807 ffd1d5e5 2018-06-23 stsp struct got_repository *repo)
1809 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
1810 ffd1d5e5 2018-06-23 stsp int ch, done = 0, selected = 0;
1811 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = root;
1812 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries;
1813 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *first_displayed_entry = NULL;
1814 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry = NULL;
1815 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *selected_entry = NULL;
1816 ffd1d5e5 2018-06-23 stsp char *commit_id_str = NULL, *tree_label = NULL;
1817 ffd1d5e5 2018-06-23 stsp int nentries, ndisplayed;
1818 ffd1d5e5 2018-06-23 stsp struct tog_parent_trees parents;
1820 d9765a41 2018-06-23 stsp TAILQ_INIT(&parents);
1822 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
1823 ffd1d5e5 2018-06-23 stsp if (err != NULL)
1824 ffd1d5e5 2018-06-23 stsp goto done;
1826 ffd1d5e5 2018-06-23 stsp if (asprintf(&tree_label, "tree of commit %s", commit_id_str) == -1) {
1827 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
1828 ffd1d5e5 2018-06-23 stsp goto done;
1831 ffd1d5e5 2018-06-23 stsp if (tog_tree_view.window == NULL) {
1832 ffd1d5e5 2018-06-23 stsp tog_tree_view.window = newwin(0, 0, 0, 0);
1833 ffd1d5e5 2018-06-23 stsp if (tog_tree_view.window == NULL)
1834 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
1835 ffd1d5e5 2018-06-23 stsp keypad(tog_tree_view.window, TRUE);
1837 ffd1d5e5 2018-06-23 stsp if (tog_tree_view.panel == NULL) {
1838 ffd1d5e5 2018-06-23 stsp tog_tree_view.panel = new_panel(tog_tree_view.window);
1839 ffd1d5e5 2018-06-23 stsp if (tog_tree_view.panel == NULL)
1840 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
1842 ffd1d5e5 2018-06-23 stsp show_panel(tog_tree_view.panel);
1844 ffd1d5e5 2018-06-23 stsp entries = got_object_tree_get_entries(root);
1845 ffd1d5e5 2018-06-23 stsp first_displayed_entry = SIMPLEQ_FIRST(&entries->head);
1846 ffd1d5e5 2018-06-23 stsp while (!done) {
1847 ce52c690 2018-06-23 stsp char *parent_path;
1848 ffd1d5e5 2018-06-23 stsp entries = got_object_tree_get_entries(tree);
1849 ffd1d5e5 2018-06-23 stsp nentries = entries->nentries;
1850 ffd1d5e5 2018-06-23 stsp if (tree != root)
1851 ffd1d5e5 2018-06-23 stsp nentries++; /* '..' directory */
1853 ce52c690 2018-06-23 stsp err = tree_entry_path(&parent_path, &parents, NULL);
1855 ce52c690 2018-06-23 stsp goto done;
1857 ffd1d5e5 2018-06-23 stsp err = draw_tree_entries(&first_displayed_entry,
1858 ffd1d5e5 2018-06-23 stsp &last_displayed_entry, &selected_entry, &ndisplayed,
1859 ce52c690 2018-06-23 stsp tog_tree_view.window, tree_label, parent_path, entries,
1860 ce52c690 2018-06-23 stsp selected, LINES, tree == root);
1861 ce52c690 2018-06-23 stsp free(parent_path);
1865 ffd1d5e5 2018-06-23 stsp nodelay(stdscr, FALSE);
1866 ffd1d5e5 2018-06-23 stsp ch = wgetch(tog_tree_view.window);
1867 ffd1d5e5 2018-06-23 stsp nodelay(stdscr, TRUE);
1868 ffd1d5e5 2018-06-23 stsp switch (ch) {
1873 ffd1d5e5 2018-06-23 stsp case KEY_UP:
1874 ffd1d5e5 2018-06-23 stsp if (selected > 0)
1875 ffd1d5e5 2018-06-23 stsp selected--;
1876 ffd1d5e5 2018-06-23 stsp if (selected > 0)
1878 ffd1d5e5 2018-06-23 stsp tree_scroll_up(&first_displayed_entry, 1,
1879 ffd1d5e5 2018-06-23 stsp entries, tree == root);
1881 ffd1d5e5 2018-06-23 stsp case KEY_PPAGE:
1882 ffd1d5e5 2018-06-23 stsp if (SIMPLEQ_FIRST(&entries->head) ==
1883 ffd1d5e5 2018-06-23 stsp first_displayed_entry) {
1884 cf8f1261 2018-06-23 stsp if (tree != root)
1885 cf8f1261 2018-06-23 stsp first_displayed_entry = NULL;
1886 ffd1d5e5 2018-06-23 stsp selected = 0;
1889 ffd1d5e5 2018-06-23 stsp tree_scroll_up(&first_displayed_entry, LINES,
1890 ffd1d5e5 2018-06-23 stsp entries, tree == root);
1893 ffd1d5e5 2018-06-23 stsp case KEY_DOWN:
1894 ffd1d5e5 2018-06-23 stsp if (selected < ndisplayed - 1) {
1895 ffd1d5e5 2018-06-23 stsp selected++;
1898 ffd1d5e5 2018-06-23 stsp tree_scroll_down(&first_displayed_entry, 1,
1899 ffd1d5e5 2018-06-23 stsp last_displayed_entry, entries);
1901 ffd1d5e5 2018-06-23 stsp case KEY_NPAGE:
1902 ffd1d5e5 2018-06-23 stsp tree_scroll_down(&first_displayed_entry, LINES,
1903 ffd1d5e5 2018-06-23 stsp last_displayed_entry, entries);
1904 ffd1d5e5 2018-06-23 stsp if (SIMPLEQ_NEXT(last_displayed_entry, entry))
1906 ffd1d5e5 2018-06-23 stsp /* can't scroll any further; move cursor down */
1907 ffd1d5e5 2018-06-23 stsp if (selected < ndisplayed - 1)
1908 ffd1d5e5 2018-06-23 stsp selected = ndisplayed - 1;
1910 ffd1d5e5 2018-06-23 stsp case KEY_ENTER:
1911 ffd1d5e5 2018-06-23 stsp case '\r':
1912 ffd1d5e5 2018-06-23 stsp if (selected_entry == NULL) {
1913 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *parent;
1914 ffd1d5e5 2018-06-23 stsp case KEY_BACKSPACE:
1915 ffd1d5e5 2018-06-23 stsp /* user selected '..' */
1916 ffd1d5e5 2018-06-23 stsp if (tree == root)
1918 d9765a41 2018-06-23 stsp parent = TAILQ_FIRST(&parents);
1919 d9765a41 2018-06-23 stsp TAILQ_REMOVE(&parents, parent, entry);
1920 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
1921 ffd1d5e5 2018-06-23 stsp tree = parent->tree;
1922 ffd1d5e5 2018-06-23 stsp first_displayed_entry =
1923 ffd1d5e5 2018-06-23 stsp parent->first_displayed_entry;
1924 ffd1d5e5 2018-06-23 stsp selected_entry = parent->selected_entry;
1925 ffd1d5e5 2018-06-23 stsp selected = parent->selected;
1926 ffd1d5e5 2018-06-23 stsp free(parent);
1927 ffd1d5e5 2018-06-23 stsp } else if (S_ISDIR(selected_entry->mode)) {
1928 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *parent;
1929 ffd1d5e5 2018-06-23 stsp struct got_tree_object *child;
1930 ffd1d5e5 2018-06-23 stsp err = got_object_open_as_tree(
1931 ffd1d5e5 2018-06-23 stsp &child, repo, selected_entry->id);
1933 ffd1d5e5 2018-06-23 stsp goto done;
1934 ffd1d5e5 2018-06-23 stsp parent = calloc(1, sizeof(*parent));
1935 ffd1d5e5 2018-06-23 stsp if (parent == NULL) {
1936 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
1937 ffd1d5e5 2018-06-23 stsp goto done;
1939 ffd1d5e5 2018-06-23 stsp parent->tree = tree;
1940 ffd1d5e5 2018-06-23 stsp parent->first_displayed_entry =
1941 ffd1d5e5 2018-06-23 stsp first_displayed_entry;
1942 ffd1d5e5 2018-06-23 stsp parent->selected_entry = selected_entry;
1943 ffd1d5e5 2018-06-23 stsp parent->selected = selected;
1944 d9765a41 2018-06-23 stsp TAILQ_INSERT_HEAD(&parents, parent,
1946 ffd1d5e5 2018-06-23 stsp tree = child;
1947 ffd1d5e5 2018-06-23 stsp selected = 0;
1948 ffd1d5e5 2018-06-23 stsp first_displayed_entry = NULL;
1949 ffd1d5e5 2018-06-23 stsp } else if (S_ISREG(selected_entry->mode)) {
1950 ffd1d5e5 2018-06-23 stsp err = blame_tree_entry(selected_entry,
1951 ffd1d5e5 2018-06-23 stsp &parents, commit_id, repo);
1953 ffd1d5e5 2018-06-23 stsp goto done;
1956 ffd1d5e5 2018-06-23 stsp case KEY_RESIZE:
1957 ffd1d5e5 2018-06-23 stsp if (selected > LINES)
1958 ffd1d5e5 2018-06-23 stsp selected = ndisplayed - 1;
1965 ffd1d5e5 2018-06-23 stsp free(tree_label);
1966 ffd1d5e5 2018-06-23 stsp free(commit_id_str);
1967 d9765a41 2018-06-23 stsp while (!TAILQ_EMPTY(&parents)) {
1968 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *parent;
1969 d9765a41 2018-06-23 stsp parent = TAILQ_FIRST(&parents);
1970 d9765a41 2018-06-23 stsp TAILQ_REMOVE(&parents, parent, entry);
1971 ffd1d5e5 2018-06-23 stsp free(parent);
1974 ffd1d5e5 2018-06-23 stsp if (tree != root)
1975 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
1976 ffd1d5e5 2018-06-23 stsp return err;
1979 ffd1d5e5 2018-06-23 stsp __dead static void
1980 ffd1d5e5 2018-06-23 stsp usage_tree(void)
1983 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
1984 ffd1d5e5 2018-06-23 stsp getprogname());
1988 ffd1d5e5 2018-06-23 stsp static const struct got_error *
1989 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
1991 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
1992 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
1993 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
1994 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
1995 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
1996 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
1997 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
2000 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
2001 ffd1d5e5 2018-06-23 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
2002 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
2005 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
2006 ffd1d5e5 2018-06-23 stsp switch (ch) {
2008 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
2012 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
2016 ffd1d5e5 2018-06-23 stsp argc -= optind;
2017 ffd1d5e5 2018-06-23 stsp argv += optind;
2019 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
2020 ffd1d5e5 2018-06-23 stsp repo_path = getcwd(NULL, 0);
2021 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
2022 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2023 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
2024 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
2025 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
2026 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2028 ffd1d5e5 2018-06-23 stsp usage_log();
2030 ffd1d5e5 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
2031 ffd1d5e5 2018-06-23 stsp free(repo_path);
2032 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2033 ffd1d5e5 2018-06-23 stsp return error;
2035 ffd1d5e5 2018-06-23 stsp if (commit_id_arg == NULL) {
2036 ffd1d5e5 2018-06-23 stsp error = get_head_commit_id(&commit_id, repo);
2037 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2038 ffd1d5e5 2018-06-23 stsp goto done;
2040 ffd1d5e5 2018-06-23 stsp struct got_object *obj;
2041 ffd1d5e5 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_arg);
2042 ffd1d5e5 2018-06-23 stsp if (error == NULL) {
2043 ffd1d5e5 2018-06-23 stsp commit_id = got_object_get_id(obj);
2044 ffd1d5e5 2018-06-23 stsp if (commit_id == NULL)
2045 ffd1d5e5 2018-06-23 stsp error = got_error_from_errno();
2048 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2049 ffd1d5e5 2018-06-23 stsp goto done;
2051 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
2052 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2053 ffd1d5e5 2018-06-23 stsp goto done;
2055 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_tree(&tree, repo, commit->tree_id);
2056 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2057 ffd1d5e5 2018-06-23 stsp goto done;
2059 ffd1d5e5 2018-06-23 stsp error = show_tree_view(tree, commit_id, repo);
2061 ffd1d5e5 2018-06-23 stsp free(commit_id);
2062 ffd1d5e5 2018-06-23 stsp if (commit)
2063 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
2065 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
2067 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
2068 ffd1d5e5 2018-06-23 stsp return error;
2070 5c5136c5 2018-05-20 stsp static void
2071 9f7d7167 2018-04-29 stsp init_curses(void)
2073 9f7d7167 2018-04-29 stsp initscr();
2077 9f7d7167 2018-04-29 stsp intrflush(stdscr, FALSE);
2078 9f7d7167 2018-04-29 stsp keypad(stdscr, TRUE);
2079 1f475ad8 2018-05-10 stsp curs_set(0);
2082 4ed7e80c 2018-05-20 stsp __dead static void
2083 9f7d7167 2018-04-29 stsp usage(void)
2087 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
2088 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
2089 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
2090 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
2091 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
2096 c2301be8 2018-04-30 stsp static char **
2097 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
2099 c2301be8 2018-04-30 stsp char **argv;
2100 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
2102 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
2103 c2301be8 2018-04-30 stsp if (argv == NULL)
2104 c2301be8 2018-04-30 stsp err(1, "calloc");
2105 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
2106 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
2107 c2301be8 2018-04-30 stsp err(1, "calloc");
2108 c2301be8 2018-04-30 stsp if (arg1) {
2109 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
2110 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
2111 c2301be8 2018-04-30 stsp err(1, "calloc");
2114 c2301be8 2018-04-30 stsp return argv;
2118 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
2120 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
2121 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
2122 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
2123 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
2125 9f7d7167 2018-04-29 stsp setlocale(LC_ALL, "");
2127 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
2128 9f7d7167 2018-04-29 stsp switch (ch) {
2130 9f7d7167 2018-04-29 stsp hflag = 1;
2134 9f7d7167 2018-04-29 stsp /* NOTREACHED */
2138 9f7d7167 2018-04-29 stsp argc -= optind;
2139 9f7d7167 2018-04-29 stsp argv += optind;
2140 9f7d7167 2018-04-29 stsp optind = 0;
2141 c2301be8 2018-04-30 stsp optreset = 1;
2143 c2301be8 2018-04-30 stsp if (argc == 0) {
2144 f29d3e89 2018-06-23 stsp if (hflag)
2146 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
2147 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
2148 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
2153 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
2154 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
2155 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
2156 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
2157 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
2158 9f7d7167 2018-04-29 stsp if (hflag)
2159 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
2163 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
2164 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
2165 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
2166 c2301be8 2018-04-30 stsp if (repo_path) {
2167 c2301be8 2018-04-30 stsp struct got_repository *repo;
2168 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
2169 c2301be8 2018-04-30 stsp if (error == NULL)
2170 c2301be8 2018-04-30 stsp got_repo_close(repo);
2172 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
2173 c2301be8 2018-04-30 stsp if (error) {
2174 f29d3e89 2018-06-23 stsp if (hflag) {
2175 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
2176 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
2180 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
2181 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
2182 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
2183 ad7de8d9 2018-04-30 stsp free(repo_path);
2186 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
2187 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
2189 c2301be8 2018-04-30 stsp free(repo_path);
2193 5c5136c5 2018-05-20 stsp init_curses();
2195 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
2196 9f7d7167 2018-04-29 stsp if (error)
2197 9f7d7167 2018-04-29 stsp goto done;
2200 c2301be8 2018-04-30 stsp free(cmd_argv);
2201 9f7d7167 2018-04-29 stsp if (error)
2202 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
