2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 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>
19 25791caa 2018-10-24 stsp #include <sys/ioctl.h>
21 31120ada 2018-04-30 stsp #include <errno.h>
22 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
23 9f7d7167 2018-04-29 stsp #include <curses.h>
24 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
25 9f7d7167 2018-04-29 stsp #include <panel.h>
26 9f7d7167 2018-04-29 stsp #include <locale.h>
27 9f7d7167 2018-04-29 stsp #include <stdlib.h>
28 26ed57b2 2018-05-19 stsp #include <stdio.h>
29 9f7d7167 2018-04-29 stsp #include <getopt.h>
30 9f7d7167 2018-04-29 stsp #include <string.h>
31 9f7d7167 2018-04-29 stsp #include <err.h>
32 80ddbec8 2018-04-29 stsp #include <unistd.h>
33 26ed57b2 2018-05-19 stsp #include <util.h>
34 26ed57b2 2018-05-19 stsp #include <limits.h>
35 61e69b96 2018-05-20 stsp #include <wchar.h>
36 788c352e 2018-06-16 stsp #include <time.h>
37 84451b3e 2018-07-10 stsp #include <pthread.h>
38 5036bf37 2018-09-24 stsp #include <libgen.h>
40 9f7d7167 2018-04-29 stsp #include "got_error.h"
41 80ddbec8 2018-04-29 stsp #include "got_object.h"
42 80ddbec8 2018-04-29 stsp #include "got_reference.h"
43 80ddbec8 2018-04-29 stsp #include "got_repository.h"
44 80ddbec8 2018-04-29 stsp #include "got_diff.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 9ba79e04 2018-06-11 stsp #include "got_commit_graph.h"
47 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
48 a70480e0 2018-06-23 stsp #include "got_blame.h"
49 c2db6724 2019-01-04 stsp #include "got_privsep.h"
50 b7165be3 2019-02-05 stsp #include "got_worktree.h"
53 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
57 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
61 9f7d7167 2018-04-29 stsp #ifndef nitems
62 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
65 9f7d7167 2018-04-29 stsp struct tog_cmd {
66 c2301be8 2018-04-30 stsp const char *name;
67 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
68 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
69 c2301be8 2018-04-30 stsp const char *descr;
72 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
73 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
74 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
75 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
76 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
78 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
79 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
80 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
81 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
83 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
84 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
85 9f7d7167 2018-04-29 stsp "show repository history" },
86 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
87 9f7d7167 2018-04-29 stsp "compare files and directories" },
88 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
89 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
90 ffd1d5e5 2018-06-23 stsp { "tree", cmd_tree, usage_tree,
91 ffd1d5e5 2018-06-23 stsp "browse trees in repository" },
94 d6b05b5b 2018-08-04 stsp enum tog_view_type {
95 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
96 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
97 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
98 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
101 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
102 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
103 ba4f502b 2018-08-04 stsp struct got_object_id *id;
104 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
107 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
108 ba4f502b 2018-08-04 stsp struct commit_queue {
109 ba4f502b 2018-08-04 stsp int ncommits;
110 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
113 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
114 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
116 15a087fe 2019-02-21 stsp int first_displayed_line;
117 15a087fe 2019-02-21 stsp int last_displayed_line;
119 15a087fe 2019-02-21 stsp int diff_context;
120 15a087fe 2019-02-21 stsp struct got_repository *repo;
122 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
123 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
126 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
128 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
129 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
130 1a76625f 2018-10-22 stsp int commits_needed;
131 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
132 1a76625f 2018-10-22 stsp struct commit_queue *commits;
133 1a76625f 2018-10-22 stsp const char *in_repo_path;
134 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
135 1a76625f 2018-10-22 stsp struct got_repository *repo;
136 1a76625f 2018-10-22 stsp int log_complete;
137 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
138 1a76625f 2018-10-22 stsp struct tog_view *view;
139 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
140 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
143 1a76625f 2018-10-22 stsp struct tog_log_view_state {
144 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
145 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
146 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
147 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
148 b01e7d3b 2018-08-04 stsp int selected;
149 b01e7d3b 2018-08-04 stsp char *in_repo_path;
150 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
151 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
152 1a76625f 2018-10-22 stsp sig_atomic_t quit;
153 1a76625f 2018-10-22 stsp pthread_t thread;
154 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
157 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
158 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
159 e9424729 2018-08-04 stsp int nlines;
161 e9424729 2018-08-04 stsp struct tog_view *view;
162 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
166 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
167 e9424729 2018-08-04 stsp const char *path;
168 e9424729 2018-08-04 stsp struct got_repository *repo;
169 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
170 e9424729 2018-08-04 stsp int *complete;
173 e9424729 2018-08-04 stsp struct tog_blame {
175 e9424729 2018-08-04 stsp size_t filesize;
176 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
177 6fcac457 2018-11-19 stsp int nlines;
178 e9424729 2018-08-04 stsp pthread_t thread;
179 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
180 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
181 e9424729 2018-08-04 stsp const char *path;
184 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
185 7cbe629d 2018-08-04 stsp int first_displayed_line;
186 7cbe629d 2018-08-04 stsp int last_displayed_line;
187 7cbe629d 2018-08-04 stsp int selected_line;
188 7cbe629d 2018-08-04 stsp int blame_complete;
191 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
192 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
193 e5a0f69f 2018-08-18 stsp char *path;
194 7cbe629d 2018-08-04 stsp struct got_repository *repo;
195 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
196 e9424729 2018-08-04 stsp struct tog_blame blame;
199 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
200 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
201 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
202 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
203 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
204 ad80ab7b 2018-08-04 stsp int selected;
207 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
209 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
210 ad80ab7b 2018-08-04 stsp char *tree_label;
211 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
212 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
213 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
214 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
215 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
216 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
217 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
218 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
219 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
220 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
224 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
226 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
227 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
228 669b5ffa 2018-10-07 stsp * there is enough screen estate.
230 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
231 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
233 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
234 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
235 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
237 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
238 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
240 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
242 cc3c9aac 2018-08-01 stsp struct tog_view {
243 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
244 26ed57b2 2018-05-19 stsp WINDOW *window;
245 26ed57b2 2018-05-19 stsp PANEL *panel;
246 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
247 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
248 1004088d 2018-09-29 stsp int focussed;
249 669b5ffa 2018-10-07 stsp struct tog_view *parent;
250 669b5ffa 2018-10-07 stsp struct tog_view *child;
251 669b5ffa 2018-10-07 stsp int child_focussed;
253 5dc9f4bc 2018-08-04 stsp /* type-specific state */
254 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
256 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
257 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
258 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
259 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
262 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
263 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
264 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
265 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
268 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
269 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
270 15a087fe 2019-02-21 stsp struct got_repository *);
271 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
272 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
273 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
274 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
276 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
277 23721109 2018-10-22 stsp struct got_object_id *, struct got_repository *, const char *, int);
278 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
279 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
280 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
281 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
283 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
284 5221c383 2018-08-01 stsp struct got_object_id *, struct got_repository *);
285 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
286 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
287 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
288 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
290 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
291 4fc679ca 2018-08-04 stsp struct got_tree_object *, struct got_object_id *, struct got_repository *);
292 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
293 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
294 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
295 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
297 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
299 25791caa 2018-10-24 stsp static void
300 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
302 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
305 e5a0f69f 2018-08-18 stsp static const struct got_error *
306 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
308 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
310 669b5ffa 2018-10-07 stsp if (view->child) {
311 669b5ffa 2018-10-07 stsp view_close(view->child);
312 669b5ffa 2018-10-07 stsp view->child = NULL;
314 e5a0f69f 2018-08-18 stsp if (view->close)
315 e5a0f69f 2018-08-18 stsp err = view->close(view);
316 ea5e7bb5 2018-08-01 stsp if (view->panel)
317 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
318 ea5e7bb5 2018-08-01 stsp if (view->window)
319 ea5e7bb5 2018-08-01 stsp delwin(view->window);
320 ea5e7bb5 2018-08-01 stsp free(view);
321 e5a0f69f 2018-08-18 stsp return err;
324 ea5e7bb5 2018-08-01 stsp static struct tog_view *
325 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
326 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
328 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
330 ea5e7bb5 2018-08-01 stsp if (view == NULL)
331 ea5e7bb5 2018-08-01 stsp return NULL;
333 d6b05b5b 2018-08-04 stsp view->type = type;
334 f7d12f7e 2018-08-01 stsp view->lines = LINES;
335 f7d12f7e 2018-08-01 stsp view->cols = COLS;
336 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
337 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
338 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
339 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
340 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
341 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
342 96a765a8 2018-08-04 stsp view_close(view);
343 ea5e7bb5 2018-08-01 stsp return NULL;
345 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
346 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
347 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
348 96a765a8 2018-08-04 stsp view_close(view);
349 ea5e7bb5 2018-08-01 stsp return NULL;
352 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
353 ea5e7bb5 2018-08-01 stsp return view;
357 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
359 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
361 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
364 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
366 5c60c32a 2018-10-18 stsp static const struct got_error *
367 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
369 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
371 5c60c32a 2018-10-18 stsp view->begin_y = 0;
372 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
373 5c60c32a 2018-10-18 stsp view->nlines = LINES;
374 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
375 5c60c32a 2018-10-18 stsp view->lines = LINES;
376 5c60c32a 2018-10-18 stsp view->cols = COLS;
377 5c60c32a 2018-10-18 stsp err = view_resize(view);
379 5c60c32a 2018-10-18 stsp return err;
381 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
382 5c60c32a 2018-10-18 stsp return got_error_from_errno();
384 5c60c32a 2018-10-18 stsp return NULL;
387 5c60c32a 2018-10-18 stsp static const struct got_error *
388 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
390 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
392 5c60c32a 2018-10-18 stsp view->begin_x = 0;
393 5c60c32a 2018-10-18 stsp view->begin_y = 0;
394 5c60c32a 2018-10-18 stsp view->nlines = LINES;
395 5c60c32a 2018-10-18 stsp view->ncols = COLS;
396 5c60c32a 2018-10-18 stsp view->lines = LINES;
397 5c60c32a 2018-10-18 stsp view->cols = COLS;
398 5c60c32a 2018-10-18 stsp err = view_resize(view);
400 5c60c32a 2018-10-18 stsp return err;
402 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
403 5c60c32a 2018-10-18 stsp return got_error_from_errno();
405 5c60c32a 2018-10-18 stsp return NULL;
409 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
411 5c60c32a 2018-10-18 stsp return view->parent == NULL;
414 4d8c2215 2018-08-19 stsp static const struct got_error *
415 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
417 f7d12f7e 2018-08-01 stsp int nlines, ncols;
419 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
420 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
422 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
424 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
425 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
427 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
429 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
430 0cf4efb1 2018-09-29 stsp return got_error_from_errno();
431 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
432 a6d7eb8d 2018-10-24 stsp return got_error_from_errno();
433 25791caa 2018-10-24 stsp wclear(view->window);
435 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
436 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
437 0cf4efb1 2018-09-29 stsp view->lines = LINES;
438 0cf4efb1 2018-09-29 stsp view->cols = COLS;
440 6e3e5d9c 2018-10-18 stsp if (view->child) {
441 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
442 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
443 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
444 5c60c32a 2018-10-18 stsp if (view->child->focussed)
445 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
447 5c60c32a 2018-10-18 stsp show_panel(view->panel);
449 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
450 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
454 5c60c32a 2018-10-18 stsp return NULL;
457 669b5ffa 2018-10-07 stsp static const struct got_error *
458 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
460 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
462 669b5ffa 2018-10-07 stsp if (view->child == NULL)
463 669b5ffa 2018-10-07 stsp return NULL;
465 669b5ffa 2018-10-07 stsp err = view_close(view->child);
466 669b5ffa 2018-10-07 stsp view->child = NULL;
467 669b5ffa 2018-10-07 stsp return err;
470 669b5ffa 2018-10-07 stsp static const struct got_error *
471 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
473 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
475 669b5ffa 2018-10-07 stsp view->child = child;
476 669b5ffa 2018-10-07 stsp child->parent = view;
477 669b5ffa 2018-10-07 stsp return err;
481 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
483 669b5ffa 2018-10-07 stsp return !view_is_parent_view(view) && view->begin_x > 0;
486 25791caa 2018-10-24 stsp static void
487 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
489 25791caa 2018-10-24 stsp int cols, lines;
490 25791caa 2018-10-24 stsp struct winsize size;
492 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
493 25791caa 2018-10-24 stsp cols = 80; /* Default */
494 25791caa 2018-10-24 stsp lines = 24;
496 25791caa 2018-10-24 stsp cols = size.ws_col;
497 25791caa 2018-10-24 stsp lines = size.ws_row;
499 25791caa 2018-10-24 stsp resize_term(lines, cols);
502 0cf4efb1 2018-09-29 stsp static const struct got_error *
503 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
504 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
505 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
507 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
508 669b5ffa 2018-10-07 stsp struct tog_view *v;
509 1a76625f 2018-10-22 stsp int ch, errcode;
511 e5a0f69f 2018-08-18 stsp *new = NULL;
512 e5a0f69f 2018-08-18 stsp *dead = NULL;
513 0cf4efb1 2018-09-29 stsp *focus = NULL;
515 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
516 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
517 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
518 1a76625f 2018-10-22 stsp if (errcode)
519 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
520 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
521 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
522 1a76625f 2018-10-22 stsp if (errcode)
523 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
524 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
526 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
527 25791caa 2018-10-24 stsp tog_resizeterm();
528 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
529 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
530 25791caa 2018-10-24 stsp err = view_resize(v);
532 25791caa 2018-10-24 stsp return err;
533 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
535 25791caa 2018-10-24 stsp return err;
539 e5a0f69f 2018-08-18 stsp switch (ch) {
543 669b5ffa 2018-10-07 stsp if (view->child) {
544 669b5ffa 2018-10-07 stsp *focus = view->child;
545 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
546 669b5ffa 2018-10-07 stsp } else if (view->parent) {
547 669b5ffa 2018-10-07 stsp *focus = view->parent;
548 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 0;
552 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
553 e5a0f69f 2018-08-18 stsp *dead = view;
559 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
560 669b5ffa 2018-10-07 stsp if (view->child == NULL)
562 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view->child)) {
563 669b5ffa 2018-10-07 stsp *focus = view->child;
564 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
565 669b5ffa 2018-10-07 stsp err = view_fullscreen(view->child);
567 669b5ffa 2018-10-07 stsp err = view_splitscreen(view->child);
570 669b5ffa 2018-10-07 stsp err = view->child->input(new, dead, focus,
571 669b5ffa 2018-10-07 stsp view->child, KEY_RESIZE);
573 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view)) {
574 669b5ffa 2018-10-07 stsp *focus = view;
575 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 1;
576 669b5ffa 2018-10-07 stsp err = view_fullscreen(view);
578 669b5ffa 2018-10-07 stsp err = view_splitscreen(view);
582 669b5ffa 2018-10-07 stsp err = view->input(new, dead, focus, view,
583 669b5ffa 2018-10-07 stsp KEY_RESIZE);
586 0cf4efb1 2018-09-29 stsp case KEY_RESIZE:
589 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
593 e5a0f69f 2018-08-18 stsp return err;
597 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
599 0cf4efb1 2018-09-29 stsp PANEL *panel;
600 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
602 669b5ffa 2018-10-07 stsp if (view->parent)
603 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
605 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
606 0cf4efb1 2018-09-29 stsp if (panel == NULL)
609 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
610 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
611 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
615 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
617 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
618 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
620 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
622 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
625 669b5ffa 2018-10-07 stsp return view->focussed;
628 bcbd79e2 2018-08-19 stsp static const struct got_error *
629 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
631 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
632 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
633 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
634 fd823528 2018-10-22 stsp int fast_refresh = 10;
635 1a76625f 2018-10-22 stsp int done = 0, errcode;
637 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
638 1a76625f 2018-10-22 stsp if (errcode)
639 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
641 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
642 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
644 a81bf10d 2018-09-29 stsp main_view = view;
645 1004088d 2018-09-29 stsp view->focussed = 1;
646 878940b7 2018-09-29 stsp err = view->show(view);
648 0cf4efb1 2018-09-29 stsp return err;
649 0cf4efb1 2018-09-29 stsp update_panels();
650 0cf4efb1 2018-09-29 stsp doupdate();
651 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
652 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
653 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
654 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
656 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
657 e4197bf9 2018-08-18 stsp view, &views);
660 e5a0f69f 2018-08-18 stsp if (dead_view) {
661 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
663 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
664 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
665 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
666 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
667 669b5ffa 2018-10-07 stsp prev = view->parent;
669 669b5ffa 2018-10-07 stsp if (dead_view->parent)
670 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
672 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
674 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
675 a81bf10d 2018-09-29 stsp if (err || dead_view == main_view)
678 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
679 0cf4efb1 2018-09-29 stsp if (focus_view)
680 0cf4efb1 2018-09-29 stsp view = focus_view;
681 669b5ffa 2018-10-07 stsp else if (prev)
682 669b5ffa 2018-10-07 stsp view = prev;
683 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
684 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
685 0cf4efb1 2018-09-29 stsp tog_view_list_head);
687 0cf4efb1 2018-09-29 stsp view = NULL;
688 669b5ffa 2018-10-07 stsp if (view) {
689 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
690 669b5ffa 2018-10-07 stsp focus_view = view->child;
692 669b5ffa 2018-10-07 stsp focus_view = view;
696 bcbd79e2 2018-08-19 stsp if (new_view) {
697 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
698 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
699 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
700 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
702 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
703 86c66b02 2018-10-18 stsp err = view_close(v);
708 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
709 fed7eaa8 2018-10-24 stsp view = new_view;
710 878940b7 2018-09-29 stsp if (focus_view == NULL)
711 878940b7 2018-09-29 stsp focus_view = new_view;
713 0cf4efb1 2018-09-29 stsp if (focus_view) {
714 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
716 0cf4efb1 2018-09-29 stsp view->focussed = 0;
717 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
718 0cf4efb1 2018-09-29 stsp view = focus_view;
719 878940b7 2018-09-29 stsp if (new_view)
720 878940b7 2018-09-29 stsp show_panel(new_view->panel);
721 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
722 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
724 669b5ffa 2018-10-07 stsp if (view) {
725 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
726 758194b5 2018-10-24 stsp view->focussed = 1;
727 758194b5 2018-10-24 stsp show_panel(view->panel);
728 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
729 758194b5 2018-10-24 stsp show_panel(view->child->panel);
730 1a76625f 2018-10-22 stsp focus_view = view;
732 669b5ffa 2018-10-07 stsp if (view->parent) {
733 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
737 669b5ffa 2018-10-07 stsp err = view->show(view);
740 669b5ffa 2018-10-07 stsp if (view->child) {
741 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
745 1a76625f 2018-10-22 stsp update_panels();
746 1a76625f 2018-10-22 stsp doupdate();
750 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
751 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
752 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
753 e5a0f69f 2018-08-18 stsp view_close(view);
756 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
757 1a76625f 2018-10-22 stsp if (errcode)
758 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
760 e5a0f69f 2018-08-18 stsp return err;
763 4ed7e80c 2018-05-20 stsp __dead static void
764 9f7d7167 2018-04-29 stsp usage_log(void)
767 c70c5802 2018-08-01 stsp fprintf(stderr,
768 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
769 9f7d7167 2018-04-29 stsp getprogname());
773 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
774 80ddbec8 2018-04-29 stsp static const struct got_error *
775 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
777 00dfcb92 2018-06-11 stsp char *vis = NULL;
778 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
780 963b370f 2018-05-20 stsp *ws = NULL;
781 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
782 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
783 00dfcb92 2018-06-11 stsp int vislen;
784 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
785 00dfcb92 2018-06-11 stsp return got_error_from_errno();
787 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
788 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
790 00dfcb92 2018-06-11 stsp return err;
791 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
792 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
793 a7f50699 2018-06-11 stsp err = got_error_from_errno(); /* give up */
798 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
799 a7f50699 2018-06-11 stsp if (*ws == NULL) {
800 a7f50699 2018-06-11 stsp err = got_error_from_errno();
804 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
805 963b370f 2018-05-20 stsp err = got_error_from_errno();
810 963b370f 2018-05-20 stsp *ws = NULL;
813 963b370f 2018-05-20 stsp return err;
816 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
817 963b370f 2018-05-20 stsp static const struct got_error *
818 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
820 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
821 963b370f 2018-05-20 stsp int cols = 0;
822 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
823 963b370f 2018-05-20 stsp size_t wlen;
826 963b370f 2018-05-20 stsp *wlinep = NULL;
827 b700b5d6 2018-07-10 stsp *widthp = 0;
829 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
831 963b370f 2018-05-20 stsp return err;
834 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
835 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
836 963b370f 2018-05-20 stsp switch (width) {
842 3c1f04f1 2018-09-13 stsp if (cols + width <= wlimit)
843 b700b5d6 2018-07-10 stsp cols += width;
847 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
848 b700b5d6 2018-07-10 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
852 963b370f 2018-05-20 stsp err = got_error_from_errno();
856 963b370f 2018-05-20 stsp wline[i] = L'\0';
857 b700b5d6 2018-07-10 stsp if (widthp)
858 b700b5d6 2018-07-10 stsp *widthp = cols;
861 963b370f 2018-05-20 stsp free(wline);
863 963b370f 2018-05-20 stsp *wlinep = wline;
864 963b370f 2018-05-20 stsp return err;
867 963b370f 2018-05-20 stsp static const struct got_error *
868 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
869 2814baeb 2018-08-01 stsp struct got_object_id *id)
871 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
872 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
873 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
874 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
875 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
876 bb737323 2018-05-20 stsp int author_width, logmsg_width;
877 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
878 80ddbec8 2018-04-29 stsp char *line = NULL;
879 bb737323 2018-05-20 stsp int col, limit;
880 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
881 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
882 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
883 ccb26ccd 2018-11-05 stsp struct tm tm;
884 45d799e2 2018-12-23 stsp time_t committer_time;
886 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
887 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
888 ccb26ccd 2018-11-05 stsp return got_error_from_errno();
889 ccb26ccd 2018-11-05 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
890 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
891 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
893 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
894 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
896 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
897 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
898 b39d25c7 2018-07-10 stsp col = limit + 1;
899 b39d25c7 2018-07-10 stsp if (col > avail)
902 45d799e2 2018-12-23 stsp author0 = strdup(got_object_commit_get_author(commit));
903 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
904 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
907 6d9fbc00 2018-04-29 stsp author = author0;
908 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
909 6d9fbc00 2018-04-29 stsp if (smallerthan)
910 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
912 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
914 6d9fbc00 2018-04-29 stsp *at = '\0';
916 b39d25c7 2018-07-10 stsp limit = avail - col;
917 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
920 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
921 bb737323 2018-05-20 stsp col += author_width;
922 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
923 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
925 bb737323 2018-05-20 stsp author_width++;
927 9c2eaf34 2018-05-20 stsp if (col > avail)
930 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
931 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
932 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
935 bb737323 2018-05-20 stsp logmsg = logmsg0;
936 bb737323 2018-05-20 stsp while (*logmsg == '\n')
938 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
939 bb737323 2018-05-20 stsp if (newline)
940 bb737323 2018-05-20 stsp *newline = '\0';
941 bb737323 2018-05-20 stsp limit = avail - col;
942 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
945 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
946 bb737323 2018-05-20 stsp col += logmsg_width;
947 bb737323 2018-05-20 stsp while (col <= avail) {
948 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
952 80ddbec8 2018-04-29 stsp free(logmsg0);
953 bb737323 2018-05-20 stsp free(wlogmsg);
954 6d9fbc00 2018-04-29 stsp free(author0);
955 bb737323 2018-05-20 stsp free(wauthor);
956 80ddbec8 2018-04-29 stsp free(line);
957 80ddbec8 2018-04-29 stsp return err;
960 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
961 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
962 899d86c2 2018-05-10 stsp struct got_object_id *id)
964 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
966 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
967 80ddbec8 2018-04-29 stsp if (entry == NULL)
968 899d86c2 2018-05-10 stsp return NULL;
970 899d86c2 2018-05-10 stsp entry->id = id;
971 99db9666 2018-05-07 stsp entry->commit = commit;
972 899d86c2 2018-05-10 stsp return entry;
975 99db9666 2018-05-07 stsp static void
976 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
978 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
980 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
981 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
982 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
983 ecb28ae0 2018-07-16 stsp commits->ncommits--;
984 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
985 99db9666 2018-05-07 stsp free(entry);
988 99db9666 2018-05-07 stsp static void
989 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
991 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
992 99db9666 2018-05-07 stsp pop_commit(commits);
995 c4972b91 2018-05-07 stsp static const struct got_error *
996 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
997 1a76625f 2018-10-22 stsp int minqueue, struct got_repository *repo, const char *path)
999 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1000 93e45b7c 2018-09-24 stsp int nqueued = 0;
1003 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1004 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1005 1a76625f 2018-10-22 stsp * while updating the display.
1007 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
1008 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1009 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1010 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1011 1a76625f 2018-10-22 stsp int errcode;
1013 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1014 9ba79e04 2018-06-11 stsp if (err) {
1015 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1017 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1018 93e45b7c 2018-09-24 stsp minqueue, repo);
1020 ecb28ae0 2018-07-16 stsp return err;
1024 ecb28ae0 2018-07-16 stsp if (id == NULL)
1027 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1030 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1031 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1032 9ba79e04 2018-06-11 stsp err = got_error_from_errno();
1036 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1037 1a76625f 2018-10-22 stsp if (errcode) {
1038 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1042 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1043 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1044 ecb28ae0 2018-07-16 stsp nqueued++;
1045 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1047 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1048 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1049 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1052 9ba79e04 2018-06-11 stsp return err;
1055 99db9666 2018-05-07 stsp static const struct got_error *
1056 9ba79e04 2018-06-11 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1058 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1059 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1061 9ba79e04 2018-06-11 stsp *head_id = NULL;
1063 9ba79e04 2018-06-11 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1065 99db9666 2018-05-07 stsp return err;
1067 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1068 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1069 9ba79e04 2018-06-11 stsp if (err) {
1070 9ba79e04 2018-06-11 stsp *head_id = NULL;
1071 99db9666 2018-05-07 stsp return err;
1074 9ba79e04 2018-06-11 stsp return NULL;
1077 0553a4e3 2018-04-30 stsp static const struct got_error *
1078 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1079 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1080 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1081 1a76625f 2018-10-22 stsp const char *path, int commits_needed)
1083 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1084 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1085 ecb28ae0 2018-07-16 stsp int ncommits, width;
1086 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1087 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1089 e0d42f60 2018-07-22 stsp entry = first;
1090 e0d42f60 2018-07-22 stsp ncommits = 0;
1091 e0d42f60 2018-07-22 stsp while (entry) {
1092 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1093 e0d42f60 2018-07-22 stsp *selected = entry;
1096 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1097 e0d42f60 2018-07-22 stsp ncommits++;
1100 1a76625f 2018-10-22 stsp if (*selected) {
1101 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1103 ecb28ae0 2018-07-16 stsp return err;
1106 1a76625f 2018-10-22 stsp if (asprintf(&ncommits_str, " [%d/%d]%s ",
1107 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1108 1a76625f 2018-10-22 stsp commits_needed == 0 ? "" : " loading...") == -1)
1109 1a76625f 2018-10-22 stsp return got_error_from_errno();
1111 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1112 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1113 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1114 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1115 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1116 1a76625f 2018-10-22 stsp header = NULL;
1117 1a76625f 2018-10-22 stsp goto done;
1119 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1120 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1121 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1122 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1123 1a76625f 2018-10-22 stsp header = NULL;
1124 1a76625f 2018-10-22 stsp goto done;
1126 1a76625f 2018-10-22 stsp err = format_line(&wline, &width, header, view->ncols);
1128 1a76625f 2018-10-22 stsp goto done;
1130 2814baeb 2018-08-01 stsp werase(view->window);
1132 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1133 a3404814 2018-09-02 stsp wstandout(view->window);
1134 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1135 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1136 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1139 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1140 a3404814 2018-09-02 stsp wstandend(view->window);
1141 ecb28ae0 2018-07-16 stsp free(wline);
1142 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1143 1a76625f 2018-10-22 stsp goto done;
1145 899d86c2 2018-05-10 stsp entry = first;
1146 899d86c2 2018-05-10 stsp *last = first;
1147 867c6645 2018-07-10 stsp ncommits = 0;
1148 899d86c2 2018-05-10 stsp while (entry) {
1149 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1151 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1152 2814baeb 2018-08-01 stsp wstandout(view->window);
1153 2814baeb 2018-08-01 stsp err = draw_commit(view, entry->commit, entry->id);
1154 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1155 2814baeb 2018-08-01 stsp wstandend(view->window);
1158 0553a4e3 2018-04-30 stsp ncommits++;
1159 899d86c2 2018-05-10 stsp *last = entry;
1160 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1163 1a57306a 2018-09-02 stsp view_vborder(view);
1165 1a76625f 2018-10-22 stsp free(id_str);
1166 1a76625f 2018-10-22 stsp free(ncommits_str);
1167 1a76625f 2018-10-22 stsp free(header);
1168 80ddbec8 2018-04-29 stsp return err;
1171 07b55e75 2018-05-10 stsp static void
1172 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1173 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1175 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1176 07b55e75 2018-05-10 stsp int nscrolled = 0;
1178 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1179 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
1182 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1183 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1184 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1185 07b55e75 2018-05-10 stsp if (entry) {
1186 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1187 07b55e75 2018-05-10 stsp nscrolled++;
1192 aa075928 2018-05-10 stsp static const struct got_error *
1193 16482c3b 2018-05-20 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1194 93e45b7c 2018-09-24 stsp struct commit_queue_entry **last_displayed_entry,
1195 1a76625f 2018-10-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1196 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1198 aa075928 2018-05-10 stsp const struct got_error *err = NULL;
1199 dd0a52c1 2018-05-20 stsp struct commit_queue_entry *pentry;
1200 aa075928 2018-05-10 stsp int nscrolled = 0;
1202 1a76625f 2018-10-22 stsp if (*last_displayed_entry == NULL)
1203 1a76625f 2018-10-22 stsp return NULL;
1206 93e45b7c 2018-09-24 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1207 7226d972 2019-02-21 stsp if (pentry == NULL) {
1208 7226d972 2019-02-21 stsp *commits_needed = maxscroll + 20;
1209 7226d972 2019-02-21 stsp while (*commits_needed > 0) {
1210 7226d972 2019-02-21 stsp int errcode;
1211 7226d972 2019-02-21 stsp errcode = pthread_cond_signal(need_commits);
1212 7226d972 2019-02-21 stsp if (errcode)
1213 7226d972 2019-02-21 stsp return got_error_set_errno(errcode);
1214 7226d972 2019-02-21 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1215 7226d972 2019-02-21 stsp if (errcode)
1216 7226d972 2019-02-21 stsp return got_error_set_errno(errcode);
1217 7226d972 2019-02-21 stsp pthread_yield();
1218 7226d972 2019-02-21 stsp errcode = pthread_mutex_lock(&tog_mutex);
1219 7226d972 2019-02-21 stsp if (errcode)
1220 7226d972 2019-02-21 stsp return got_error_set_errno(errcode);
1223 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1224 88048b54 2019-02-21 stsp if (pentry == NULL)
1227 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1229 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1230 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1232 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1233 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1235 dd0a52c1 2018-05-20 stsp return err;
1238 cd0acaa7 2018-05-20 stsp static const struct got_error *
1239 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1240 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1241 fb872ab2 2019-02-21 stsp struct tog_view *log_view, struct got_repository *repo)
1243 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1244 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1245 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1247 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1248 15a94983 2018-12-23 stsp if (diff_view == NULL)
1249 15a94983 2018-12-23 stsp return got_error_from_errno();
1251 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1252 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1253 fb872ab2 2019-02-21 stsp commit_id, log_view, repo);
1254 e5a0f69f 2018-08-18 stsp if (err == NULL)
1255 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1256 cd0acaa7 2018-05-20 stsp return err;
1259 80ddbec8 2018-04-29 stsp static const struct got_error *
1260 0cf4efb1 2018-09-29 stsp browse_commit(struct tog_view **new_view, int begin_x,
1261 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *entry, struct got_repository *repo)
1263 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1264 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1265 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1267 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree, repo,
1268 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(entry->commit));
1270 9343a5fb 2018-06-23 stsp return err;
1272 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1273 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1274 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1276 e5a0f69f 2018-08-18 stsp err = open_tree_view(tree_view, tree, entry->id, repo);
1278 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1280 e5a0f69f 2018-08-18 stsp *new_view = tree_view;
1281 1a76625f 2018-10-22 stsp return err;
1284 1a76625f 2018-10-22 stsp static void *
1285 1a76625f 2018-10-22 stsp log_thread(void *arg)
1287 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1288 1a76625f 2018-10-22 stsp int errcode = 0;
1289 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1290 1a76625f 2018-10-22 stsp int done = 0;
1292 1a76625f 2018-10-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1294 1a76625f 2018-10-22 stsp return (void *)err;
1296 1a76625f 2018-10-22 stsp while (!done && !err) {
1297 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1298 1a76625f 2018-10-22 stsp a->in_repo_path);
1299 1a76625f 2018-10-22 stsp if (err) {
1300 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1301 1a76625f 2018-10-22 stsp return (void *)err;
1302 1a76625f 2018-10-22 stsp err = NULL;
1304 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1305 1a76625f 2018-10-22 stsp a->commits_needed--;
1307 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1308 1a76625f 2018-10-22 stsp if (errcode)
1309 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
1312 1a76625f 2018-10-22 stsp a->log_complete = 1;
1313 1a76625f 2018-10-22 stsp else if (*a->quit) {
1315 1a76625f 2018-10-22 stsp a->log_complete = 1;
1316 1a76625f 2018-10-22 stsp } else if (*a->first_displayed_entry == NULL) {
1317 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1318 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1319 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1323 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1324 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1325 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1326 1a76625f 2018-10-22 stsp &tog_mutex);
1327 1a76625f 2018-10-22 stsp if (errcode)
1328 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1331 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1332 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1333 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1335 1a76625f 2018-10-22 stsp return (void *)err;
1338 1a76625f 2018-10-22 stsp static const struct got_error *
1339 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1341 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1342 1a76625f 2018-10-22 stsp int errcode;
1344 1a76625f 2018-10-22 stsp if (s->thread) {
1345 1a76625f 2018-10-22 stsp s->quit = 1;
1346 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1347 1a76625f 2018-10-22 stsp if (errcode)
1348 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1349 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1350 1a76625f 2018-10-22 stsp if (errcode)
1351 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1352 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1353 1a76625f 2018-10-22 stsp if (errcode)
1354 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1355 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1356 1a76625f 2018-10-22 stsp if (errcode)
1357 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1358 1a76625f 2018-10-22 stsp s->thread = NULL;
1361 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1362 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1363 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1365 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1366 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1367 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1370 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1371 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1372 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1375 9343a5fb 2018-06-23 stsp return err;
1378 9343a5fb 2018-06-23 stsp static const struct got_error *
1379 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1381 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1382 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1384 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1385 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1386 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1387 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1388 1a76625f 2018-10-22 stsp free(s->start_id);
1389 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1390 1a76625f 2018-10-22 stsp return err;
1393 1a76625f 2018-10-22 stsp static const struct got_error *
1394 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1395 23721109 2018-10-22 stsp struct got_repository *repo, const char *path, int check_disk)
1397 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1398 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1399 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1400 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1401 1a76625f 2018-10-22 stsp int errcode;
1403 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1404 ecb28ae0 2018-07-16 stsp if (err != NULL)
1405 ecb28ae0 2018-07-16 stsp goto done;
1407 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1408 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1409 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1411 fb2756b9 2018-08-04 stsp s->repo = repo;
1412 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1413 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1414 5036bf37 2018-09-24 stsp err = got_error_from_errno();
1415 5036bf37 2018-09-24 stsp goto done;
1418 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1419 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1420 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1422 1a76625f 2018-10-22 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1424 1a76625f 2018-10-22 stsp goto done;
1425 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1426 1a76625f 2018-10-22 stsp 0, thread_repo);
1428 1a76625f 2018-10-22 stsp goto done;
1430 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1431 1a76625f 2018-10-22 stsp if (errcode) {
1432 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1433 1a76625f 2018-10-22 stsp goto done;
1436 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1437 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1438 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1439 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1440 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1441 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1442 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1443 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1444 1a76625f 2018-10-22 stsp s->thread_args.view = view;
1445 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1446 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1449 1a76625f 2018-10-22 stsp close_log_view(view);
1450 ba4f502b 2018-08-04 stsp return err;
1453 e5a0f69f 2018-08-18 stsp static const struct got_error *
1454 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1456 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1458 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1459 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1460 2b380cc8 2018-10-24 stsp &s->thread_args);
1461 2b380cc8 2018-10-24 stsp if (errcode)
1462 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
1465 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1466 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1467 1a76625f 2018-10-22 stsp &s->commits, s->selected, view->nlines,
1468 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
1471 e5a0f69f 2018-08-18 stsp static const struct got_error *
1472 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1473 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1475 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1476 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1477 5036bf37 2018-09-24 stsp char *parent_path;
1478 669b5ffa 2018-10-07 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
1479 669b5ffa 2018-10-07 stsp int begin_x = 0;
1481 e5a0f69f 2018-08-18 stsp switch (ch) {
1483 1a76625f 2018-10-22 stsp s->quit = 1;
1486 e5a0f69f 2018-08-18 stsp case KEY_UP:
1489 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1491 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1492 e5a0f69f 2018-08-18 stsp s->selected--;
1493 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1495 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry, 1,
1496 e5a0f69f 2018-08-18 stsp &s->commits);
1498 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1499 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1501 e5a0f69f 2018-08-18 stsp if (TAILQ_FIRST(&s->commits.head) ==
1502 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
1503 e5a0f69f 2018-08-18 stsp s->selected = 0;
1506 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry,
1507 e5a0f69f 2018-08-18 stsp view->nlines, &s->commits);
1510 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1513 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1515 e5a0f69f 2018-08-18 stsp if (s->selected < MIN(view->nlines - 2,
1516 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1517 e5a0f69f 2018-08-18 stsp s->selected++;
1520 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry, 1,
1521 93e45b7c 2018-09-24 stsp &s->last_displayed_entry, &s->commits,
1522 1a76625f 2018-10-22 stsp &s->thread_args.log_complete,
1523 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1524 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1526 e5a0f69f 2018-08-18 stsp case KEY_NPAGE: {
1527 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *first;
1528 e5a0f69f 2018-08-18 stsp first = s->first_displayed_entry;
1529 2b380cc8 2018-10-24 stsp if (first == NULL)
1531 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry,
1532 93e45b7c 2018-09-24 stsp view->nlines, &s->last_displayed_entry,
1533 1a76625f 2018-10-22 stsp &s->commits, &s->thread_args.log_complete,
1534 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1535 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1536 e5a0f69f 2018-08-18 stsp if (first == s->first_displayed_entry &&
1537 e5a0f69f 2018-08-18 stsp s->selected < MIN(view->nlines - 2,
1538 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1539 e5a0f69f 2018-08-18 stsp /* can't scroll further down */
1540 e5a0f69f 2018-08-18 stsp s->selected = MIN(view->nlines - 2,
1541 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1);
1543 e5a0f69f 2018-08-18 stsp err = NULL;
1546 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
1547 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines - 2)
1548 e5a0f69f 2018-08-18 stsp s->selected = view->nlines - 2;
1549 e5a0f69f 2018-08-18 stsp if (s->selected > s->commits.ncommits - 1)
1550 e5a0f69f 2018-08-18 stsp s->selected = s->commits.ncommits - 1;
1552 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
1553 e5a0f69f 2018-08-18 stsp case '\r':
1554 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1556 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1557 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1558 669b5ffa 2018-10-07 stsp err = open_diff_view_for_commit(&diff_view, begin_x,
1559 fb872ab2 2019-02-21 stsp s->selected_entry->commit, s->selected_entry->id,
1560 fb872ab2 2019-02-21 stsp view, s->repo);
1563 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1564 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1566 669b5ffa 2018-10-07 stsp return err;
1567 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
1568 669b5ffa 2018-10-07 stsp if (err) {
1569 669b5ffa 2018-10-07 stsp view_close(diff_view);
1572 55566b34 2018-11-05 stsp *focus_view = diff_view;
1573 55566b34 2018-11-05 stsp view->child_focussed = 1;
1575 669b5ffa 2018-10-07 stsp *new_view = diff_view;
1578 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1580 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1581 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1582 669b5ffa 2018-10-07 stsp err = browse_commit(&tree_view, begin_x,
1583 0cf4efb1 2018-09-29 stsp s->selected_entry, s->repo);
1586 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1587 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1589 669b5ffa 2018-10-07 stsp return err;
1590 669b5ffa 2018-10-07 stsp err = view_set_child(view, tree_view);
1591 669b5ffa 2018-10-07 stsp if (err) {
1592 669b5ffa 2018-10-07 stsp view_close(tree_view);
1595 669b5ffa 2018-10-07 stsp *focus_view = tree_view;
1596 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
1598 669b5ffa 2018-10-07 stsp *new_view = tree_view;
1600 5036bf37 2018-09-24 stsp case KEY_BACKSPACE:
1601 5036bf37 2018-09-24 stsp if (strcmp(s->in_repo_path, "/") == 0)
1603 5036bf37 2018-09-24 stsp parent_path = dirname(s->in_repo_path);
1604 5036bf37 2018-09-24 stsp if (parent_path && strcmp(parent_path, ".") != 0) {
1605 5036bf37 2018-09-24 stsp struct tog_view *lv;
1606 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1608 1a76625f 2018-10-22 stsp return err;
1609 0cf4efb1 2018-09-29 stsp lv = view_open(view->nlines, view->ncols,
1610 0cf4efb1 2018-09-29 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
1611 5036bf37 2018-09-24 stsp if (lv == NULL)
1612 5036bf37 2018-09-24 stsp return got_error_from_errno();
1613 5036bf37 2018-09-24 stsp err = open_log_view(lv, s->start_id, s->repo,
1614 23721109 2018-10-22 stsp parent_path, 0);
1616 1a76625f 2018-10-22 stsp return err;;
1617 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1618 669b5ffa 2018-10-07 stsp *new_view = lv;
1620 669b5ffa 2018-10-07 stsp view_set_child(view->parent, lv);
1621 34095730 2018-10-22 stsp *focus_view = lv;
1623 1a76625f 2018-10-22 stsp return NULL;
1630 80ddbec8 2018-04-29 stsp return err;
1633 4ed7e80c 2018-05-20 stsp static const struct got_error *
1634 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
1636 c2db6724 2019-01-04 stsp const struct got_error *error;
1638 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
1639 c2db6724 2019-01-04 stsp return got_error_from_errno();
1641 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
1642 c2db6724 2019-01-04 stsp return got_error_from_errno();
1644 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
1645 c2db6724 2019-01-04 stsp return got_error_from_errno();
1647 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
1648 c2db6724 2019-01-04 stsp if (error != NULL)
1649 c2db6724 2019-01-04 stsp return error;
1651 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
1652 c2db6724 2019-01-04 stsp return got_error_from_errno();
1654 c2db6724 2019-01-04 stsp return NULL;
1657 a915003a 2019-02-05 stsp static void
1658 a915003a 2019-02-05 stsp init_curses(void)
1660 a915003a 2019-02-05 stsp initscr();
1662 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
1665 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
1666 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
1667 a915003a 2019-02-05 stsp curs_set(0);
1668 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
1671 c2db6724 2019-01-04 stsp static const struct got_error *
1672 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
1674 80ddbec8 2018-04-29 stsp const struct got_error *error;
1675 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
1676 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
1677 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
1678 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
1680 04cc582a 2018-08-01 stsp struct tog_view *view;
1682 80ddbec8 2018-04-29 stsp #ifndef PROFILE
1683 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1684 c2db6724 2019-01-04 stsp NULL) == -1)
1685 80ddbec8 2018-04-29 stsp err(1, "pledge");
1688 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1689 80ddbec8 2018-04-29 stsp switch (ch) {
1691 80ddbec8 2018-04-29 stsp start_commit = optarg;
1694 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1695 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
1696 ecb28ae0 2018-07-16 stsp err(1, "-r option");
1700 80ddbec8 2018-04-29 stsp /* NOTREACHED */
1704 80ddbec8 2018-04-29 stsp argc -= optind;
1705 80ddbec8 2018-04-29 stsp argv += optind;
1707 ecb28ae0 2018-07-16 stsp if (argc == 0)
1708 ecb28ae0 2018-07-16 stsp path = strdup("");
1709 ecb28ae0 2018-07-16 stsp else if (argc == 1)
1710 ecb28ae0 2018-07-16 stsp path = strdup(argv[0]);
1712 80ddbec8 2018-04-29 stsp usage_log();
1713 ecb28ae0 2018-07-16 stsp if (path == NULL)
1714 ecb28ae0 2018-07-16 stsp return got_error_from_errno();
1716 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
1717 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
1718 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1719 ecb28ae0 2018-07-16 stsp goto done;
1721 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1722 b7165be3 2019-02-05 stsp struct got_worktree *worktree;
1723 b7165be3 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1724 b7165be3 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1725 b7165be3 2019-02-05 stsp goto done;
1726 b7165be3 2019-02-05 stsp if (worktree) {
1727 b7165be3 2019-02-05 stsp repo_path =
1728 b7165be3 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1729 b7165be3 2019-02-05 stsp got_worktree_close(worktree);
1731 b7165be3 2019-02-05 stsp repo_path = strdup(cwd);
1732 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1733 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1734 ecb28ae0 2018-07-16 stsp goto done;
1738 a915003a 2019-02-05 stsp init_curses();
1740 c2db6724 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
1741 c2db6724 2019-01-04 stsp if (error)
1742 c2db6724 2019-01-04 stsp goto done;
1744 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
1745 80ddbec8 2018-04-29 stsp if (error != NULL)
1746 ecb28ae0 2018-07-16 stsp goto done;
1748 15a94983 2018-12-23 stsp if (start_commit == NULL)
1749 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
1751 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&start_id, repo,
1752 15a94983 2018-12-23 stsp start_commit);
1753 80ddbec8 2018-04-29 stsp if (error != NULL)
1754 ecb28ae0 2018-07-16 stsp goto done;
1756 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1757 04cc582a 2018-08-01 stsp if (view == NULL) {
1758 04cc582a 2018-08-01 stsp error = got_error_from_errno();
1759 04cc582a 2018-08-01 stsp goto done;
1761 23721109 2018-10-22 stsp error = open_log_view(view, start_id, repo, path, 1);
1762 ba4f502b 2018-08-04 stsp if (error)
1763 ba4f502b 2018-08-04 stsp goto done;
1764 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1766 ecb28ae0 2018-07-16 stsp free(repo_path);
1767 ecb28ae0 2018-07-16 stsp free(cwd);
1768 ecb28ae0 2018-07-16 stsp free(path);
1769 899d86c2 2018-05-10 stsp free(start_id);
1771 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
1772 80ddbec8 2018-04-29 stsp return error;
1775 4ed7e80c 2018-05-20 stsp __dead static void
1776 9f7d7167 2018-04-29 stsp usage_diff(void)
1779 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1780 9f7d7167 2018-04-29 stsp getprogname());
1784 b304db33 2018-05-20 stsp static char *
1785 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
1787 b304db33 2018-05-20 stsp char *line;
1788 b304db33 2018-05-20 stsp size_t linelen;
1789 b304db33 2018-05-20 stsp size_t lineno;
1790 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
1792 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
1794 b304db33 2018-05-20 stsp *len = linelen;
1795 b304db33 2018-05-20 stsp return line;
1798 4ed7e80c 2018-05-20 stsp static const struct got_error *
1799 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1800 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
1801 a3404814 2018-09-02 stsp char * header)
1803 61e69b96 2018-05-20 stsp const struct got_error *err;
1804 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
1805 b304db33 2018-05-20 stsp char *line;
1806 b304db33 2018-05-20 stsp size_t len;
1807 61e69b96 2018-05-20 stsp wchar_t *wline;
1808 e0b650dd 2018-05-20 stsp int width;
1810 26ed57b2 2018-05-19 stsp rewind(f);
1811 f7d12f7e 2018-08-01 stsp werase(view->window);
1813 a3404814 2018-09-02 stsp if (header) {
1814 a3404814 2018-09-02 stsp err = format_line(&wline, &width, header, view->ncols);
1815 a3404814 2018-09-02 stsp if (err) {
1816 a3404814 2018-09-02 stsp return err;
1819 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1820 a3404814 2018-09-02 stsp wstandout(view->window);
1821 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
1822 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1823 a3404814 2018-09-02 stsp wstandend(view->window);
1824 a3404814 2018-09-02 stsp if (width < view->ncols)
1825 a3404814 2018-09-02 stsp waddch(view->window, '\n');
1827 a3404814 2018-09-02 stsp if (max_lines <= 1)
1828 a3404814 2018-09-02 stsp return NULL;
1829 a3404814 2018-09-02 stsp max_lines--;
1833 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
1834 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
1835 26ed57b2 2018-05-19 stsp if (line == NULL) {
1839 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
1840 26ed57b2 2018-05-19 stsp free(line);
1844 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1845 61e69b96 2018-05-20 stsp if (err) {
1846 61e69b96 2018-05-20 stsp free(line);
1847 61e69b96 2018-05-20 stsp return err;
1849 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1850 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1851 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1852 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
1853 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
1854 26ed57b2 2018-05-19 stsp free(line);
1855 2550e4c3 2018-07-13 stsp free(wline);
1856 2550e4c3 2018-07-13 stsp wline = NULL;
1858 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
1860 1a57306a 2018-09-02 stsp view_vborder(view);
1862 26ed57b2 2018-05-19 stsp return NULL;
1865 abd2672a 2018-12-23 stsp static char *
1866 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
1868 abd2672a 2018-12-23 stsp char *p, *s = ctime_r(time, datebuf);
1869 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
1871 abd2672a 2018-12-23 stsp *p = '\0';
1875 4ed7e80c 2018-05-20 stsp static const struct got_error *
1876 15a94983 2018-12-23 stsp write_commit_info(struct got_object_id *commit_id, struct got_repository *repo,
1877 abd2672a 2018-12-23 stsp FILE *outfile)
1879 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
1880 abd2672a 2018-12-23 stsp char datebuf[26];
1881 15a94983 2018-12-23 stsp struct got_commit_object *commit;
1882 15a94983 2018-12-23 stsp char *id_str = NULL;
1883 45d799e2 2018-12-23 stsp time_t committer_time;
1884 45d799e2 2018-12-23 stsp const char *author, *committer;
1886 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
1888 abd2672a 2018-12-23 stsp return err;
1890 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
1891 15a94983 2018-12-23 stsp if (err) {
1892 15a94983 2018-12-23 stsp err = got_error_from_errno();
1893 15a94983 2018-12-23 stsp goto done;
1896 c1124f18 2018-12-23 stsp if (fprintf(outfile, "commit %s\n", id_str) < 0) {
1897 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1898 abd2672a 2018-12-23 stsp goto done;
1900 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
1901 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
1902 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1903 abd2672a 2018-12-23 stsp goto done;
1905 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1906 abd2672a 2018-12-23 stsp if (fprintf(outfile, "date: %s UTC\n",
1907 45d799e2 2018-12-23 stsp get_datestr(&committer_time, datebuf)) < 0) {
1908 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1909 abd2672a 2018-12-23 stsp goto done;
1911 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1912 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1913 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
1914 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
1915 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1916 abd2672a 2018-12-23 stsp goto done;
1918 45d799e2 2018-12-23 stsp if (fprintf(outfile, "%s\n",
1919 45d799e2 2018-12-23 stsp got_object_commit_get_logmsg(commit)) < 0) {
1920 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1921 abd2672a 2018-12-23 stsp goto done;
1924 abd2672a 2018-12-23 stsp free(id_str);
1925 15a94983 2018-12-23 stsp got_object_commit_close(commit);
1926 abd2672a 2018-12-23 stsp return err;
1929 abd2672a 2018-12-23 stsp static const struct got_error *
1930 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
1932 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
1933 48ae06ee 2018-10-18 stsp FILE *f = NULL;
1934 15a94983 2018-12-23 stsp int obj_type;
1936 511a516b 2018-05-19 stsp f = got_opentemp();
1937 48ae06ee 2018-10-18 stsp if (f == NULL) {
1938 48ae06ee 2018-10-18 stsp err = got_error_from_errno();
1939 48ae06ee 2018-10-18 stsp goto done;
1941 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
1942 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
1943 fb43ecf1 2019-02-11 stsp goto done;
1947 15a94983 2018-12-23 stsp if (s->id1)
1948 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
1950 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
1952 15a94983 2018-12-23 stsp goto done;
1954 15a94983 2018-12-23 stsp switch (obj_type) {
1955 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
1956 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
1957 54156555 2018-12-24 stsp s->diff_context, s->repo, f);
1959 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
1960 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
1961 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
1963 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
1964 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1965 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
1966 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
1968 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
1971 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
1972 15a087fe 2019-02-21 stsp if (s->id1 == NULL)
1973 15a087fe 2019-02-21 stsp write_commit_info(s->id2, s->repo, f);
1975 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
1976 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
1977 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
1978 15a087fe 2019-02-21 stsp write_commit_info(s->id2, s->repo, f);
1983 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
1985 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
1986 15a94983 2018-12-23 stsp s->diff_context, s->repo, f);
1990 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1994 cbe7f848 2019-02-11 stsp if (f && fflush(f) != 0 && err == NULL)
1995 cbe7f848 2019-02-11 stsp err = got_error_from_errno();
1996 48ae06ee 2018-10-18 stsp return err;
1999 48ae06ee 2018-10-18 stsp static const struct got_error *
2000 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
2001 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
2002 15a087fe 2019-02-21 stsp struct got_repository *repo)
2004 48ae06ee 2018-10-18 stsp const struct got_error *err;
2006 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
2007 15a94983 2018-12-23 stsp int type1, type2;
2008 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
2010 15a94983 2018-12-23 stsp return err;
2011 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
2013 15a94983 2018-12-23 stsp return err;
2015 15a94983 2018-12-23 stsp if (type1 != type2)
2016 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
2019 15a94983 2018-12-23 stsp if (id1) {
2020 15a94983 2018-12-23 stsp view->state.diff.id1 = got_object_id_dup(id1);
2021 15a94983 2018-12-23 stsp if (view->state.diff.id1 == NULL)
2022 48ae06ee 2018-10-18 stsp return got_error_from_errno();
2024 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2026 15a94983 2018-12-23 stsp view->state.diff.id2 = got_object_id_dup(id2);
2027 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
2028 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2029 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2030 48ae06ee 2018-10-18 stsp return got_error_from_errno();
2032 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
2033 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
2034 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
2035 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
2036 fb872ab2 2019-02-21 stsp view->state.diff.log_view = log_view;
2037 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
2039 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
2040 48ae06ee 2018-10-18 stsp if (err) {
2041 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2042 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2043 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2044 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2045 48ae06ee 2018-10-18 stsp return err;
2048 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
2049 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
2050 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
2052 5dc9f4bc 2018-08-04 stsp return NULL;
2055 e5a0f69f 2018-08-18 stsp static const struct got_error *
2056 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
2058 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2060 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2061 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2062 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2063 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2064 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2065 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2066 e5a0f69f 2018-08-18 stsp return err;
2069 5dc9f4bc 2018-08-04 stsp static const struct got_error *
2070 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
2072 a3404814 2018-09-02 stsp const struct got_error *err;
2073 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
2074 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
2076 a3404814 2018-09-02 stsp if (s->id1) {
2077 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
2079 a3404814 2018-09-02 stsp return err;
2081 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
2083 a3404814 2018-09-02 stsp return err;
2085 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
2086 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2087 a3404814 2018-09-02 stsp err = got_error_from_errno();
2088 a3404814 2018-09-02 stsp free(id_str1);
2089 a3404814 2018-09-02 stsp free(id_str2);
2090 a3404814 2018-09-02 stsp return err;
2092 a3404814 2018-09-02 stsp free(id_str1);
2093 a3404814 2018-09-02 stsp free(id_str2);
2095 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
2096 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
2100 15a087fe 2019-02-21 stsp static const struct got_error *
2101 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
2102 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
2104 d7a04538 2019-02-21 stsp const struct got_error *err;
2105 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
2106 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
2107 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
2109 15a087fe 2019-02-21 stsp free(s->id2);
2110 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
2111 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
2112 15a087fe 2019-02-21 stsp return got_error_from_errno();
2114 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2116 d7a04538 2019-02-21 stsp return err;
2117 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
2118 15a087fe 2019-02-21 stsp free(s->id1);
2119 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
2120 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2122 15a087fe 2019-02-21 stsp return NULL;
2125 0cf4efb1 2018-09-29 stsp static const struct got_error *
2126 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2127 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2129 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
2130 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
2131 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
2132 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
2135 e5a0f69f 2018-08-18 stsp switch (ch) {
2137 e5a0f69f 2018-08-18 stsp case KEY_UP:
2138 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > 1)
2139 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2141 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2143 e5a0f69f 2018-08-18 stsp while (i++ < view->nlines - 1 &&
2144 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2145 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2148 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2149 e5a0f69f 2018-08-18 stsp if (!s->eof)
2150 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2152 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2155 e5a0f69f 2018-08-18 stsp while (!s->eof && i++ < view->nlines - 1) {
2156 e5a0f69f 2018-08-18 stsp char *line;
2157 e5a0f69f 2018-08-18 stsp line = parse_next_line(s->f, NULL);
2158 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2159 e5a0f69f 2018-08-18 stsp if (line == NULL)
2164 48ae06ee 2018-10-18 stsp if (s->diff_context > 0) {
2165 48ae06ee 2018-10-18 stsp s->diff_context--;
2166 48ae06ee 2018-10-18 stsp err = create_diff(s);
2170 4a8520aa 2018-10-18 stsp if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2171 48ae06ee 2018-10-18 stsp s->diff_context++;
2172 48ae06ee 2018-10-18 stsp err = create_diff(s);
2177 fb872ab2 2019-02-21 stsp if (s->log_view == NULL)
2179 fb872ab2 2019-02-21 stsp ls = &s->log_view->state.log;
2180 fb872ab2 2019-02-21 stsp entry = TAILQ_PREV(ls->selected_entry,
2181 15a087fe 2019-02-21 stsp commit_queue_head, entry);
2182 15a087fe 2019-02-21 stsp if (entry == NULL)
2185 6524637e 2019-02-21 stsp err = input_log_view(NULL, NULL, NULL, s->log_view,
2190 15a087fe 2019-02-21 stsp err = set_selected_commit(s, entry);
2194 15a087fe 2019-02-21 stsp s->first_displayed_line = 1;
2195 15a087fe 2019-02-21 stsp s->last_displayed_line = view->nlines;
2197 15a087fe 2019-02-21 stsp err = create_diff(s);
2201 fb872ab2 2019-02-21 stsp if (s->log_view == NULL)
2203 fb872ab2 2019-02-21 stsp ls = &s->log_view->state.log;
2204 fb872ab2 2019-02-21 stsp err = input_log_view(NULL, NULL, NULL, s->log_view,
2205 fb872ab2 2019-02-21 stsp KEY_DOWN);
2209 fb872ab2 2019-02-21 stsp /* Hack: Ensure two commits get loaded. */
2210 fb872ab2 2019-02-21 stsp if (!ls->thread_args.log_complete) {
2211 fb872ab2 2019-02-21 stsp err = input_log_view(NULL, NULL, NULL,
2212 fb872ab2 2019-02-21 stsp s->log_view, KEY_DOWN);
2215 fb872ab2 2019-02-21 stsp err = input_log_view(NULL, NULL, NULL,
2216 fb872ab2 2019-02-21 stsp s->log_view, KEY_UP);
2221 fb872ab2 2019-02-21 stsp entry = TAILQ_NEXT(ls->selected_entry, entry);
2222 15a087fe 2019-02-21 stsp if (entry == NULL)
2225 15a087fe 2019-02-21 stsp err = set_selected_commit(s, entry);
2229 15a087fe 2019-02-21 stsp s->first_displayed_line = 1;
2230 15a087fe 2019-02-21 stsp s->last_displayed_line = view->nlines;
2232 15a087fe 2019-02-21 stsp err = create_diff(s);
2238 bcbd79e2 2018-08-19 stsp return err;
2241 4ed7e80c 2018-05-20 stsp static const struct got_error *
2242 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2244 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2245 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2246 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2247 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2248 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
2250 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2252 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2253 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2254 eb6600df 2019-01-04 stsp NULL) == -1)
2255 26ed57b2 2018-05-19 stsp err(1, "pledge");
2258 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2259 26ed57b2 2018-05-19 stsp switch (ch) {
2262 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2266 26ed57b2 2018-05-19 stsp argc -= optind;
2267 26ed57b2 2018-05-19 stsp argv += optind;
2269 26ed57b2 2018-05-19 stsp if (argc == 0) {
2270 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2271 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2272 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2273 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2274 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2275 15a94983 2018-12-23 stsp id_str1 = argv[0];
2276 15a94983 2018-12-23 stsp id_str2 = argv[1];
2277 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2278 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2279 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2280 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2281 15a94983 2018-12-23 stsp id_str1 = argv[1];
2282 15a94983 2018-12-23 stsp id_str2 = argv[2];
2284 26ed57b2 2018-05-19 stsp usage_diff();
2286 a915003a 2019-02-05 stsp init_curses();
2288 eb6600df 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
2289 eb6600df 2019-01-04 stsp if (error)
2290 eb6600df 2019-01-04 stsp goto done;
2292 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
2293 26ed57b2 2018-05-19 stsp free(repo_path);
2294 26ed57b2 2018-05-19 stsp if (error)
2295 26ed57b2 2018-05-19 stsp goto done;
2297 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
2298 26ed57b2 2018-05-19 stsp if (error)
2299 26ed57b2 2018-05-19 stsp goto done;
2301 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
2302 26ed57b2 2018-05-19 stsp if (error)
2303 26ed57b2 2018-05-19 stsp goto done;
2305 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2306 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
2307 ea5e7bb5 2018-08-01 stsp error = got_error_from_errno();
2308 ea5e7bb5 2018-08-01 stsp goto done;
2310 fb872ab2 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, repo);
2311 5dc9f4bc 2018-08-04 stsp if (error)
2312 5dc9f4bc 2018-08-04 stsp goto done;
2313 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2315 26ed57b2 2018-05-19 stsp got_repo_close(repo);
2316 26ed57b2 2018-05-19 stsp return error;
2319 4ed7e80c 2018-05-20 stsp __dead static void
2320 9f7d7167 2018-04-29 stsp usage_blame(void)
2323 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2324 9f7d7167 2018-04-29 stsp getprogname());
2328 84451b3e 2018-07-10 stsp struct tog_blame_line {
2329 84451b3e 2018-07-10 stsp int annotated;
2330 84451b3e 2018-07-10 stsp struct got_object_id *id;
2333 4ed7e80c 2018-05-20 stsp static const struct got_error *
2334 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2335 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
2336 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
2337 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
2339 84451b3e 2018-07-10 stsp const struct got_error *err;
2340 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
2341 84451b3e 2018-07-10 stsp char *line;
2342 84451b3e 2018-07-10 stsp size_t len;
2343 84451b3e 2018-07-10 stsp wchar_t *wline;
2344 b700b5d6 2018-07-10 stsp int width, wlimit;
2345 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
2346 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
2347 ab089a2a 2018-07-12 stsp char *id_str;
2349 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
2351 ab089a2a 2018-07-12 stsp return err;
2353 84451b3e 2018-07-10 stsp rewind(f);
2354 f7d12f7e 2018-08-01 stsp werase(view->window);
2356 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
2357 ab089a2a 2018-07-12 stsp err = got_error_from_errno();
2358 ab089a2a 2018-07-12 stsp free(id_str);
2359 ab089a2a 2018-07-12 stsp return err;
2362 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2363 ab089a2a 2018-07-12 stsp free(line);
2364 2550e4c3 2018-07-13 stsp line = NULL;
2365 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2366 a3404814 2018-09-02 stsp wstandout(view->window);
2367 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2368 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2369 a3404814 2018-09-02 stsp wstandend(view->window);
2370 2550e4c3 2018-07-13 stsp free(wline);
2371 2550e4c3 2018-07-13 stsp wline = NULL;
2372 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2373 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2375 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
2376 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
2377 12a0b23b 2018-07-12 stsp blame_complete ? "" : "annotating ", path) == -1) {
2378 ab089a2a 2018-07-12 stsp free(id_str);
2379 3f60a8ef 2018-07-10 stsp return got_error_from_errno();
2381 ab089a2a 2018-07-12 stsp free(id_str);
2382 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2383 3f60a8ef 2018-07-10 stsp free(line);
2384 2550e4c3 2018-07-13 stsp line = NULL;
2386 3f60a8ef 2018-07-10 stsp return err;
2387 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2388 2550e4c3 2018-07-13 stsp free(wline);
2389 2550e4c3 2018-07-13 stsp wline = NULL;
2390 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2391 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2394 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
2395 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
2396 84451b3e 2018-07-10 stsp if (line == NULL) {
2400 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
2401 84451b3e 2018-07-10 stsp free(line);
2405 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2406 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
2407 84451b3e 2018-07-10 stsp if (err) {
2408 84451b3e 2018-07-10 stsp free(line);
2409 84451b3e 2018-07-10 stsp return err;
2412 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2413 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2415 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
2416 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
2417 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
2418 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
2419 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
2420 84451b3e 2018-07-10 stsp char *id_str;
2421 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
2422 84451b3e 2018-07-10 stsp if (err) {
2423 84451b3e 2018-07-10 stsp free(line);
2424 2550e4c3 2018-07-13 stsp free(wline);
2425 84451b3e 2018-07-10 stsp return err;
2427 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
2428 84451b3e 2018-07-10 stsp free(id_str);
2429 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
2431 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
2432 ee41ec32 2018-07-10 stsp prev_id = NULL;
2435 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2436 b700b5d6 2018-07-10 stsp while (width < wlimit) {
2437 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
2440 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2441 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2442 84451b3e 2018-07-10 stsp if (++nprinted == 1)
2443 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
2444 84451b3e 2018-07-10 stsp free(line);
2445 2550e4c3 2018-07-13 stsp free(wline);
2446 2550e4c3 2018-07-13 stsp wline = NULL;
2448 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
2450 1a57306a 2018-09-02 stsp view_vborder(view);
2452 84451b3e 2018-07-10 stsp return NULL;
2455 84451b3e 2018-07-10 stsp static const struct got_error *
2456 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2458 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
2459 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
2460 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
2461 1a76625f 2018-10-22 stsp int errcode;
2463 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
2464 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2465 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
2467 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2468 1a76625f 2018-10-22 stsp if (errcode)
2469 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2471 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
2472 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
2473 d68a0a7d 2018-07-10 stsp goto done;
2476 d68a0a7d 2018-07-10 stsp if (lineno == -1)
2477 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
2479 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
2480 d68a0a7d 2018-07-10 stsp if (line->annotated)
2481 d68a0a7d 2018-07-10 stsp goto done;
2483 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
2484 84451b3e 2018-07-10 stsp if (line->id == NULL) {
2485 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2486 84451b3e 2018-07-10 stsp goto done;
2488 84451b3e 2018-07-10 stsp line->annotated = 1;
2490 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2491 1a76625f 2018-10-22 stsp if (errcode)
2492 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2493 84451b3e 2018-07-10 stsp return err;
2496 84451b3e 2018-07-10 stsp static void *
2497 84451b3e 2018-07-10 stsp blame_thread(void *arg)
2499 18430de3 2018-07-10 stsp const struct got_error *err;
2500 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
2501 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
2502 1a76625f 2018-10-22 stsp int errcode;
2504 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2505 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
2507 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2508 1a76625f 2018-10-22 stsp if (errcode)
2509 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
2511 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
2512 c9beca56 2018-07-22 stsp ta->repo = NULL;
2513 c9beca56 2018-07-22 stsp *ta->complete = 1;
2515 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2516 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2517 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2519 18430de3 2018-07-10 stsp return (void *)err;
2522 245d91c1 2018-07-12 stsp static struct got_object_id *
2523 15a94983 2018-12-23 stsp get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2524 15a94983 2018-12-23 stsp int selected_line)
2526 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
2528 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
2529 245d91c1 2018-07-12 stsp if (!line->annotated)
2530 245d91c1 2018-07-12 stsp return NULL;
2532 245d91c1 2018-07-12 stsp return line->id;
2535 b880a918 2018-07-10 stsp static const struct got_error *
2536 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
2538 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
2541 245d91c1 2018-07-12 stsp if (blame->thread) {
2542 1a76625f 2018-10-22 stsp int errcode;
2543 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2544 1a76625f 2018-10-22 stsp if (errcode)
2545 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2546 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
2547 1a76625f 2018-10-22 stsp if (errcode)
2548 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2549 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2550 1a76625f 2018-10-22 stsp if (errcode)
2551 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2552 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
2553 245d91c1 2018-07-12 stsp err = NULL;
2554 245d91c1 2018-07-12 stsp blame->thread = NULL;
2556 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
2557 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
2558 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
2560 245d91c1 2018-07-12 stsp if (blame->f) {
2561 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
2562 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
2563 245d91c1 2018-07-12 stsp blame->f = NULL;
2565 57670559 2018-12-23 stsp if (blame->lines) {
2566 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
2567 57670559 2018-12-23 stsp free(blame->lines[i].id);
2568 57670559 2018-12-23 stsp free(blame->lines);
2569 57670559 2018-12-23 stsp blame->lines = NULL;
2571 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
2572 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
2574 245d91c1 2018-07-12 stsp return err;
2577 245d91c1 2018-07-12 stsp static const struct got_error *
2578 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2579 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
2580 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
2581 245d91c1 2018-07-12 stsp struct got_repository *repo)
2583 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
2584 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
2585 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
2586 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
2587 15a94983 2018-12-23 stsp int obj_type;
2589 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2591 15a94983 2018-12-23 stsp return err;
2592 15a94983 2018-12-23 stsp if (obj_id == NULL)
2593 15a94983 2018-12-23 stsp return got_error(GOT_ERR_NO_OBJ);
2595 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
2597 84451b3e 2018-07-10 stsp goto done;
2599 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2600 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2601 84451b3e 2018-07-10 stsp goto done;
2604 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2606 a70480e0 2018-06-23 stsp goto done;
2607 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
2608 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
2609 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2610 84451b3e 2018-07-10 stsp goto done;
2612 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2613 245d91c1 2018-07-12 stsp blame->f, blob);
2615 84451b3e 2018-07-10 stsp goto done;
2617 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2618 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
2619 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2620 84451b3e 2018-07-10 stsp goto done;
2623 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2625 bd24772e 2018-07-11 stsp goto done;
2627 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
2628 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
2629 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
2630 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
2631 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
2632 245d91c1 2018-07-12 stsp err = got_error_from_errno();
2633 245d91c1 2018-07-12 stsp goto done;
2635 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
2637 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
2638 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
2639 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
2640 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
2641 245d91c1 2018-07-12 stsp *blame_complete = 0;
2645 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
2646 27d434c2 2018-09-15 stsp free(obj_id);
2648 245d91c1 2018-07-12 stsp stop_blame(blame);
2649 245d91c1 2018-07-12 stsp return err;
2652 245d91c1 2018-07-12 stsp static const struct got_error *
2653 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
2654 e1cd8fed 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
2656 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
2657 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2659 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
2661 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2663 7cbe629d 2018-08-04 stsp return err;
2665 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2666 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
2667 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
2668 fb2756b9 2018-08-04 stsp s->selected_line = 1;
2669 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
2670 fb2756b9 2018-08-04 stsp s->path = path;
2671 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
2672 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2673 fb2756b9 2018-08-04 stsp s->repo = repo;
2674 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
2675 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
2677 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
2678 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
2679 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
2681 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
2682 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
2683 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2684 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2687 e5a0f69f 2018-08-18 stsp static const struct got_error *
2688 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
2690 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2691 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2693 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
2694 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
2696 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2697 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
2698 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2699 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2700 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
2703 e5a0f69f 2018-08-18 stsp free(s->path);
2705 e5a0f69f 2018-08-18 stsp return err;
2708 7cbe629d 2018-08-04 stsp static const struct got_error *
2709 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
2711 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2712 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
2713 2b380cc8 2018-10-24 stsp int errcode;
2715 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
2716 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2717 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
2718 2b380cc8 2018-10-24 stsp if (errcode)
2719 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
2722 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2723 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2724 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
2725 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
2727 669b5ffa 2018-10-07 stsp view_vborder(view);
2728 e5a0f69f 2018-08-18 stsp return err;
2731 e5a0f69f 2018-08-18 stsp static const struct got_error *
2732 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2733 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2735 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
2736 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
2737 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2738 669b5ffa 2018-10-07 stsp int begin_x = 0;
2740 e5a0f69f 2018-08-18 stsp switch (ch) {
2742 e5a0f69f 2018-08-18 stsp s->done = 1;
2745 e5a0f69f 2018-08-18 stsp case KEY_UP:
2746 e5a0f69f 2018-08-18 stsp if (s->selected_line > 1)
2747 e5a0f69f 2018-08-18 stsp s->selected_line--;
2748 e5a0f69f 2018-08-18 stsp else if (s->selected_line == 1 &&
2749 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2750 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2752 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2753 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line == 1) {
2754 e5a0f69f 2018-08-18 stsp s->selected_line = 1;
2757 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > view->nlines - 2)
2758 e5a0f69f 2018-08-18 stsp s->first_displayed_line -=
2759 e5a0f69f 2018-08-18 stsp (view->nlines - 2);
2761 e5a0f69f 2018-08-18 stsp s->first_displayed_line = 1;
2764 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2765 e5a0f69f 2018-08-18 stsp if (s->selected_line < view->nlines - 2 &&
2766 e5a0f69f 2018-08-18 stsp s->first_displayed_line +
2767 e5a0f69f 2018-08-18 stsp s->selected_line <= s->blame.nlines)
2768 e5a0f69f 2018-08-18 stsp s->selected_line++;
2769 e5a0f69f 2018-08-18 stsp else if (s->last_displayed_line <
2770 e5a0f69f 2018-08-18 stsp s->blame.nlines)
2771 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2774 e5a0f69f 2018-08-18 stsp case 'p': {
2775 15a94983 2018-12-23 stsp struct got_object_id *id = NULL;
2776 e5a0f69f 2018-08-18 stsp id = get_selected_commit_id(s->blame.lines,
2777 e5a0f69f 2018-08-18 stsp s->first_displayed_line, s->selected_line);
2778 15a94983 2018-12-23 stsp if (id == NULL)
2780 15a94983 2018-12-23 stsp if (ch == 'p') {
2781 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2782 15a94983 2018-12-23 stsp struct got_object_qid *pid;
2783 15a94983 2018-12-23 stsp struct got_object_id *blob_id = NULL;
2784 15a94983 2018-12-23 stsp int obj_type;
2785 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit,
2786 15a94983 2018-12-23 stsp s->repo, id);
2789 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
2790 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
2791 15a94983 2018-12-23 stsp if (pid == NULL) {
2792 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2795 15a94983 2018-12-23 stsp /* Check if path history ends here. */
2796 15a94983 2018-12-23 stsp err = got_object_id_by_path(&blob_id, s->repo,
2797 15a94983 2018-12-23 stsp pid->id, s->path);
2798 15a94983 2018-12-23 stsp if (err) {
2799 15a94983 2018-12-23 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
2800 15a94983 2018-12-23 stsp err = NULL;
2801 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2804 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo,
2806 15a94983 2018-12-23 stsp free(blob_id);
2807 15a94983 2018-12-23 stsp /* Can't blame non-blob type objects. */
2808 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2809 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2812 15a94983 2018-12-23 stsp err = got_object_qid_alloc(&s->blamed_commit,
2814 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2816 15a94983 2018-12-23 stsp if (got_object_id_cmp(id,
2817 15a94983 2018-12-23 stsp s->blamed_commit->id) == 0)
2819 15a94983 2018-12-23 stsp err = got_object_qid_alloc(&s->blamed_commit,
2824 e5a0f69f 2018-08-18 stsp s->done = 1;
2825 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2826 e5a0f69f 2018-08-18 stsp s->done = 0;
2827 e5a0f69f 2018-08-18 stsp if (thread_err)
2829 e5a0f69f 2018-08-18 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2830 e5a0f69f 2018-08-18 stsp s->blamed_commit, entry);
2831 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2832 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2833 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof,
2834 e5a0f69f 2018-08-18 stsp s->path, s->blamed_commit->id, s->repo);
2839 e5a0f69f 2018-08-18 stsp case 'B': {
2840 e5a0f69f 2018-08-18 stsp struct got_object_qid *first;
2841 e5a0f69f 2018-08-18 stsp first = SIMPLEQ_FIRST(&s->blamed_commits);
2842 e5a0f69f 2018-08-18 stsp if (!got_object_id_cmp(first->id, s->commit_id))
2844 e5a0f69f 2018-08-18 stsp s->done = 1;
2845 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2846 e5a0f69f 2018-08-18 stsp s->done = 0;
2847 e5a0f69f 2018-08-18 stsp if (thread_err)
2849 e5a0f69f 2018-08-18 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2850 e5a0f69f 2018-08-18 stsp got_object_qid_free(s->blamed_commit);
2851 e5a0f69f 2018-08-18 stsp s->blamed_commit =
2852 e5a0f69f 2018-08-18 stsp SIMPLEQ_FIRST(&s->blamed_commits);
2853 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2854 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2855 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2856 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2861 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
2862 15a94983 2018-12-23 stsp case '\r': {
2863 15a94983 2018-12-23 stsp struct got_object_id *id = NULL;
2864 15a94983 2018-12-23 stsp struct got_object_qid *pid;
2865 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
2866 15a94983 2018-12-23 stsp id = get_selected_commit_id(s->blame.lines,
2867 15a94983 2018-12-23 stsp s->first_displayed_line, s->selected_line);
2868 3e9926ea 2019-01-04 stsp if (id == NULL)
2870 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, s->repo, id);
2873 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
2874 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
2875 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
2876 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
2877 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
2878 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
2879 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2880 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2883 15a94983 2018-12-23 stsp err = open_diff_view(diff_view, pid ? pid->id : NULL,
2884 fb872ab2 2019-02-21 stsp id, NULL, s->repo);
2885 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2886 e5a0f69f 2018-08-18 stsp if (err) {
2887 e5a0f69f 2018-08-18 stsp view_close(diff_view);
2890 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
2891 669b5ffa 2018-10-07 stsp err = view_close_child(view);
2894 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
2895 669b5ffa 2018-10-07 stsp if (err) {
2896 669b5ffa 2018-10-07 stsp view_close(diff_view);
2899 51c68690 2018-11-07 stsp *focus_view = diff_view;
2900 51c68690 2018-11-07 stsp view->child_focussed = 1;
2902 669b5ffa 2018-10-07 stsp *new_view = diff_view;
2907 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2909 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line >= s->blame.nlines &&
2910 e5a0f69f 2018-08-18 stsp s->selected_line < view->nlines - 2) {
2911 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2912 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2915 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line + view->nlines - 2
2916 e5a0f69f 2018-08-18 stsp <= s->blame.nlines)
2917 e5a0f69f 2018-08-18 stsp s->first_displayed_line +=
2918 e5a0f69f 2018-08-18 stsp view->nlines - 2;
2920 e5a0f69f 2018-08-18 stsp s->first_displayed_line =
2921 e5a0f69f 2018-08-18 stsp s->blame.nlines -
2922 e5a0f69f 2018-08-18 stsp (view->nlines - 3);
2924 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
2925 e5a0f69f 2018-08-18 stsp if (s->selected_line > view->nlines - 2) {
2926 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2927 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2933 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
2936 a70480e0 2018-06-23 stsp static const struct got_error *
2937 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
2939 a70480e0 2018-06-23 stsp const struct got_error *error;
2940 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
2941 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
2942 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2943 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
2944 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
2946 e1cd8fed 2018-08-01 stsp struct tog_view *view;
2948 a70480e0 2018-06-23 stsp #ifndef PROFILE
2949 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2950 8e94dd5b 2019-01-04 stsp NULL) == -1)
2951 a70480e0 2018-06-23 stsp err(1, "pledge");
2954 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2955 a70480e0 2018-06-23 stsp switch (ch) {
2957 a70480e0 2018-06-23 stsp commit_id_str = optarg;
2960 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2961 69069811 2018-08-02 stsp if (repo_path == NULL)
2962 69069811 2018-08-02 stsp err(1, "-r option");
2966 a70480e0 2018-06-23 stsp /* NOTREACHED */
2970 a70480e0 2018-06-23 stsp argc -= optind;
2971 a70480e0 2018-06-23 stsp argv += optind;
2973 69069811 2018-08-02 stsp if (argc == 1)
2974 69069811 2018-08-02 stsp path = argv[0];
2976 a70480e0 2018-06-23 stsp usage_blame();
2978 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
2979 69069811 2018-08-02 stsp if (cwd == NULL) {
2980 69069811 2018-08-02 stsp error = got_error_from_errno();
2981 69069811 2018-08-02 stsp goto done;
2983 69069811 2018-08-02 stsp if (repo_path == NULL) {
2984 eb41ed75 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
2985 eb41ed75 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2986 69069811 2018-08-02 stsp goto done;
2988 eb41ed75 2019-02-05 stsp error = NULL;
2989 eb41ed75 2019-02-05 stsp if (worktree) {
2990 eb41ed75 2019-02-05 stsp repo_path =
2991 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
2992 eb41ed75 2019-02-05 stsp if (repo_path == NULL)
2993 eb41ed75 2019-02-05 stsp error = got_error_from_errno();
2994 eb41ed75 2019-02-05 stsp if (error)
2995 eb41ed75 2019-02-05 stsp goto done;
2997 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
2998 eb41ed75 2019-02-05 stsp if (repo_path == NULL) {
2999 eb41ed75 2019-02-05 stsp error = got_error_from_errno();
3000 eb41ed75 2019-02-05 stsp goto done;
3005 a915003a 2019-02-05 stsp init_curses();
3007 8e94dd5b 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
3008 8e94dd5b 2019-01-04 stsp if (error)
3009 8e94dd5b 2019-01-04 stsp goto done;
3011 69069811 2018-08-02 stsp error = got_repo_open(&repo, repo_path);
3012 a70480e0 2018-06-23 stsp if (error != NULL)
3013 92205607 2019-01-04 stsp goto done;
3015 eb41ed75 2019-02-05 stsp if (worktree) {
3016 eb41ed75 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3017 eb41ed75 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3018 eb41ed75 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3019 eb41ed75 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3020 eb41ed75 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3021 eb41ed75 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3022 eb41ed75 2019-02-05 stsp path) == -1) {
3023 eb41ed75 2019-02-05 stsp error = got_error_from_errno();
3024 eb41ed75 2019-02-05 stsp goto done;
3026 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3029 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3031 eb41ed75 2019-02-05 stsp if (error)
3032 69069811 2018-08-02 stsp goto done;
3034 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
3035 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
3036 a70480e0 2018-06-23 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
3037 a70480e0 2018-06-23 stsp if (error != NULL)
3038 66b4983c 2018-06-23 stsp goto done;
3039 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3040 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
3042 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
3043 15a94983 2018-12-23 stsp commit_id_str);
3045 a19e88aa 2018-06-23 stsp if (error != NULL)
3046 a19e88aa 2018-06-23 stsp goto done;
3048 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3049 e1cd8fed 2018-08-01 stsp if (view == NULL) {
3050 e1cd8fed 2018-08-01 stsp error = got_error_from_errno();
3051 e1cd8fed 2018-08-01 stsp goto done;
3053 7cbe629d 2018-08-04 stsp error = open_blame_view(view, in_repo_path, commit_id, repo);
3054 7cbe629d 2018-08-04 stsp if (error)
3055 7cbe629d 2018-08-04 stsp goto done;
3056 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3058 69069811 2018-08-02 stsp free(repo_path);
3059 69069811 2018-08-02 stsp free(cwd);
3060 a70480e0 2018-06-23 stsp free(commit_id);
3061 eb41ed75 2019-02-05 stsp if (worktree)
3062 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
3064 a70480e0 2018-06-23 stsp got_repo_close(repo);
3065 a70480e0 2018-06-23 stsp return error;
3068 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3069 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
3070 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
3071 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
3072 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
3073 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
3074 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
3076 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3077 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
3078 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
3079 ffd1d5e5 2018-06-23 stsp int width, n;
3081 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
3083 f7d12f7e 2018-08-01 stsp werase(view->window);
3085 ffd1d5e5 2018-06-23 stsp if (limit == 0)
3086 ffd1d5e5 2018-06-23 stsp return NULL;
3088 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
3090 ffd1d5e5 2018-06-23 stsp return err;
3091 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3092 a3404814 2018-09-02 stsp wstandout(view->window);
3093 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3094 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3095 a3404814 2018-09-02 stsp wstandend(view->window);
3096 2550e4c3 2018-07-13 stsp free(wline);
3097 2550e4c3 2018-07-13 stsp wline = NULL;
3098 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
3099 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3100 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3101 ffd1d5e5 2018-06-23 stsp return NULL;
3102 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
3104 ce52c690 2018-06-23 stsp return err;
3105 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3106 2550e4c3 2018-07-13 stsp free(wline);
3107 2550e4c3 2018-07-13 stsp wline = NULL;
3108 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
3109 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3110 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3111 ffd1d5e5 2018-06-23 stsp return NULL;
3112 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3113 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
3114 a1eca9bb 2018-06-23 stsp return NULL;
3116 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3117 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
3118 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
3119 0cf4efb1 2018-09-29 stsp if (view->focussed)
3120 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3121 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
3123 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
3124 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
3125 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3126 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3127 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3128 ffd1d5e5 2018-06-23 stsp return NULL;
3132 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
3133 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3136 ffd1d5e5 2018-06-23 stsp while (te) {
3137 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
3139 1d13200f 2018-07-12 stsp if (show_ids) {
3140 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
3142 1d13200f 2018-07-12 stsp return got_error_from_errno();
3144 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3145 d8355ef1 2019-02-10 stsp te->name, S_ISDIR(te->mode) ? "/" :
3146 d8355ef1 2019-02-10 stsp ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3147 1d13200f 2018-07-12 stsp free(id_str);
3148 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3150 1d13200f 2018-07-12 stsp free(id_str);
3151 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
3152 ffd1d5e5 2018-06-23 stsp if (err) {
3153 ffd1d5e5 2018-06-23 stsp free(line);
3156 ffd1d5e5 2018-06-23 stsp if (n == selected) {
3157 0cf4efb1 2018-09-29 stsp if (view->focussed)
3158 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3159 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
3161 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3162 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
3163 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3164 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
3165 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3166 ffd1d5e5 2018-06-23 stsp free(line);
3167 2550e4c3 2018-07-13 stsp free(wline);
3168 2550e4c3 2018-07-13 stsp wline = NULL;
3170 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3171 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
3172 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3174 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3177 ffd1d5e5 2018-06-23 stsp return err;
3180 ffd1d5e5 2018-06-23 stsp static void
3181 ffd1d5e5 2018-06-23 stsp tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
3182 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
3184 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
3187 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL)
3190 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3191 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
3192 ffd1d5e5 2018-06-23 stsp if (!isroot)
3193 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3197 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
3198 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
3199 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
3200 ffd1d5e5 2018-06-23 stsp prev = te;
3201 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3203 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
3204 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3206 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3207 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3210 768394f3 2019-01-24 stsp static int
3211 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3212 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
3213 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
3215 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
3216 ffd1d5e5 2018-06-23 stsp int n = 0;
3218 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
3219 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3221 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
3222 768394f3 2019-01-24 stsp last = last_displayed_entry;
3223 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
3224 768394f3 2019-01-24 stsp last = SIMPLEQ_NEXT(last, entry);
3225 768394f3 2019-01-24 stsp if (last) {
3226 768394f3 2019-01-24 stsp *first_displayed_entry = next;
3227 768394f3 2019-01-24 stsp next = SIMPLEQ_NEXT(next, entry);
3233 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3234 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
3235 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
3237 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
3238 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
3239 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
3241 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
3242 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
3244 ce52c690 2018-06-23 stsp len += strlen(te->name);
3246 ce52c690 2018-06-23 stsp *path = calloc(1, len);
3247 ffd1d5e5 2018-06-23 stsp if (path == NULL)
3248 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3250 ce52c690 2018-06-23 stsp (*path)[0] = '/';
3251 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
3252 d9765a41 2018-06-23 stsp while (pt) {
3253 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3254 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3255 cb2ebc8a 2018-06-23 stsp goto done;
3257 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
3258 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3259 cb2ebc8a 2018-06-23 stsp goto done;
3261 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3264 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
3265 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3266 ce52c690 2018-06-23 stsp goto done;
3270 ce52c690 2018-06-23 stsp if (err) {
3271 ce52c690 2018-06-23 stsp free(*path);
3272 ce52c690 2018-06-23 stsp *path = NULL;
3274 ce52c690 2018-06-23 stsp return err;
3277 ce52c690 2018-06-23 stsp static const struct got_error *
3278 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
3279 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3280 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
3282 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
3283 ce52c690 2018-06-23 stsp char *path;
3284 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
3286 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
3288 ce52c690 2018-06-23 stsp return err;
3290 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3291 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
3292 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3294 e5a0f69f 2018-08-18 stsp err = open_blame_view(blame_view, path, commit_id, repo);
3295 e5a0f69f 2018-08-18 stsp if (err) {
3296 e5a0f69f 2018-08-18 stsp view_close(blame_view);
3297 e5a0f69f 2018-08-18 stsp free(path);
3299 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
3300 69efd4c4 2018-07-18 stsp return err;
3303 69efd4c4 2018-07-18 stsp static const struct got_error *
3304 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
3305 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3306 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
3308 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
3309 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
3310 69efd4c4 2018-07-18 stsp char *path;
3312 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3313 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
3314 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3316 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
3318 69efd4c4 2018-07-18 stsp return err;
3320 23721109 2018-10-22 stsp err = open_log_view(log_view, commit_id, repo, path, 0);
3322 e5a0f69f 2018-08-18 stsp view_close(log_view);
3324 e5a0f69f 2018-08-18 stsp *new_view = log_view;
3325 cb2ebc8a 2018-06-23 stsp free(path);
3326 cb2ebc8a 2018-06-23 stsp return err;
3329 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3330 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
3331 5221c383 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
3333 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3334 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
3335 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3337 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
3339 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
3340 ffd1d5e5 2018-06-23 stsp if (err != NULL)
3341 ffd1d5e5 2018-06-23 stsp goto done;
3343 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3344 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
3345 ffd1d5e5 2018-06-23 stsp goto done;
3348 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
3349 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
3350 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3351 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
3352 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
3353 6484ec90 2018-09-29 stsp err = got_error_from_errno();
3354 6484ec90 2018-09-29 stsp goto done;
3356 fb2756b9 2018-08-04 stsp s->repo = repo;
3358 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
3359 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
3360 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
3362 ad80ab7b 2018-08-04 stsp free(commit_id_str);
3363 6484ec90 2018-09-29 stsp if (err) {
3364 fb2756b9 2018-08-04 stsp free(s->tree_label);
3365 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3367 ad80ab7b 2018-08-04 stsp return err;
3370 e5a0f69f 2018-08-18 stsp static const struct got_error *
3371 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
3373 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3375 fb2756b9 2018-08-04 stsp free(s->tree_label);
3376 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3377 6484ec90 2018-09-29 stsp free(s->commit_id);
3378 6484ec90 2018-09-29 stsp s->commit_id = NULL;
3379 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
3380 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
3381 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
3382 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
3383 ad80ab7b 2018-08-04 stsp free(parent);
3386 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
3387 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
3388 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
3390 e5a0f69f 2018-08-18 stsp return NULL;
3393 ad80ab7b 2018-08-04 stsp static const struct got_error *
3394 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
3396 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
3397 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3398 e5a0f69f 2018-08-18 stsp char *parent_path;
3400 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
3402 e5a0f69f 2018-08-18 stsp return err;
3404 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
3405 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
3406 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3407 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
3408 e5a0f69f 2018-08-18 stsp free(parent_path);
3410 669b5ffa 2018-10-07 stsp view_vborder(view);
3411 e5a0f69f 2018-08-18 stsp return err;
3414 e5a0f69f 2018-08-18 stsp static const struct got_error *
3415 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3416 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3418 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3419 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
3420 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
3421 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
3423 e5a0f69f 2018-08-18 stsp switch (ch) {
3425 e5a0f69f 2018-08-18 stsp s->show_ids = !s->show_ids;
3428 669b5ffa 2018-10-07 stsp if (!s->selected_entry)
3430 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
3431 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
3432 669b5ffa 2018-10-07 stsp err = log_tree_entry(&log_view, begin_x,
3433 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
3434 669b5ffa 2018-10-07 stsp s->commit_id, s->repo);
3435 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3436 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3438 669b5ffa 2018-10-07 stsp return err;
3439 669b5ffa 2018-10-07 stsp err = view_set_child(view, log_view);
3440 669b5ffa 2018-10-07 stsp if (err) {
3441 669b5ffa 2018-10-07 stsp view_close(log_view);
3444 669b5ffa 2018-10-07 stsp *focus_view = log_view;
3445 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3447 669b5ffa 2018-10-07 stsp *new_view = log_view;
3450 e5a0f69f 2018-08-18 stsp case KEY_UP:
3451 bf979164 2019-01-24 stsp if (s->selected > 0) {
3452 e5a0f69f 2018-08-18 stsp s->selected--;
3453 bf979164 2019-01-24 stsp if (s->selected == 0)
3456 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
3458 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry, 1,
3459 e5a0f69f 2018-08-18 stsp s->entries, s->tree == s->root);
3461 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
3462 67cc7991 2019-01-24 stsp tree_scroll_up(&s->first_displayed_entry,
3463 67cc7991 2019-01-24 stsp MAX(0, view->nlines - 4 - s->selected), s->entries,
3464 67cc7991 2019-01-24 stsp s->tree == s->root);
3465 8a0ead39 2018-11-03 stsp s->selected = 0;
3466 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_FIRST(&s->entries->head) ==
3467 67cc7991 2019-01-24 stsp s->first_displayed_entry && s->tree != s->root)
3468 67cc7991 2019-01-24 stsp s->first_displayed_entry = NULL;
3471 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
3472 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1) {
3473 e5a0f69f 2018-08-18 stsp s->selected++;
3476 768394f3 2019-01-24 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3477 768394f3 2019-01-24 stsp == NULL) {
3478 768394f3 2019-01-24 stsp /* can't scroll any further */
3481 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry, 1,
3482 e5a0f69f 2018-08-18 stsp s->last_displayed_entry, s->entries);
3484 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
3485 768394f3 2019-01-24 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3486 768394f3 2019-01-24 stsp == NULL) {
3487 768394f3 2019-01-24 stsp /* can't scroll any further; move cursor down */
3488 768394f3 2019-01-24 stsp if (s->selected < s->ndisplayed - 1)
3489 768394f3 2019-01-24 stsp s->selected = s->ndisplayed - 1;
3492 768394f3 2019-01-24 stsp nscrolled = tree_scroll_down(&s->first_displayed_entry,
3493 768394f3 2019-01-24 stsp view->nlines, s->last_displayed_entry, s->entries);
3494 768394f3 2019-01-24 stsp if (nscrolled < view->nlines) {
3495 768394f3 2019-01-24 stsp int ndisplayed = 0;
3496 768394f3 2019-01-24 stsp struct got_tree_entry *te;
3497 768394f3 2019-01-24 stsp te = s->first_displayed_entry;
3499 768394f3 2019-01-24 stsp ndisplayed++;
3500 768394f3 2019-01-24 stsp te = SIMPLEQ_NEXT(te, entry);
3501 768394f3 2019-01-24 stsp } while (te);
3502 768394f3 2019-01-24 stsp s->selected = ndisplayed - 1;
3505 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
3506 e5a0f69f 2018-08-18 stsp case '\r':
3507 e5a0f69f 2018-08-18 stsp if (s->selected_entry == NULL) {
3508 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3509 7837eeac 2018-09-24 stsp case KEY_BACKSPACE:
3510 e5a0f69f 2018-08-18 stsp /* user selected '..' */
3511 e5a0f69f 2018-08-18 stsp if (s->tree == s->root)
3513 e5a0f69f 2018-08-18 stsp parent = TAILQ_FIRST(&s->parents);
3514 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&s->parents, parent,
3516 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->tree);
3517 e5a0f69f 2018-08-18 stsp s->tree = parent->tree;
3518 e5a0f69f 2018-08-18 stsp s->entries =
3519 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3520 e5a0f69f 2018-08-18 stsp s->first_displayed_entry =
3521 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry;
3522 e5a0f69f 2018-08-18 stsp s->selected_entry =
3523 e5a0f69f 2018-08-18 stsp parent->selected_entry;
3524 e5a0f69f 2018-08-18 stsp s->selected = parent->selected;
3525 e5a0f69f 2018-08-18 stsp free(parent);
3526 e5a0f69f 2018-08-18 stsp } else if (S_ISDIR(s->selected_entry->mode)) {
3527 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3528 e5a0f69f 2018-08-18 stsp struct got_tree_object *child;
3529 e5a0f69f 2018-08-18 stsp err = got_object_open_as_tree(&child,
3530 e5a0f69f 2018-08-18 stsp s->repo, s->selected_entry->id);
3533 e5a0f69f 2018-08-18 stsp parent = calloc(1, sizeof(*parent));
3534 e5a0f69f 2018-08-18 stsp if (parent == NULL) {
3535 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
3538 e5a0f69f 2018-08-18 stsp parent->tree = s->tree;
3539 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry =
3540 e5a0f69f 2018-08-18 stsp s->first_displayed_entry;
3541 e5a0f69f 2018-08-18 stsp parent->selected_entry = s->selected_entry;
3542 e5a0f69f 2018-08-18 stsp parent->selected = s->selected;
3543 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3544 e5a0f69f 2018-08-18 stsp s->tree = child;
3545 e5a0f69f 2018-08-18 stsp s->entries =
3546 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3547 e5a0f69f 2018-08-18 stsp s->selected = 0;
3548 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
3549 e5a0f69f 2018-08-18 stsp } else if (S_ISREG(s->selected_entry->mode)) {
3550 669b5ffa 2018-10-07 stsp struct tog_view *blame_view;
3551 669b5ffa 2018-10-07 stsp int begin_x = view_is_parent_view(view) ?
3552 669b5ffa 2018-10-07 stsp view_split_begin_x(view->begin_x) : 0;
3554 669b5ffa 2018-10-07 stsp err = blame_tree_entry(&blame_view, begin_x,
3555 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents, s->commit_id,
3559 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3560 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3562 669b5ffa 2018-10-07 stsp return err;
3563 669b5ffa 2018-10-07 stsp err = view_set_child(view, blame_view);
3564 669b5ffa 2018-10-07 stsp if (err) {
3565 669b5ffa 2018-10-07 stsp view_close(blame_view);
3568 669b5ffa 2018-10-07 stsp *focus_view = blame_view;
3569 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3571 669b5ffa 2018-10-07 stsp *new_view = blame_view;
3574 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
3575 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines)
3576 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3582 ffd1d5e5 2018-06-23 stsp return err;
3585 ffd1d5e5 2018-06-23 stsp __dead static void
3586 ffd1d5e5 2018-06-23 stsp usage_tree(void)
3589 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3590 ffd1d5e5 2018-06-23 stsp getprogname());
3594 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3595 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
3597 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
3598 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
3599 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
3600 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3601 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
3602 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
3603 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
3605 5221c383 2018-08-01 stsp struct tog_view *view;
3607 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
3608 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3609 d188b9a6 2019-01-04 stsp NULL) == -1)
3610 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
3613 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
3614 ffd1d5e5 2018-06-23 stsp switch (ch) {
3616 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
3620 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
3624 ffd1d5e5 2018-06-23 stsp argc -= optind;
3625 ffd1d5e5 2018-06-23 stsp argv += optind;
3627 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
3628 52185f70 2019-02-05 stsp struct got_worktree *worktree;
3629 52185f70 2019-02-05 stsp char *cwd = getcwd(NULL, 0);
3630 52185f70 2019-02-05 stsp if (cwd == NULL)
3631 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3632 52185f70 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3633 52185f70 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3634 52185f70 2019-02-05 stsp goto done;
3635 52185f70 2019-02-05 stsp if (worktree) {
3636 52185f70 2019-02-05 stsp free(cwd);
3637 52185f70 2019-02-05 stsp repo_path =
3638 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3639 52185f70 2019-02-05 stsp got_worktree_close(worktree);
3641 52185f70 2019-02-05 stsp repo_path = cwd;
3642 52185f70 2019-02-05 stsp if (repo_path == NULL) {
3643 52185f70 2019-02-05 stsp error = got_error_from_errno();
3644 52185f70 2019-02-05 stsp goto done;
3646 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
3647 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
3648 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3649 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3651 ffd1d5e5 2018-06-23 stsp usage_log();
3653 a915003a 2019-02-05 stsp init_curses();
3655 d188b9a6 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
3656 d188b9a6 2019-01-04 stsp if (error)
3657 52185f70 2019-02-05 stsp goto done;
3659 ffd1d5e5 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
3660 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3661 52185f70 2019-02-05 stsp goto done;
3663 15a94983 2018-12-23 stsp if (commit_id_arg == NULL)
3664 ffd1d5e5 2018-06-23 stsp error = get_head_commit_id(&commit_id, repo);
3666 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
3667 15a94983 2018-12-23 stsp commit_id_arg);
3668 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3669 ffd1d5e5 2018-06-23 stsp goto done;
3671 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3672 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3673 ffd1d5e5 2018-06-23 stsp goto done;
3675 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
3676 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
3677 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3678 ffd1d5e5 2018-06-23 stsp goto done;
3680 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3681 5221c383 2018-08-01 stsp if (view == NULL) {
3682 5221c383 2018-08-01 stsp error = got_error_from_errno();
3683 5221c383 2018-08-01 stsp goto done;
3685 ad80ab7b 2018-08-04 stsp error = open_tree_view(view, tree, commit_id, repo);
3686 ad80ab7b 2018-08-04 stsp if (error)
3687 ad80ab7b 2018-08-04 stsp goto done;
3688 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3690 52185f70 2019-02-05 stsp free(repo_path);
3691 ffd1d5e5 2018-06-23 stsp free(commit_id);
3692 ffd1d5e5 2018-06-23 stsp if (commit)
3693 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
3695 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
3697 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
3698 ffd1d5e5 2018-06-23 stsp return error;
3701 4ed7e80c 2018-05-20 stsp __dead static void
3702 9f7d7167 2018-04-29 stsp usage(void)
3706 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3707 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
3708 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3709 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
3710 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3715 c2301be8 2018-04-30 stsp static char **
3716 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
3718 c2301be8 2018-04-30 stsp char **argv;
3719 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
3721 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
3722 c2301be8 2018-04-30 stsp if (argv == NULL)
3723 c2301be8 2018-04-30 stsp err(1, "calloc");
3724 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
3725 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
3726 c2301be8 2018-04-30 stsp err(1, "calloc");
3727 c2301be8 2018-04-30 stsp if (arg1) {
3728 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
3729 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
3730 c2301be8 2018-04-30 stsp err(1, "calloc");
3733 c2301be8 2018-04-30 stsp return argv;
3737 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
3739 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
3740 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
3741 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
3742 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
3744 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
3746 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
3747 9f7d7167 2018-04-29 stsp switch (ch) {
3749 9f7d7167 2018-04-29 stsp hflag = 1;
3753 9f7d7167 2018-04-29 stsp /* NOTREACHED */
3757 9f7d7167 2018-04-29 stsp argc -= optind;
3758 9f7d7167 2018-04-29 stsp argv += optind;
3759 9f7d7167 2018-04-29 stsp optind = 0;
3760 c2301be8 2018-04-30 stsp optreset = 1;
3762 c2301be8 2018-04-30 stsp if (argc == 0) {
3763 f29d3e89 2018-06-23 stsp if (hflag)
3765 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
3766 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
3767 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
3772 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
3773 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3774 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
3775 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
3776 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
3777 9f7d7167 2018-04-29 stsp if (hflag)
3778 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
3782 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
3783 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
3784 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
3785 c2301be8 2018-04-30 stsp if (repo_path) {
3786 c2301be8 2018-04-30 stsp struct got_repository *repo;
3787 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
3788 c2301be8 2018-04-30 stsp if (error == NULL)
3789 c2301be8 2018-04-30 stsp got_repo_close(repo);
3791 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
3792 c2301be8 2018-04-30 stsp if (error) {
3793 f29d3e89 2018-06-23 stsp if (hflag) {
3794 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
3795 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
3799 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
3800 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
3801 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
3802 ad7de8d9 2018-04-30 stsp free(repo_path);
3805 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
3806 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
3808 c2301be8 2018-04-30 stsp free(repo_path);
3812 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3813 9f7d7167 2018-04-29 stsp if (error)
3814 9f7d7167 2018-04-29 stsp goto done;
3817 c2301be8 2018-04-30 stsp free(cmd_argv);
3818 9f7d7167 2018-04-29 stsp if (error)
3819 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
