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;
121 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
123 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
124 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
127 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
129 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
130 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
131 1a76625f 2018-10-22 stsp int commits_needed;
132 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
133 1a76625f 2018-10-22 stsp struct commit_queue *commits;
134 1a76625f 2018-10-22 stsp const char *in_repo_path;
135 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
136 1a76625f 2018-10-22 stsp struct got_repository *repo;
137 1a76625f 2018-10-22 stsp int log_complete;
138 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
139 1a76625f 2018-10-22 stsp struct tog_view *view;
140 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
141 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
144 1a76625f 2018-10-22 stsp struct tog_log_view_state {
145 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
146 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
147 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
148 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
149 b01e7d3b 2018-08-04 stsp int selected;
150 b01e7d3b 2018-08-04 stsp char *in_repo_path;
151 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
152 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
153 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
154 1a76625f 2018-10-22 stsp sig_atomic_t quit;
155 1a76625f 2018-10-22 stsp pthread_t thread;
156 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
159 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
160 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
161 e9424729 2018-08-04 stsp int nlines;
163 e9424729 2018-08-04 stsp struct tog_view *view;
164 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
168 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
169 e9424729 2018-08-04 stsp const char *path;
170 e9424729 2018-08-04 stsp struct got_repository *repo;
171 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
172 e9424729 2018-08-04 stsp int *complete;
175 e9424729 2018-08-04 stsp struct tog_blame {
177 e9424729 2018-08-04 stsp size_t filesize;
178 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
179 6fcac457 2018-11-19 stsp int nlines;
180 e9424729 2018-08-04 stsp pthread_t thread;
181 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
182 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
183 e9424729 2018-08-04 stsp const char *path;
186 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
187 7cbe629d 2018-08-04 stsp int first_displayed_line;
188 7cbe629d 2018-08-04 stsp int last_displayed_line;
189 7cbe629d 2018-08-04 stsp int selected_line;
190 7cbe629d 2018-08-04 stsp int blame_complete;
193 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
194 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
195 e5a0f69f 2018-08-18 stsp char *path;
196 7cbe629d 2018-08-04 stsp struct got_repository *repo;
197 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
198 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
199 e9424729 2018-08-04 stsp struct tog_blame blame;
202 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
203 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
204 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
205 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
206 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
207 ad80ab7b 2018-08-04 stsp int selected;
210 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
212 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
213 ad80ab7b 2018-08-04 stsp char *tree_label;
214 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
215 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
216 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
217 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
218 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
219 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
220 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
221 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
222 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
223 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
224 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
228 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
230 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
231 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
232 669b5ffa 2018-10-07 stsp * there is enough screen estate.
234 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
235 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
237 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
238 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
239 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
241 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
242 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
244 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
246 cc3c9aac 2018-08-01 stsp struct tog_view {
247 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
248 26ed57b2 2018-05-19 stsp WINDOW *window;
249 26ed57b2 2018-05-19 stsp PANEL *panel;
250 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
251 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
252 1004088d 2018-09-29 stsp int focussed;
253 669b5ffa 2018-10-07 stsp struct tog_view *parent;
254 669b5ffa 2018-10-07 stsp struct tog_view *child;
255 669b5ffa 2018-10-07 stsp int child_focussed;
257 5dc9f4bc 2018-08-04 stsp /* type-specific state */
258 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
260 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
261 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
262 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
263 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
266 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
267 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
268 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
269 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
272 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
273 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
274 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
275 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
276 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
277 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
278 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
280 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
281 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
282 8b473291 2019-02-21 stsp struct got_repository *, const char *, int);
283 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
284 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
285 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
286 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
288 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
289 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
290 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
291 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
292 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
293 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
295 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
296 8b473291 2019-02-21 stsp struct got_tree_object *, struct got_object_id *,
297 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
298 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
299 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
300 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
301 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
303 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
305 25791caa 2018-10-24 stsp static void
306 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
308 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
311 e5a0f69f 2018-08-18 stsp static const struct got_error *
312 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
314 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
316 669b5ffa 2018-10-07 stsp if (view->child) {
317 669b5ffa 2018-10-07 stsp view_close(view->child);
318 669b5ffa 2018-10-07 stsp view->child = NULL;
320 e5a0f69f 2018-08-18 stsp if (view->close)
321 e5a0f69f 2018-08-18 stsp err = view->close(view);
322 ea5e7bb5 2018-08-01 stsp if (view->panel)
323 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
324 ea5e7bb5 2018-08-01 stsp if (view->window)
325 ea5e7bb5 2018-08-01 stsp delwin(view->window);
326 ea5e7bb5 2018-08-01 stsp free(view);
327 e5a0f69f 2018-08-18 stsp return err;
330 ea5e7bb5 2018-08-01 stsp static struct tog_view *
331 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
332 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
334 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
336 ea5e7bb5 2018-08-01 stsp if (view == NULL)
337 ea5e7bb5 2018-08-01 stsp return NULL;
339 d6b05b5b 2018-08-04 stsp view->type = type;
340 f7d12f7e 2018-08-01 stsp view->lines = LINES;
341 f7d12f7e 2018-08-01 stsp view->cols = COLS;
342 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
343 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
344 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
345 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
346 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
347 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
348 96a765a8 2018-08-04 stsp view_close(view);
349 ea5e7bb5 2018-08-01 stsp return NULL;
351 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
352 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
353 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
354 96a765a8 2018-08-04 stsp view_close(view);
355 ea5e7bb5 2018-08-01 stsp return NULL;
358 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
359 ea5e7bb5 2018-08-01 stsp return view;
363 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
365 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
367 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
370 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
372 5c60c32a 2018-10-18 stsp static const struct got_error *
373 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
375 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
377 5c60c32a 2018-10-18 stsp view->begin_y = 0;
378 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
379 5c60c32a 2018-10-18 stsp view->nlines = LINES;
380 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
381 5c60c32a 2018-10-18 stsp view->lines = LINES;
382 5c60c32a 2018-10-18 stsp view->cols = COLS;
383 5c60c32a 2018-10-18 stsp err = view_resize(view);
385 5c60c32a 2018-10-18 stsp return err;
387 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
388 5c60c32a 2018-10-18 stsp return got_error_from_errno();
390 5c60c32a 2018-10-18 stsp return NULL;
393 5c60c32a 2018-10-18 stsp static const struct got_error *
394 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
396 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
398 5c60c32a 2018-10-18 stsp view->begin_x = 0;
399 5c60c32a 2018-10-18 stsp view->begin_y = 0;
400 5c60c32a 2018-10-18 stsp view->nlines = LINES;
401 5c60c32a 2018-10-18 stsp view->ncols = COLS;
402 5c60c32a 2018-10-18 stsp view->lines = LINES;
403 5c60c32a 2018-10-18 stsp view->cols = COLS;
404 5c60c32a 2018-10-18 stsp err = view_resize(view);
406 5c60c32a 2018-10-18 stsp return err;
408 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
409 5c60c32a 2018-10-18 stsp return got_error_from_errno();
411 5c60c32a 2018-10-18 stsp return NULL;
415 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
417 5c60c32a 2018-10-18 stsp return view->parent == NULL;
420 4d8c2215 2018-08-19 stsp static const struct got_error *
421 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
423 f7d12f7e 2018-08-01 stsp int nlines, ncols;
425 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
426 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
428 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
430 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
431 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
433 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
435 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
436 0cf4efb1 2018-09-29 stsp return got_error_from_errno();
437 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
438 a6d7eb8d 2018-10-24 stsp return got_error_from_errno();
439 25791caa 2018-10-24 stsp wclear(view->window);
441 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
442 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
443 0cf4efb1 2018-09-29 stsp view->lines = LINES;
444 0cf4efb1 2018-09-29 stsp view->cols = COLS;
446 6e3e5d9c 2018-10-18 stsp if (view->child) {
447 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
448 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
449 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
450 5c60c32a 2018-10-18 stsp if (view->child->focussed)
451 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
453 5c60c32a 2018-10-18 stsp show_panel(view->panel);
455 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
456 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
460 5c60c32a 2018-10-18 stsp return NULL;
463 669b5ffa 2018-10-07 stsp static const struct got_error *
464 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
466 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
468 669b5ffa 2018-10-07 stsp if (view->child == NULL)
469 669b5ffa 2018-10-07 stsp return NULL;
471 669b5ffa 2018-10-07 stsp err = view_close(view->child);
472 669b5ffa 2018-10-07 stsp view->child = NULL;
473 669b5ffa 2018-10-07 stsp return err;
476 669b5ffa 2018-10-07 stsp static const struct got_error *
477 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
479 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
481 669b5ffa 2018-10-07 stsp view->child = child;
482 669b5ffa 2018-10-07 stsp child->parent = view;
483 669b5ffa 2018-10-07 stsp return err;
487 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
489 669b5ffa 2018-10-07 stsp return !view_is_parent_view(view) && view->begin_x > 0;
492 25791caa 2018-10-24 stsp static void
493 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
495 25791caa 2018-10-24 stsp int cols, lines;
496 25791caa 2018-10-24 stsp struct winsize size;
498 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
499 25791caa 2018-10-24 stsp cols = 80; /* Default */
500 25791caa 2018-10-24 stsp lines = 24;
502 25791caa 2018-10-24 stsp cols = size.ws_col;
503 25791caa 2018-10-24 stsp lines = size.ws_row;
505 25791caa 2018-10-24 stsp resize_term(lines, cols);
508 0cf4efb1 2018-09-29 stsp static const struct got_error *
509 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
510 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
511 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
513 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
514 669b5ffa 2018-10-07 stsp struct tog_view *v;
515 1a76625f 2018-10-22 stsp int ch, errcode;
517 e5a0f69f 2018-08-18 stsp *new = NULL;
518 e5a0f69f 2018-08-18 stsp *dead = NULL;
519 0cf4efb1 2018-09-29 stsp *focus = NULL;
521 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
522 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
523 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
524 1a76625f 2018-10-22 stsp if (errcode)
525 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
526 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
527 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
528 1a76625f 2018-10-22 stsp if (errcode)
529 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
530 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
532 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
533 25791caa 2018-10-24 stsp tog_resizeterm();
534 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
535 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
536 25791caa 2018-10-24 stsp err = view_resize(v);
538 25791caa 2018-10-24 stsp return err;
539 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
541 25791caa 2018-10-24 stsp return err;
545 e5a0f69f 2018-08-18 stsp switch (ch) {
549 669b5ffa 2018-10-07 stsp if (view->child) {
550 669b5ffa 2018-10-07 stsp *focus = view->child;
551 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
552 669b5ffa 2018-10-07 stsp } else if (view->parent) {
553 669b5ffa 2018-10-07 stsp *focus = view->parent;
554 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 0;
558 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
559 e5a0f69f 2018-08-18 stsp *dead = view;
565 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
566 669b5ffa 2018-10-07 stsp if (view->child == NULL)
568 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view->child)) {
569 669b5ffa 2018-10-07 stsp *focus = view->child;
570 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
571 669b5ffa 2018-10-07 stsp err = view_fullscreen(view->child);
573 669b5ffa 2018-10-07 stsp err = view_splitscreen(view->child);
576 669b5ffa 2018-10-07 stsp err = view->child->input(new, dead, focus,
577 669b5ffa 2018-10-07 stsp view->child, KEY_RESIZE);
579 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view)) {
580 669b5ffa 2018-10-07 stsp *focus = view;
581 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 1;
582 669b5ffa 2018-10-07 stsp err = view_fullscreen(view);
584 669b5ffa 2018-10-07 stsp err = view_splitscreen(view);
588 669b5ffa 2018-10-07 stsp err = view->input(new, dead, focus, view,
589 669b5ffa 2018-10-07 stsp KEY_RESIZE);
592 0cf4efb1 2018-09-29 stsp case KEY_RESIZE:
595 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
599 e5a0f69f 2018-08-18 stsp return err;
603 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
605 0cf4efb1 2018-09-29 stsp PANEL *panel;
606 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
608 669b5ffa 2018-10-07 stsp if (view->parent)
609 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
611 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
612 0cf4efb1 2018-09-29 stsp if (panel == NULL)
615 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
616 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
617 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
621 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
623 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
624 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
626 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
628 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
631 669b5ffa 2018-10-07 stsp return view->focussed;
634 bcbd79e2 2018-08-19 stsp static const struct got_error *
635 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
637 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
638 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
639 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
640 fd823528 2018-10-22 stsp int fast_refresh = 10;
641 1a76625f 2018-10-22 stsp int done = 0, errcode;
643 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
644 1a76625f 2018-10-22 stsp if (errcode)
645 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
647 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
648 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
650 a81bf10d 2018-09-29 stsp main_view = view;
651 1004088d 2018-09-29 stsp view->focussed = 1;
652 878940b7 2018-09-29 stsp err = view->show(view);
654 0cf4efb1 2018-09-29 stsp return err;
655 0cf4efb1 2018-09-29 stsp update_panels();
656 0cf4efb1 2018-09-29 stsp doupdate();
657 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
658 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
659 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
660 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
662 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
663 e4197bf9 2018-08-18 stsp view, &views);
666 e5a0f69f 2018-08-18 stsp if (dead_view) {
667 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
669 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
670 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
671 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
672 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
673 669b5ffa 2018-10-07 stsp prev = view->parent;
675 669b5ffa 2018-10-07 stsp if (dead_view->parent)
676 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
678 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
680 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
681 a81bf10d 2018-09-29 stsp if (err || dead_view == main_view)
684 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
685 0cf4efb1 2018-09-29 stsp if (focus_view)
686 0cf4efb1 2018-09-29 stsp view = focus_view;
687 669b5ffa 2018-10-07 stsp else if (prev)
688 669b5ffa 2018-10-07 stsp view = prev;
689 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
690 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
691 0cf4efb1 2018-09-29 stsp tog_view_list_head);
693 0cf4efb1 2018-09-29 stsp view = NULL;
694 669b5ffa 2018-10-07 stsp if (view) {
695 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
696 669b5ffa 2018-10-07 stsp focus_view = view->child;
698 669b5ffa 2018-10-07 stsp focus_view = view;
702 bcbd79e2 2018-08-19 stsp if (new_view) {
703 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
704 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
705 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
706 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
708 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
709 86c66b02 2018-10-18 stsp err = view_close(v);
714 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
715 fed7eaa8 2018-10-24 stsp view = new_view;
716 878940b7 2018-09-29 stsp if (focus_view == NULL)
717 878940b7 2018-09-29 stsp focus_view = new_view;
719 0cf4efb1 2018-09-29 stsp if (focus_view) {
720 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
722 0cf4efb1 2018-09-29 stsp view->focussed = 0;
723 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
724 0cf4efb1 2018-09-29 stsp view = focus_view;
725 878940b7 2018-09-29 stsp if (new_view)
726 878940b7 2018-09-29 stsp show_panel(new_view->panel);
727 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
728 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
730 669b5ffa 2018-10-07 stsp if (view) {
731 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
732 758194b5 2018-10-24 stsp view->focussed = 1;
733 758194b5 2018-10-24 stsp show_panel(view->panel);
734 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
735 758194b5 2018-10-24 stsp show_panel(view->child->panel);
736 1a76625f 2018-10-22 stsp focus_view = view;
738 669b5ffa 2018-10-07 stsp if (view->parent) {
739 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
743 669b5ffa 2018-10-07 stsp err = view->show(view);
746 669b5ffa 2018-10-07 stsp if (view->child) {
747 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
751 1a76625f 2018-10-22 stsp update_panels();
752 1a76625f 2018-10-22 stsp doupdate();
756 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
757 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
758 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
759 e5a0f69f 2018-08-18 stsp view_close(view);
762 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
763 1a76625f 2018-10-22 stsp if (errcode)
764 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
766 e5a0f69f 2018-08-18 stsp return err;
769 4ed7e80c 2018-05-20 stsp __dead static void
770 9f7d7167 2018-04-29 stsp usage_log(void)
773 c70c5802 2018-08-01 stsp fprintf(stderr,
774 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
775 9f7d7167 2018-04-29 stsp getprogname());
779 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
780 80ddbec8 2018-04-29 stsp static const struct got_error *
781 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
783 00dfcb92 2018-06-11 stsp char *vis = NULL;
784 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
786 963b370f 2018-05-20 stsp *ws = NULL;
787 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
788 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
789 00dfcb92 2018-06-11 stsp int vislen;
790 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
791 00dfcb92 2018-06-11 stsp return got_error_from_errno();
793 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
794 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
796 00dfcb92 2018-06-11 stsp return err;
797 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
798 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
799 a7f50699 2018-06-11 stsp err = got_error_from_errno(); /* give up */
804 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
805 a7f50699 2018-06-11 stsp if (*ws == NULL) {
806 a7f50699 2018-06-11 stsp err = got_error_from_errno();
810 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
811 963b370f 2018-05-20 stsp err = got_error_from_errno();
816 963b370f 2018-05-20 stsp *ws = NULL;
819 963b370f 2018-05-20 stsp return err;
822 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
823 963b370f 2018-05-20 stsp static const struct got_error *
824 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
826 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
827 963b370f 2018-05-20 stsp int cols = 0;
828 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
829 963b370f 2018-05-20 stsp size_t wlen;
832 963b370f 2018-05-20 stsp *wlinep = NULL;
833 b700b5d6 2018-07-10 stsp *widthp = 0;
835 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
837 963b370f 2018-05-20 stsp return err;
840 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
841 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
842 963b370f 2018-05-20 stsp switch (width) {
848 3c1f04f1 2018-09-13 stsp if (cols + width <= wlimit)
849 b700b5d6 2018-07-10 stsp cols += width;
853 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
854 b700b5d6 2018-07-10 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
858 963b370f 2018-05-20 stsp err = got_error_from_errno();
862 963b370f 2018-05-20 stsp wline[i] = L'\0';
863 b700b5d6 2018-07-10 stsp if (widthp)
864 b700b5d6 2018-07-10 stsp *widthp = cols;
867 963b370f 2018-05-20 stsp free(wline);
869 963b370f 2018-05-20 stsp *wlinep = wline;
870 963b370f 2018-05-20 stsp return err;
873 8b473291 2019-02-21 stsp static const struct got_error*
874 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
875 8b473291 2019-02-21 stsp struct got_object_id *id)
877 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
878 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
880 8b473291 2019-02-21 stsp const char *name;
882 8b473291 2019-02-21 stsp *refs_str = NULL;
884 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
885 8b473291 2019-02-21 stsp if (got_object_id_cmp(re->id, id) != 0)
887 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
888 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
890 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
892 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
894 8b473291 2019-02-21 stsp if (strncmp(name, "remotes/", 8) == 0)
896 8b473291 2019-02-21 stsp s = *refs_str;
897 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
898 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
899 8b473291 2019-02-21 stsp err = got_error_from_errno();
901 8b473291 2019-02-21 stsp *refs_str = NULL;
907 8b473291 2019-02-21 stsp return err;
910 963b370f 2018-05-20 stsp static const struct got_error *
911 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
912 8b473291 2019-02-21 stsp struct got_object_id *id, struct got_reflist_head *refs)
914 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
915 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
916 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
917 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
918 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
919 bb737323 2018-05-20 stsp int author_width, logmsg_width;
920 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
921 80ddbec8 2018-04-29 stsp char *line = NULL;
922 bb737323 2018-05-20 stsp int col, limit;
923 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
924 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
925 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
926 ccb26ccd 2018-11-05 stsp struct tm tm;
927 45d799e2 2018-12-23 stsp time_t committer_time;
929 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
930 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
931 ccb26ccd 2018-11-05 stsp return got_error_from_errno();
932 ccb26ccd 2018-11-05 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
933 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
934 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
936 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
937 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
939 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
940 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
941 b39d25c7 2018-07-10 stsp col = limit + 1;
942 b39d25c7 2018-07-10 stsp if (col > avail)
945 45d799e2 2018-12-23 stsp author0 = strdup(got_object_commit_get_author(commit));
946 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
947 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
950 6d9fbc00 2018-04-29 stsp author = author0;
951 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
952 6d9fbc00 2018-04-29 stsp if (smallerthan)
953 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
955 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
957 6d9fbc00 2018-04-29 stsp *at = '\0';
959 b39d25c7 2018-07-10 stsp limit = avail - col;
960 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
963 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
964 bb737323 2018-05-20 stsp col += author_width;
965 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
966 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
968 bb737323 2018-05-20 stsp author_width++;
970 9c2eaf34 2018-05-20 stsp if (col > avail)
973 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
974 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
975 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
978 bb737323 2018-05-20 stsp logmsg = logmsg0;
979 bb737323 2018-05-20 stsp while (*logmsg == '\n')
981 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
982 bb737323 2018-05-20 stsp if (newline)
983 bb737323 2018-05-20 stsp *newline = '\0';
984 bb737323 2018-05-20 stsp limit = avail - col;
985 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
988 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
989 bb737323 2018-05-20 stsp col += logmsg_width;
990 bb737323 2018-05-20 stsp while (col <= avail) {
991 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
995 80ddbec8 2018-04-29 stsp free(logmsg0);
996 bb737323 2018-05-20 stsp free(wlogmsg);
997 6d9fbc00 2018-04-29 stsp free(author0);
998 bb737323 2018-05-20 stsp free(wauthor);
999 80ddbec8 2018-04-29 stsp free(line);
1000 80ddbec8 2018-04-29 stsp return err;
1003 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1004 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1005 899d86c2 2018-05-10 stsp struct got_object_id *id)
1007 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1009 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1010 80ddbec8 2018-04-29 stsp if (entry == NULL)
1011 899d86c2 2018-05-10 stsp return NULL;
1013 899d86c2 2018-05-10 stsp entry->id = id;
1014 99db9666 2018-05-07 stsp entry->commit = commit;
1015 899d86c2 2018-05-10 stsp return entry;
1018 99db9666 2018-05-07 stsp static void
1019 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1021 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1023 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1024 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1025 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1026 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1027 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1028 99db9666 2018-05-07 stsp free(entry);
1031 99db9666 2018-05-07 stsp static void
1032 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1034 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1035 99db9666 2018-05-07 stsp pop_commit(commits);
1038 c4972b91 2018-05-07 stsp static const struct got_error *
1039 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1040 1a76625f 2018-10-22 stsp int minqueue, struct got_repository *repo, const char *path)
1042 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1043 93e45b7c 2018-09-24 stsp int nqueued = 0;
1046 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1047 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1048 1a76625f 2018-10-22 stsp * while updating the display.
1050 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
1051 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1052 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1053 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1054 1a76625f 2018-10-22 stsp int errcode;
1056 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1057 9ba79e04 2018-06-11 stsp if (err) {
1058 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1060 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1061 93e45b7c 2018-09-24 stsp minqueue, repo);
1063 ecb28ae0 2018-07-16 stsp return err;
1067 ecb28ae0 2018-07-16 stsp if (id == NULL)
1070 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1073 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1074 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1075 9ba79e04 2018-06-11 stsp err = got_error_from_errno();
1079 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1080 1a76625f 2018-10-22 stsp if (errcode) {
1081 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1085 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1086 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1087 ecb28ae0 2018-07-16 stsp nqueued++;
1088 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1090 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1091 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1092 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1095 9ba79e04 2018-06-11 stsp return err;
1098 99db9666 2018-05-07 stsp static const struct got_error *
1099 9ba79e04 2018-06-11 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1101 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1102 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1104 9ba79e04 2018-06-11 stsp *head_id = NULL;
1106 9ba79e04 2018-06-11 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1108 99db9666 2018-05-07 stsp return err;
1110 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1111 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1112 9ba79e04 2018-06-11 stsp if (err) {
1113 9ba79e04 2018-06-11 stsp *head_id = NULL;
1114 99db9666 2018-05-07 stsp return err;
1117 9ba79e04 2018-06-11 stsp return NULL;
1120 0553a4e3 2018-04-30 stsp static const struct got_error *
1121 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1122 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1123 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1124 8b473291 2019-02-21 stsp struct got_reflist_head *refs, const char *path, int commits_needed)
1126 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1127 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1128 ecb28ae0 2018-07-16 stsp int ncommits, width;
1129 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1130 8b473291 2019-02-21 stsp char *refs_str = NULL;
1131 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1133 e0d42f60 2018-07-22 stsp entry = first;
1134 e0d42f60 2018-07-22 stsp ncommits = 0;
1135 e0d42f60 2018-07-22 stsp while (entry) {
1136 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1137 e0d42f60 2018-07-22 stsp *selected = entry;
1140 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1141 e0d42f60 2018-07-22 stsp ncommits++;
1144 1a76625f 2018-10-22 stsp if (*selected) {
1145 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1147 ecb28ae0 2018-07-16 stsp return err;
1148 8b473291 2019-02-21 stsp if (refs) {
1149 8b473291 2019-02-21 stsp err = build_refs_str(&refs_str, refs, (*selected)->id);
1151 8b473291 2019-02-21 stsp goto done;
1155 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1156 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1158 8b473291 2019-02-21 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1159 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1160 8b473291 2019-02-21 stsp commits_needed > 0 ? "loading... " :
1161 8b473291 2019-02-21 stsp (refs_str ? refs_str : "")) == -1) {
1162 8b473291 2019-02-21 stsp err = got_error_from_errno();
1163 8b473291 2019-02-21 stsp goto done;
1166 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1167 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1168 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1169 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1170 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1171 1a76625f 2018-10-22 stsp header = NULL;
1172 1a76625f 2018-10-22 stsp goto done;
1174 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1175 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1176 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1177 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1178 1a76625f 2018-10-22 stsp header = NULL;
1179 1a76625f 2018-10-22 stsp goto done;
1181 1a76625f 2018-10-22 stsp err = format_line(&wline, &width, header, view->ncols);
1183 1a76625f 2018-10-22 stsp goto done;
1185 2814baeb 2018-08-01 stsp werase(view->window);
1187 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1188 a3404814 2018-09-02 stsp wstandout(view->window);
1189 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1190 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1191 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1194 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1195 a3404814 2018-09-02 stsp wstandend(view->window);
1196 ecb28ae0 2018-07-16 stsp free(wline);
1197 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1198 1a76625f 2018-10-22 stsp goto done;
1200 899d86c2 2018-05-10 stsp entry = first;
1201 899d86c2 2018-05-10 stsp *last = first;
1202 867c6645 2018-07-10 stsp ncommits = 0;
1203 899d86c2 2018-05-10 stsp while (entry) {
1204 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1206 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1207 2814baeb 2018-08-01 stsp wstandout(view->window);
1208 8b473291 2019-02-21 stsp err = draw_commit(view, entry->commit, entry->id, refs);
1209 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1210 2814baeb 2018-08-01 stsp wstandend(view->window);
1213 0553a4e3 2018-04-30 stsp ncommits++;
1214 899d86c2 2018-05-10 stsp *last = entry;
1215 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1218 1a57306a 2018-09-02 stsp view_vborder(view);
1220 1a76625f 2018-10-22 stsp free(id_str);
1221 8b473291 2019-02-21 stsp free(refs_str);
1222 1a76625f 2018-10-22 stsp free(ncommits_str);
1223 1a76625f 2018-10-22 stsp free(header);
1224 80ddbec8 2018-04-29 stsp return err;
1227 07b55e75 2018-05-10 stsp static void
1228 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1229 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1231 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1232 07b55e75 2018-05-10 stsp int nscrolled = 0;
1234 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1235 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
1238 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1239 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1240 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1241 07b55e75 2018-05-10 stsp if (entry) {
1242 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1243 07b55e75 2018-05-10 stsp nscrolled++;
1248 aa075928 2018-05-10 stsp static const struct got_error *
1249 5e224a3e 2019-02-22 stsp trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1250 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1252 5e224a3e 2019-02-22 stsp int errcode;
1254 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1255 5e224a3e 2019-02-22 stsp if (*log_complete)
1258 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1259 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1260 7aafa0d1 2019-02-22 stsp if (errcode)
1261 7aafa0d1 2019-02-22 stsp return got_error_set_errno(errcode);
1262 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1263 7aafa0d1 2019-02-22 stsp if (errcode)
1264 7aafa0d1 2019-02-22 stsp return got_error_set_errno(errcode);
1265 7aafa0d1 2019-02-22 stsp pthread_yield();
1266 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1267 7aafa0d1 2019-02-22 stsp if (errcode)
1268 7aafa0d1 2019-02-22 stsp return got_error_set_errno(errcode);
1270 5e224a3e 2019-02-22 stsp if (*commits_needed > 0 && !load_all) {
1272 5e224a3e 2019-02-22 stsp * Thread is not done yet; lose a key press
1273 5e224a3e 2019-02-22 stsp * and let the user retry... this way the GUI
1274 5e224a3e 2019-02-22 stsp * remains interactive while logging deep paths
1275 5e224a3e 2019-02-22 stsp * with few commits in history.
1277 359bfafd 2019-02-22 stsp halfdelay(1); /* fast refresh while loading */
1278 7aafa0d1 2019-02-22 stsp return NULL;
1282 5e224a3e 2019-02-22 stsp return NULL;
1285 5e224a3e 2019-02-22 stsp static const struct got_error *
1286 5e224a3e 2019-02-22 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1287 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1288 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1289 5e224a3e 2019-02-22 stsp pthread_cond_t *need_commits)
1291 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1292 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1293 5e224a3e 2019-02-22 stsp int nscrolled = 0;
1295 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1296 5e224a3e 2019-02-22 stsp return NULL;
1298 5e224a3e 2019-02-22 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1299 5e224a3e 2019-02-22 stsp if (pentry == NULL && !*log_complete) {
1301 08ebd0a9 2019-02-22 stsp * Ask the log thread for required amount of commits
1302 08ebd0a9 2019-02-22 stsp * plus some amount of pre-fetching.
1304 08ebd0a9 2019-02-22 stsp (*commits_needed) += maxscroll + 20;
1305 5e224a3e 2019-02-22 stsp err = trigger_log_thread(0, commits_needed, log_complete,
1306 5e224a3e 2019-02-22 stsp need_commits);
1308 5e224a3e 2019-02-22 stsp return err;
1312 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1313 88048b54 2019-02-21 stsp if (pentry == NULL)
1316 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1318 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1319 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1321 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1322 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1324 dd0a52c1 2018-05-20 stsp return err;
1327 cd0acaa7 2018-05-20 stsp static const struct got_error *
1328 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1329 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1330 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1331 8b473291 2019-02-21 stsp struct got_repository *repo)
1333 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1334 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1335 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1337 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1338 15a94983 2018-12-23 stsp if (diff_view == NULL)
1339 15a94983 2018-12-23 stsp return got_error_from_errno();
1341 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1342 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1343 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1344 e5a0f69f 2018-08-18 stsp if (err == NULL)
1345 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1346 cd0acaa7 2018-05-20 stsp return err;
1349 80ddbec8 2018-04-29 stsp static const struct got_error *
1350 0cf4efb1 2018-09-29 stsp browse_commit(struct tog_view **new_view, int begin_x,
1351 8b473291 2019-02-21 stsp struct commit_queue_entry *entry, struct got_reflist_head *refs,
1352 8b473291 2019-02-21 stsp struct got_repository *repo)
1354 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1355 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1356 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1358 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree, repo,
1359 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(entry->commit));
1361 9343a5fb 2018-06-23 stsp return err;
1363 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1364 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1365 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1367 8b473291 2019-02-21 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1369 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1371 e5a0f69f 2018-08-18 stsp *new_view = tree_view;
1372 1a76625f 2018-10-22 stsp return err;
1375 1a76625f 2018-10-22 stsp static void *
1376 1a76625f 2018-10-22 stsp log_thread(void *arg)
1378 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1379 1a76625f 2018-10-22 stsp int errcode = 0;
1380 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1381 1a76625f 2018-10-22 stsp int done = 0;
1383 1a76625f 2018-10-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1385 1a76625f 2018-10-22 stsp return (void *)err;
1387 1a76625f 2018-10-22 stsp while (!done && !err) {
1388 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1389 1a76625f 2018-10-22 stsp a->in_repo_path);
1390 1a76625f 2018-10-22 stsp if (err) {
1391 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1392 1a76625f 2018-10-22 stsp return (void *)err;
1393 1a76625f 2018-10-22 stsp err = NULL;
1395 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1396 1a76625f 2018-10-22 stsp a->commits_needed--;
1398 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1399 1a76625f 2018-10-22 stsp if (errcode)
1400 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
1403 1a76625f 2018-10-22 stsp a->log_complete = 1;
1404 1a76625f 2018-10-22 stsp else if (*a->quit) {
1406 1a76625f 2018-10-22 stsp a->log_complete = 1;
1407 1a76625f 2018-10-22 stsp } else if (*a->first_displayed_entry == NULL) {
1408 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1409 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1410 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1414 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1415 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1416 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1417 1a76625f 2018-10-22 stsp &tog_mutex);
1418 1a76625f 2018-10-22 stsp if (errcode)
1419 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1422 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1423 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1424 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1426 1a76625f 2018-10-22 stsp return (void *)err;
1429 1a76625f 2018-10-22 stsp static const struct got_error *
1430 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1432 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1433 1a76625f 2018-10-22 stsp int errcode;
1435 1a76625f 2018-10-22 stsp if (s->thread) {
1436 1a76625f 2018-10-22 stsp s->quit = 1;
1437 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1438 1a76625f 2018-10-22 stsp if (errcode)
1439 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1440 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1441 1a76625f 2018-10-22 stsp if (errcode)
1442 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1443 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1444 1a76625f 2018-10-22 stsp if (errcode)
1445 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1446 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1447 1a76625f 2018-10-22 stsp if (errcode)
1448 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1449 1a76625f 2018-10-22 stsp s->thread = NULL;
1452 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1453 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1454 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1456 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1457 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1458 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1461 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1462 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1463 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1466 9343a5fb 2018-06-23 stsp return err;
1469 9343a5fb 2018-06-23 stsp static const struct got_error *
1470 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1472 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1473 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1475 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1476 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1477 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1478 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1479 1a76625f 2018-10-22 stsp free(s->start_id);
1480 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1481 1a76625f 2018-10-22 stsp return err;
1484 1a76625f 2018-10-22 stsp static const struct got_error *
1485 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1486 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
1487 8b473291 2019-02-21 stsp const char *path, int check_disk)
1489 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1490 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1491 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1492 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1493 1a76625f 2018-10-22 stsp int errcode;
1495 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1496 ecb28ae0 2018-07-16 stsp if (err != NULL)
1497 ecb28ae0 2018-07-16 stsp goto done;
1499 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1500 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1501 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1503 8b473291 2019-02-21 stsp s->refs = refs;
1504 fb2756b9 2018-08-04 stsp s->repo = repo;
1505 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1506 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1507 5036bf37 2018-09-24 stsp err = got_error_from_errno();
1508 5036bf37 2018-09-24 stsp goto done;
1511 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1512 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1513 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1515 1a76625f 2018-10-22 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1517 1a76625f 2018-10-22 stsp goto done;
1518 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1519 1a76625f 2018-10-22 stsp 0, thread_repo);
1521 1a76625f 2018-10-22 stsp goto done;
1523 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1524 1a76625f 2018-10-22 stsp if (errcode) {
1525 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1526 1a76625f 2018-10-22 stsp goto done;
1529 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1530 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1531 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1532 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1533 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1534 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1535 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1536 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1537 1a76625f 2018-10-22 stsp s->thread_args.view = view;
1538 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1539 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1542 1a76625f 2018-10-22 stsp close_log_view(view);
1543 ba4f502b 2018-08-04 stsp return err;
1546 e5a0f69f 2018-08-18 stsp static const struct got_error *
1547 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1549 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1551 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1552 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1553 2b380cc8 2018-10-24 stsp &s->thread_args);
1554 2b380cc8 2018-10-24 stsp if (errcode)
1555 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
1558 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1559 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1560 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
1561 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
1564 e5a0f69f 2018-08-18 stsp static const struct got_error *
1565 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1566 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1568 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1569 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1570 5036bf37 2018-09-24 stsp char *parent_path;
1571 669b5ffa 2018-10-07 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
1572 669b5ffa 2018-10-07 stsp int begin_x = 0;
1574 e5a0f69f 2018-08-18 stsp switch (ch) {
1576 1a76625f 2018-10-22 stsp s->quit = 1;
1579 e5a0f69f 2018-08-18 stsp case KEY_UP:
1582 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1584 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1585 e5a0f69f 2018-08-18 stsp s->selected--;
1586 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1588 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry, 1,
1589 e5a0f69f 2018-08-18 stsp &s->commits);
1591 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1592 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1594 e5a0f69f 2018-08-18 stsp if (TAILQ_FIRST(&s->commits.head) ==
1595 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
1596 e5a0f69f 2018-08-18 stsp s->selected = 0;
1599 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry,
1600 e5a0f69f 2018-08-18 stsp view->nlines, &s->commits);
1603 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1606 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1608 e5a0f69f 2018-08-18 stsp if (s->selected < MIN(view->nlines - 2,
1609 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1610 e5a0f69f 2018-08-18 stsp s->selected++;
1613 ca9338a5 2019-02-22 stsp err = scroll_down(&s->first_displayed_entry, 1,
1614 93e45b7c 2018-09-24 stsp &s->last_displayed_entry, &s->commits,
1615 1a76625f 2018-10-22 stsp &s->thread_args.log_complete,
1616 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1617 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1619 e5a0f69f 2018-08-18 stsp case KEY_NPAGE: {
1620 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *first;
1621 e5a0f69f 2018-08-18 stsp first = s->first_displayed_entry;
1622 2b380cc8 2018-10-24 stsp if (first == NULL)
1624 ca9338a5 2019-02-22 stsp err = scroll_down(&s->first_displayed_entry,
1625 93e45b7c 2018-09-24 stsp view->nlines, &s->last_displayed_entry,
1626 1a76625f 2018-10-22 stsp &s->commits, &s->thread_args.log_complete,
1627 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1628 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1629 e5a0f69f 2018-08-18 stsp if (first == s->first_displayed_entry &&
1630 e5a0f69f 2018-08-18 stsp s->selected < MIN(view->nlines - 2,
1631 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1632 e5a0f69f 2018-08-18 stsp /* can't scroll further down */
1633 e5a0f69f 2018-08-18 stsp s->selected = MIN(view->nlines - 2,
1634 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1);
1636 e5a0f69f 2018-08-18 stsp err = NULL;
1639 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
1640 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines - 2)
1641 e5a0f69f 2018-08-18 stsp s->selected = view->nlines - 2;
1642 e5a0f69f 2018-08-18 stsp if (s->selected > s->commits.ncommits - 1)
1643 e5a0f69f 2018-08-18 stsp s->selected = s->commits.ncommits - 1;
1645 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
1646 e5a0f69f 2018-08-18 stsp case '\r':
1647 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1649 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1650 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1651 669b5ffa 2018-10-07 stsp err = open_diff_view_for_commit(&diff_view, begin_x,
1652 fb872ab2 2019-02-21 stsp s->selected_entry->commit, s->selected_entry->id,
1653 8b473291 2019-02-21 stsp view, s->refs, s->repo);
1656 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1657 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1659 669b5ffa 2018-10-07 stsp return err;
1660 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
1661 669b5ffa 2018-10-07 stsp if (err) {
1662 669b5ffa 2018-10-07 stsp view_close(diff_view);
1665 55566b34 2018-11-05 stsp *focus_view = diff_view;
1666 55566b34 2018-11-05 stsp view->child_focussed = 1;
1668 669b5ffa 2018-10-07 stsp *new_view = diff_view;
1671 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1673 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1674 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1675 669b5ffa 2018-10-07 stsp err = browse_commit(&tree_view, begin_x,
1676 8b473291 2019-02-21 stsp s->selected_entry, s->refs, s->repo);
1679 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1680 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1682 669b5ffa 2018-10-07 stsp return err;
1683 669b5ffa 2018-10-07 stsp err = view_set_child(view, tree_view);
1684 669b5ffa 2018-10-07 stsp if (err) {
1685 669b5ffa 2018-10-07 stsp view_close(tree_view);
1688 669b5ffa 2018-10-07 stsp *focus_view = tree_view;
1689 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
1691 669b5ffa 2018-10-07 stsp *new_view = tree_view;
1693 5036bf37 2018-09-24 stsp case KEY_BACKSPACE:
1694 5036bf37 2018-09-24 stsp if (strcmp(s->in_repo_path, "/") == 0)
1696 5036bf37 2018-09-24 stsp parent_path = dirname(s->in_repo_path);
1697 5036bf37 2018-09-24 stsp if (parent_path && strcmp(parent_path, ".") != 0) {
1698 5036bf37 2018-09-24 stsp struct tog_view *lv;
1699 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1701 1a76625f 2018-10-22 stsp return err;
1702 0cf4efb1 2018-09-29 stsp lv = view_open(view->nlines, view->ncols,
1703 0cf4efb1 2018-09-29 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
1704 5036bf37 2018-09-24 stsp if (lv == NULL)
1705 5036bf37 2018-09-24 stsp return got_error_from_errno();
1706 8b473291 2019-02-21 stsp err = open_log_view(lv, s->start_id, s->refs,
1707 8b473291 2019-02-21 stsp s->repo, parent_path, 0);
1709 1a76625f 2018-10-22 stsp return err;;
1710 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1711 669b5ffa 2018-10-07 stsp *new_view = lv;
1713 669b5ffa 2018-10-07 stsp view_set_child(view->parent, lv);
1714 34095730 2018-10-22 stsp *focus_view = lv;
1716 1a76625f 2018-10-22 stsp return NULL;
1723 80ddbec8 2018-04-29 stsp return err;
1726 4ed7e80c 2018-05-20 stsp static const struct got_error *
1727 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
1729 c2db6724 2019-01-04 stsp const struct got_error *error;
1731 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
1732 c2db6724 2019-01-04 stsp return got_error_from_errno();
1734 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
1735 c2db6724 2019-01-04 stsp return got_error_from_errno();
1737 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
1738 c2db6724 2019-01-04 stsp return got_error_from_errno();
1740 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
1741 c2db6724 2019-01-04 stsp if (error != NULL)
1742 c2db6724 2019-01-04 stsp return error;
1744 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
1745 c2db6724 2019-01-04 stsp return got_error_from_errno();
1747 c2db6724 2019-01-04 stsp return NULL;
1750 a915003a 2019-02-05 stsp static void
1751 a915003a 2019-02-05 stsp init_curses(void)
1753 a915003a 2019-02-05 stsp initscr();
1755 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
1758 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
1759 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
1760 a915003a 2019-02-05 stsp curs_set(0);
1761 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
1764 c2db6724 2019-01-04 stsp static const struct got_error *
1765 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
1767 80ddbec8 2018-04-29 stsp const struct got_error *error;
1768 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
1769 8b473291 2019-02-21 stsp struct got_reflist_head refs;
1770 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
1771 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
1772 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
1774 04cc582a 2018-08-01 stsp struct tog_view *view;
1776 80ddbec8 2018-04-29 stsp #ifndef PROFILE
1777 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1778 c2db6724 2019-01-04 stsp NULL) == -1)
1779 80ddbec8 2018-04-29 stsp err(1, "pledge");
1782 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1783 80ddbec8 2018-04-29 stsp switch (ch) {
1785 80ddbec8 2018-04-29 stsp start_commit = optarg;
1788 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1789 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
1790 ecb28ae0 2018-07-16 stsp err(1, "-r option");
1794 80ddbec8 2018-04-29 stsp /* NOTREACHED */
1798 80ddbec8 2018-04-29 stsp argc -= optind;
1799 80ddbec8 2018-04-29 stsp argv += optind;
1801 ecb28ae0 2018-07-16 stsp if (argc == 0)
1802 ecb28ae0 2018-07-16 stsp path = strdup("");
1803 ecb28ae0 2018-07-16 stsp else if (argc == 1)
1804 ecb28ae0 2018-07-16 stsp path = strdup(argv[0]);
1806 80ddbec8 2018-04-29 stsp usage_log();
1807 ecb28ae0 2018-07-16 stsp if (path == NULL)
1808 ecb28ae0 2018-07-16 stsp return got_error_from_errno();
1810 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
1811 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
1812 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1813 ecb28ae0 2018-07-16 stsp goto done;
1815 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1816 b7165be3 2019-02-05 stsp struct got_worktree *worktree;
1817 b7165be3 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
1818 b7165be3 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1819 b7165be3 2019-02-05 stsp goto done;
1820 b7165be3 2019-02-05 stsp if (worktree) {
1821 b7165be3 2019-02-05 stsp repo_path =
1822 b7165be3 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
1823 b7165be3 2019-02-05 stsp got_worktree_close(worktree);
1825 b7165be3 2019-02-05 stsp repo_path = strdup(cwd);
1826 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1827 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1828 ecb28ae0 2018-07-16 stsp goto done;
1832 a915003a 2019-02-05 stsp init_curses();
1834 c2db6724 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
1835 c2db6724 2019-01-04 stsp if (error)
1836 c2db6724 2019-01-04 stsp goto done;
1838 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
1839 80ddbec8 2018-04-29 stsp if (error != NULL)
1840 ecb28ae0 2018-07-16 stsp goto done;
1842 15a94983 2018-12-23 stsp if (start_commit == NULL)
1843 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
1845 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&start_id, repo,
1846 15a94983 2018-12-23 stsp start_commit);
1847 80ddbec8 2018-04-29 stsp if (error != NULL)
1848 8b473291 2019-02-21 stsp goto done;
1850 8b473291 2019-02-21 stsp SIMPLEQ_INIT(&refs);
1851 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
1852 8b473291 2019-02-21 stsp if (error)
1853 ecb28ae0 2018-07-16 stsp goto done;
1855 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1856 04cc582a 2018-08-01 stsp if (view == NULL) {
1857 04cc582a 2018-08-01 stsp error = got_error_from_errno();
1858 04cc582a 2018-08-01 stsp goto done;
1860 8b473291 2019-02-21 stsp error = open_log_view(view, start_id, &refs, repo, path, 1);
1861 ba4f502b 2018-08-04 stsp if (error)
1862 ba4f502b 2018-08-04 stsp goto done;
1863 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1865 ecb28ae0 2018-07-16 stsp free(repo_path);
1866 ecb28ae0 2018-07-16 stsp free(cwd);
1867 ecb28ae0 2018-07-16 stsp free(path);
1868 899d86c2 2018-05-10 stsp free(start_id);
1870 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
1871 80ddbec8 2018-04-29 stsp return error;
1874 4ed7e80c 2018-05-20 stsp __dead static void
1875 9f7d7167 2018-04-29 stsp usage_diff(void)
1878 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1879 9f7d7167 2018-04-29 stsp getprogname());
1883 b304db33 2018-05-20 stsp static char *
1884 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
1886 b304db33 2018-05-20 stsp char *line;
1887 b304db33 2018-05-20 stsp size_t linelen;
1888 b304db33 2018-05-20 stsp size_t lineno;
1889 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
1891 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
1893 b304db33 2018-05-20 stsp *len = linelen;
1894 b304db33 2018-05-20 stsp return line;
1897 4ed7e80c 2018-05-20 stsp static const struct got_error *
1898 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1899 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
1900 a3404814 2018-09-02 stsp char * header)
1902 61e69b96 2018-05-20 stsp const struct got_error *err;
1903 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
1904 b304db33 2018-05-20 stsp char *line;
1905 b304db33 2018-05-20 stsp size_t len;
1906 61e69b96 2018-05-20 stsp wchar_t *wline;
1907 e0b650dd 2018-05-20 stsp int width;
1909 26ed57b2 2018-05-19 stsp rewind(f);
1910 f7d12f7e 2018-08-01 stsp werase(view->window);
1912 a3404814 2018-09-02 stsp if (header) {
1913 a3404814 2018-09-02 stsp err = format_line(&wline, &width, header, view->ncols);
1914 a3404814 2018-09-02 stsp if (err) {
1915 a3404814 2018-09-02 stsp return err;
1918 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1919 a3404814 2018-09-02 stsp wstandout(view->window);
1920 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
1921 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1922 a3404814 2018-09-02 stsp wstandend(view->window);
1923 a3404814 2018-09-02 stsp if (width < view->ncols)
1924 a3404814 2018-09-02 stsp waddch(view->window, '\n');
1926 a3404814 2018-09-02 stsp if (max_lines <= 1)
1927 a3404814 2018-09-02 stsp return NULL;
1928 a3404814 2018-09-02 stsp max_lines--;
1932 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
1933 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
1934 26ed57b2 2018-05-19 stsp if (line == NULL) {
1938 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
1939 26ed57b2 2018-05-19 stsp free(line);
1943 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1944 61e69b96 2018-05-20 stsp if (err) {
1945 61e69b96 2018-05-20 stsp free(line);
1946 61e69b96 2018-05-20 stsp return err;
1948 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1949 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1950 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1951 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
1952 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
1953 26ed57b2 2018-05-19 stsp free(line);
1954 2550e4c3 2018-07-13 stsp free(wline);
1955 2550e4c3 2018-07-13 stsp wline = NULL;
1957 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
1959 1a57306a 2018-09-02 stsp view_vborder(view);
1961 26ed57b2 2018-05-19 stsp return NULL;
1964 abd2672a 2018-12-23 stsp static char *
1965 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
1967 abd2672a 2018-12-23 stsp char *p, *s = ctime_r(time, datebuf);
1968 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
1970 abd2672a 2018-12-23 stsp *p = '\0';
1974 4ed7e80c 2018-05-20 stsp static const struct got_error *
1975 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
1976 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
1978 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
1979 abd2672a 2018-12-23 stsp char datebuf[26];
1980 15a94983 2018-12-23 stsp struct got_commit_object *commit;
1981 15a94983 2018-12-23 stsp char *id_str = NULL;
1982 45d799e2 2018-12-23 stsp time_t committer_time;
1983 45d799e2 2018-12-23 stsp const char *author, *committer;
1984 8b473291 2019-02-21 stsp char *refs_str = NULL;
1986 8b473291 2019-02-21 stsp if (refs) {
1987 8b473291 2019-02-21 stsp err = build_refs_str(&refs_str, refs, commit_id);
1989 8b473291 2019-02-21 stsp return err;
1992 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
1994 abd2672a 2018-12-23 stsp return err;
1996 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
1997 15a94983 2018-12-23 stsp if (err) {
1998 15a94983 2018-12-23 stsp err = got_error_from_errno();
1999 15a94983 2018-12-23 stsp goto done;
2002 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2003 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2004 abd2672a 2018-12-23 stsp err = got_error_from_errno();
2005 abd2672a 2018-12-23 stsp goto done;
2007 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2008 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2009 abd2672a 2018-12-23 stsp err = got_error_from_errno();
2010 abd2672a 2018-12-23 stsp goto done;
2012 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2013 abd2672a 2018-12-23 stsp if (fprintf(outfile, "date: %s UTC\n",
2014 45d799e2 2018-12-23 stsp get_datestr(&committer_time, datebuf)) < 0) {
2015 abd2672a 2018-12-23 stsp err = got_error_from_errno();
2016 abd2672a 2018-12-23 stsp goto done;
2018 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2019 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2020 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2021 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2022 abd2672a 2018-12-23 stsp err = got_error_from_errno();
2023 abd2672a 2018-12-23 stsp goto done;
2025 45d799e2 2018-12-23 stsp if (fprintf(outfile, "%s\n",
2026 45d799e2 2018-12-23 stsp got_object_commit_get_logmsg(commit)) < 0) {
2027 abd2672a 2018-12-23 stsp err = got_error_from_errno();
2028 abd2672a 2018-12-23 stsp goto done;
2031 abd2672a 2018-12-23 stsp free(id_str);
2032 8b473291 2019-02-21 stsp free(refs_str);
2033 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2034 abd2672a 2018-12-23 stsp return err;
2037 abd2672a 2018-12-23 stsp static const struct got_error *
2038 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
2040 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
2041 48ae06ee 2018-10-18 stsp FILE *f = NULL;
2042 15a94983 2018-12-23 stsp int obj_type;
2044 511a516b 2018-05-19 stsp f = got_opentemp();
2045 48ae06ee 2018-10-18 stsp if (f == NULL) {
2046 48ae06ee 2018-10-18 stsp err = got_error_from_errno();
2047 48ae06ee 2018-10-18 stsp goto done;
2049 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
2050 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
2051 fb43ecf1 2019-02-11 stsp goto done;
2055 15a94983 2018-12-23 stsp if (s->id1)
2056 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
2058 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
2060 15a94983 2018-12-23 stsp goto done;
2062 15a94983 2018-12-23 stsp switch (obj_type) {
2063 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
2064 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2065 54156555 2018-12-24 stsp s->diff_context, s->repo, f);
2067 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
2068 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2069 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
2071 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
2072 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
2073 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
2074 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
2076 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2079 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
2080 15a087fe 2019-02-21 stsp if (s->id1 == NULL)
2081 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs, s->repo, f);
2083 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
2084 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2085 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
2086 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs,
2087 8b473291 2019-02-21 stsp s->repo, f);
2092 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
2094 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
2095 15a94983 2018-12-23 stsp s->diff_context, s->repo, f);
2099 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2103 cbe7f848 2019-02-11 stsp if (f && fflush(f) != 0 && err == NULL)
2104 cbe7f848 2019-02-11 stsp err = got_error_from_errno();
2105 48ae06ee 2018-10-18 stsp return err;
2108 48ae06ee 2018-10-18 stsp static const struct got_error *
2109 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
2110 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
2111 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
2113 48ae06ee 2018-10-18 stsp const struct got_error *err;
2115 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
2116 15a94983 2018-12-23 stsp int type1, type2;
2117 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
2119 15a94983 2018-12-23 stsp return err;
2120 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
2122 15a94983 2018-12-23 stsp return err;
2124 15a94983 2018-12-23 stsp if (type1 != type2)
2125 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
2128 15a94983 2018-12-23 stsp if (id1) {
2129 15a94983 2018-12-23 stsp view->state.diff.id1 = got_object_id_dup(id1);
2130 15a94983 2018-12-23 stsp if (view->state.diff.id1 == NULL)
2131 48ae06ee 2018-10-18 stsp return got_error_from_errno();
2133 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2135 15a94983 2018-12-23 stsp view->state.diff.id2 = got_object_id_dup(id2);
2136 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
2137 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2138 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2139 48ae06ee 2018-10-18 stsp return got_error_from_errno();
2141 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
2142 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
2143 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
2144 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
2145 fb872ab2 2019-02-21 stsp view->state.diff.log_view = log_view;
2146 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
2147 8b473291 2019-02-21 stsp view->state.diff.refs = refs;
2149 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
2150 48ae06ee 2018-10-18 stsp if (err) {
2151 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2152 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2153 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2154 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2155 48ae06ee 2018-10-18 stsp return err;
2158 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
2159 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
2160 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
2162 5dc9f4bc 2018-08-04 stsp return NULL;
2165 e5a0f69f 2018-08-18 stsp static const struct got_error *
2166 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
2168 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2170 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2171 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2172 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2173 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2174 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2175 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2176 e5a0f69f 2018-08-18 stsp return err;
2179 5dc9f4bc 2018-08-04 stsp static const struct got_error *
2180 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
2182 a3404814 2018-09-02 stsp const struct got_error *err;
2183 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
2184 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
2186 a3404814 2018-09-02 stsp if (s->id1) {
2187 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
2189 a3404814 2018-09-02 stsp return err;
2191 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
2193 a3404814 2018-09-02 stsp return err;
2195 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
2196 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2197 a3404814 2018-09-02 stsp err = got_error_from_errno();
2198 a3404814 2018-09-02 stsp free(id_str1);
2199 a3404814 2018-09-02 stsp free(id_str2);
2200 a3404814 2018-09-02 stsp return err;
2202 a3404814 2018-09-02 stsp free(id_str1);
2203 a3404814 2018-09-02 stsp free(id_str2);
2205 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
2206 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
2210 15a087fe 2019-02-21 stsp static const struct got_error *
2211 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
2212 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
2214 d7a04538 2019-02-21 stsp const struct got_error *err;
2215 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
2216 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
2217 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
2219 15a087fe 2019-02-21 stsp free(s->id2);
2220 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
2221 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
2222 15a087fe 2019-02-21 stsp return got_error_from_errno();
2224 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2226 d7a04538 2019-02-21 stsp return err;
2227 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
2228 15a087fe 2019-02-21 stsp free(s->id1);
2229 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
2230 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2231 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
2232 15a087fe 2019-02-21 stsp return NULL;
2235 0cf4efb1 2018-09-29 stsp static const struct got_error *
2236 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2237 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2239 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
2240 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
2241 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
2242 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
2245 e5a0f69f 2018-08-18 stsp switch (ch) {
2247 e5a0f69f 2018-08-18 stsp case KEY_UP:
2248 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > 1)
2249 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2251 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2253 e5a0f69f 2018-08-18 stsp while (i++ < view->nlines - 1 &&
2254 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2255 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2258 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2259 e5a0f69f 2018-08-18 stsp if (!s->eof)
2260 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2262 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2265 e5a0f69f 2018-08-18 stsp while (!s->eof && i++ < view->nlines - 1) {
2266 e5a0f69f 2018-08-18 stsp char *line;
2267 e5a0f69f 2018-08-18 stsp line = parse_next_line(s->f, NULL);
2268 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2269 e5a0f69f 2018-08-18 stsp if (line == NULL)
2274 48ae06ee 2018-10-18 stsp if (s->diff_context > 0) {
2275 48ae06ee 2018-10-18 stsp s->diff_context--;
2276 48ae06ee 2018-10-18 stsp err = create_diff(s);
2280 4a8520aa 2018-10-18 stsp if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2281 48ae06ee 2018-10-18 stsp s->diff_context++;
2282 48ae06ee 2018-10-18 stsp err = create_diff(s);
2287 fb872ab2 2019-02-21 stsp if (s->log_view == NULL)
2289 fb872ab2 2019-02-21 stsp ls = &s->log_view->state.log;
2290 fb872ab2 2019-02-21 stsp entry = TAILQ_PREV(ls->selected_entry,
2291 15a087fe 2019-02-21 stsp commit_queue_head, entry);
2292 15a087fe 2019-02-21 stsp if (entry == NULL)
2295 6524637e 2019-02-21 stsp err = input_log_view(NULL, NULL, NULL, s->log_view,
2300 15a087fe 2019-02-21 stsp err = set_selected_commit(s, entry);
2304 15a087fe 2019-02-21 stsp s->first_displayed_line = 1;
2305 15a087fe 2019-02-21 stsp s->last_displayed_line = view->nlines;
2307 15a087fe 2019-02-21 stsp err = create_diff(s);
2311 fb872ab2 2019-02-21 stsp if (s->log_view == NULL)
2313 fb872ab2 2019-02-21 stsp ls = &s->log_view->state.log;
2315 5e224a3e 2019-02-22 stsp if (ls->thread_args.commits_needed == 0) {
2316 5e224a3e 2019-02-22 stsp ls->thread_args.commits_needed++;
2318 5e224a3e 2019-02-22 stsp /* Display "loading..." in log view. */
2319 5e224a3e 2019-02-22 stsp show_log_view(s->log_view);
2320 5e224a3e 2019-02-22 stsp update_panels();
2321 5e224a3e 2019-02-22 stsp doupdate();
2323 5e224a3e 2019-02-22 stsp err = trigger_log_thread(1 /* load_all */,
2324 5e224a3e 2019-02-22 stsp &ls->thread_args.commits_needed,
2325 5e224a3e 2019-02-22 stsp &ls->thread_args.log_complete,
2326 5e224a3e 2019-02-22 stsp &ls->thread_args.need_commits);
2330 fb872ab2 2019-02-21 stsp err = input_log_view(NULL, NULL, NULL, s->log_view,
2331 fb872ab2 2019-02-21 stsp KEY_DOWN);
2335 fb872ab2 2019-02-21 stsp entry = TAILQ_NEXT(ls->selected_entry, entry);
2336 15a087fe 2019-02-21 stsp if (entry == NULL)
2339 15a087fe 2019-02-21 stsp err = set_selected_commit(s, entry);
2343 15a087fe 2019-02-21 stsp s->first_displayed_line = 1;
2344 15a087fe 2019-02-21 stsp s->last_displayed_line = view->nlines;
2346 15a087fe 2019-02-21 stsp err = create_diff(s);
2352 bcbd79e2 2018-08-19 stsp return err;
2355 4ed7e80c 2018-05-20 stsp static const struct got_error *
2356 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2358 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2359 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2360 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2361 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2362 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2363 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
2365 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2367 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2368 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2369 eb6600df 2019-01-04 stsp NULL) == -1)
2370 26ed57b2 2018-05-19 stsp err(1, "pledge");
2373 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2374 26ed57b2 2018-05-19 stsp switch (ch) {
2377 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2381 26ed57b2 2018-05-19 stsp argc -= optind;
2382 26ed57b2 2018-05-19 stsp argv += optind;
2384 26ed57b2 2018-05-19 stsp if (argc == 0) {
2385 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2386 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2387 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2388 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2389 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2390 15a94983 2018-12-23 stsp id_str1 = argv[0];
2391 15a94983 2018-12-23 stsp id_str2 = argv[1];
2392 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2393 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2394 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2395 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2396 15a94983 2018-12-23 stsp id_str1 = argv[1];
2397 15a94983 2018-12-23 stsp id_str2 = argv[2];
2399 26ed57b2 2018-05-19 stsp usage_diff();
2401 a915003a 2019-02-05 stsp init_curses();
2403 eb6600df 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
2404 eb6600df 2019-01-04 stsp if (error)
2405 eb6600df 2019-01-04 stsp goto done;
2407 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
2408 26ed57b2 2018-05-19 stsp free(repo_path);
2409 26ed57b2 2018-05-19 stsp if (error)
2410 26ed57b2 2018-05-19 stsp goto done;
2412 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
2413 26ed57b2 2018-05-19 stsp if (error)
2414 26ed57b2 2018-05-19 stsp goto done;
2416 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
2417 26ed57b2 2018-05-19 stsp if (error)
2418 26ed57b2 2018-05-19 stsp goto done;
2420 8b473291 2019-02-21 stsp SIMPLEQ_INIT(&refs);
2421 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
2422 8b473291 2019-02-21 stsp if (error)
2423 8b473291 2019-02-21 stsp goto done;
2425 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2426 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
2427 ea5e7bb5 2018-08-01 stsp error = got_error_from_errno();
2428 ea5e7bb5 2018-08-01 stsp goto done;
2430 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2431 5dc9f4bc 2018-08-04 stsp if (error)
2432 5dc9f4bc 2018-08-04 stsp goto done;
2433 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2435 26ed57b2 2018-05-19 stsp got_repo_close(repo);
2436 26ed57b2 2018-05-19 stsp return error;
2439 4ed7e80c 2018-05-20 stsp __dead static void
2440 9f7d7167 2018-04-29 stsp usage_blame(void)
2443 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2444 9f7d7167 2018-04-29 stsp getprogname());
2448 84451b3e 2018-07-10 stsp struct tog_blame_line {
2449 84451b3e 2018-07-10 stsp int annotated;
2450 84451b3e 2018-07-10 stsp struct got_object_id *id;
2453 4ed7e80c 2018-05-20 stsp static const struct got_error *
2454 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2455 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
2456 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
2457 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
2459 84451b3e 2018-07-10 stsp const struct got_error *err;
2460 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
2461 84451b3e 2018-07-10 stsp char *line;
2462 84451b3e 2018-07-10 stsp size_t len;
2463 84451b3e 2018-07-10 stsp wchar_t *wline;
2464 b700b5d6 2018-07-10 stsp int width, wlimit;
2465 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
2466 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
2467 ab089a2a 2018-07-12 stsp char *id_str;
2469 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
2471 ab089a2a 2018-07-12 stsp return err;
2473 84451b3e 2018-07-10 stsp rewind(f);
2474 f7d12f7e 2018-08-01 stsp werase(view->window);
2476 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
2477 ab089a2a 2018-07-12 stsp err = got_error_from_errno();
2478 ab089a2a 2018-07-12 stsp free(id_str);
2479 ab089a2a 2018-07-12 stsp return err;
2482 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2483 ab089a2a 2018-07-12 stsp free(line);
2484 2550e4c3 2018-07-13 stsp line = NULL;
2485 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2486 a3404814 2018-09-02 stsp wstandout(view->window);
2487 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2488 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2489 a3404814 2018-09-02 stsp wstandend(view->window);
2490 2550e4c3 2018-07-13 stsp free(wline);
2491 2550e4c3 2018-07-13 stsp wline = NULL;
2492 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2493 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2495 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
2496 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
2497 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
2498 ab089a2a 2018-07-12 stsp free(id_str);
2499 3f60a8ef 2018-07-10 stsp return got_error_from_errno();
2501 ab089a2a 2018-07-12 stsp free(id_str);
2502 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2503 3f60a8ef 2018-07-10 stsp free(line);
2504 2550e4c3 2018-07-13 stsp line = NULL;
2506 3f60a8ef 2018-07-10 stsp return err;
2507 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2508 2550e4c3 2018-07-13 stsp free(wline);
2509 2550e4c3 2018-07-13 stsp wline = NULL;
2510 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2511 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2514 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
2515 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
2516 84451b3e 2018-07-10 stsp if (line == NULL) {
2520 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
2521 84451b3e 2018-07-10 stsp free(line);
2525 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2526 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
2527 84451b3e 2018-07-10 stsp if (err) {
2528 84451b3e 2018-07-10 stsp free(line);
2529 84451b3e 2018-07-10 stsp return err;
2532 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2533 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2535 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
2536 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
2537 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
2538 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
2539 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
2540 84451b3e 2018-07-10 stsp char *id_str;
2541 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
2542 84451b3e 2018-07-10 stsp if (err) {
2543 84451b3e 2018-07-10 stsp free(line);
2544 2550e4c3 2018-07-13 stsp free(wline);
2545 84451b3e 2018-07-10 stsp return err;
2547 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
2548 84451b3e 2018-07-10 stsp free(id_str);
2549 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
2551 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
2552 ee41ec32 2018-07-10 stsp prev_id = NULL;
2555 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2556 b700b5d6 2018-07-10 stsp while (width < wlimit) {
2557 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
2560 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2561 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2562 84451b3e 2018-07-10 stsp if (++nprinted == 1)
2563 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
2564 84451b3e 2018-07-10 stsp free(line);
2565 2550e4c3 2018-07-13 stsp free(wline);
2566 2550e4c3 2018-07-13 stsp wline = NULL;
2568 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
2570 1a57306a 2018-09-02 stsp view_vborder(view);
2572 84451b3e 2018-07-10 stsp return NULL;
2575 84451b3e 2018-07-10 stsp static const struct got_error *
2576 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2578 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
2579 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
2580 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
2581 1a76625f 2018-10-22 stsp int errcode;
2583 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
2584 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2585 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
2587 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2588 1a76625f 2018-10-22 stsp if (errcode)
2589 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2591 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
2592 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
2593 d68a0a7d 2018-07-10 stsp goto done;
2596 d68a0a7d 2018-07-10 stsp if (lineno == -1)
2597 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
2599 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
2600 d68a0a7d 2018-07-10 stsp if (line->annotated)
2601 d68a0a7d 2018-07-10 stsp goto done;
2603 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
2604 84451b3e 2018-07-10 stsp if (line->id == NULL) {
2605 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2606 84451b3e 2018-07-10 stsp goto done;
2608 84451b3e 2018-07-10 stsp line->annotated = 1;
2610 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2611 1a76625f 2018-10-22 stsp if (errcode)
2612 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2613 84451b3e 2018-07-10 stsp return err;
2616 84451b3e 2018-07-10 stsp static void *
2617 84451b3e 2018-07-10 stsp blame_thread(void *arg)
2619 18430de3 2018-07-10 stsp const struct got_error *err;
2620 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
2621 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
2622 1a76625f 2018-10-22 stsp int errcode;
2624 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2625 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
2627 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2628 1a76625f 2018-10-22 stsp if (errcode)
2629 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
2631 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
2632 c9beca56 2018-07-22 stsp ta->repo = NULL;
2633 c9beca56 2018-07-22 stsp *ta->complete = 1;
2635 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2636 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2637 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2639 18430de3 2018-07-10 stsp return (void *)err;
2642 245d91c1 2018-07-12 stsp static struct got_object_id *
2643 15a94983 2018-12-23 stsp get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2644 15a94983 2018-12-23 stsp int selected_line)
2646 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
2648 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
2649 245d91c1 2018-07-12 stsp if (!line->annotated)
2650 245d91c1 2018-07-12 stsp return NULL;
2652 245d91c1 2018-07-12 stsp return line->id;
2655 b880a918 2018-07-10 stsp static const struct got_error *
2656 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
2658 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
2661 245d91c1 2018-07-12 stsp if (blame->thread) {
2662 1a76625f 2018-10-22 stsp int errcode;
2663 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2664 1a76625f 2018-10-22 stsp if (errcode)
2665 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2666 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
2667 1a76625f 2018-10-22 stsp if (errcode)
2668 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2669 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2670 1a76625f 2018-10-22 stsp if (errcode)
2671 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2672 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
2673 245d91c1 2018-07-12 stsp err = NULL;
2674 245d91c1 2018-07-12 stsp blame->thread = NULL;
2676 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
2677 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
2678 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
2680 245d91c1 2018-07-12 stsp if (blame->f) {
2681 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
2682 fb43ecf1 2019-02-11 stsp err = got_error_from_errno();
2683 245d91c1 2018-07-12 stsp blame->f = NULL;
2685 57670559 2018-12-23 stsp if (blame->lines) {
2686 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
2687 57670559 2018-12-23 stsp free(blame->lines[i].id);
2688 57670559 2018-12-23 stsp free(blame->lines);
2689 57670559 2018-12-23 stsp blame->lines = NULL;
2691 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
2692 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
2694 245d91c1 2018-07-12 stsp return err;
2697 245d91c1 2018-07-12 stsp static const struct got_error *
2698 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2699 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
2700 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
2701 245d91c1 2018-07-12 stsp struct got_repository *repo)
2703 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
2704 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
2705 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
2706 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
2707 15a94983 2018-12-23 stsp int obj_type;
2709 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2711 15a94983 2018-12-23 stsp return err;
2712 15a94983 2018-12-23 stsp if (obj_id == NULL)
2713 15a94983 2018-12-23 stsp return got_error(GOT_ERR_NO_OBJ);
2715 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
2717 84451b3e 2018-07-10 stsp goto done;
2719 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2720 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2721 84451b3e 2018-07-10 stsp goto done;
2724 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2726 a70480e0 2018-06-23 stsp goto done;
2727 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
2728 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
2729 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2730 84451b3e 2018-07-10 stsp goto done;
2732 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2733 245d91c1 2018-07-12 stsp blame->f, blob);
2735 84451b3e 2018-07-10 stsp goto done;
2737 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2738 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
2739 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2740 84451b3e 2018-07-10 stsp goto done;
2743 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2745 bd24772e 2018-07-11 stsp goto done;
2747 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
2748 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
2749 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
2750 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
2751 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
2752 245d91c1 2018-07-12 stsp err = got_error_from_errno();
2753 245d91c1 2018-07-12 stsp goto done;
2755 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
2757 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
2758 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
2759 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
2760 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
2761 245d91c1 2018-07-12 stsp *blame_complete = 0;
2765 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
2766 27d434c2 2018-09-15 stsp free(obj_id);
2768 245d91c1 2018-07-12 stsp stop_blame(blame);
2769 245d91c1 2018-07-12 stsp return err;
2772 245d91c1 2018-07-12 stsp static const struct got_error *
2773 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
2774 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
2775 8b473291 2019-02-21 stsp struct got_repository *repo)
2777 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
2778 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2780 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
2782 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2784 7cbe629d 2018-08-04 stsp return err;
2786 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2787 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
2788 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
2789 fb2756b9 2018-08-04 stsp s->selected_line = 1;
2790 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
2791 fb2756b9 2018-08-04 stsp s->path = path;
2792 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
2793 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2794 fb2756b9 2018-08-04 stsp s->repo = repo;
2795 8b473291 2019-02-21 stsp s->refs = refs;
2796 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
2797 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
2799 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
2800 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
2801 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
2803 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
2804 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
2805 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2806 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2809 e5a0f69f 2018-08-18 stsp static const struct got_error *
2810 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
2812 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2813 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2815 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
2816 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
2818 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2819 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
2820 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2821 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2822 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
2825 e5a0f69f 2018-08-18 stsp free(s->path);
2827 e5a0f69f 2018-08-18 stsp return err;
2830 7cbe629d 2018-08-04 stsp static const struct got_error *
2831 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
2833 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2834 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
2835 2b380cc8 2018-10-24 stsp int errcode;
2837 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
2838 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2839 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
2840 2b380cc8 2018-10-24 stsp if (errcode)
2841 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
2844 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2845 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2846 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
2847 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
2849 669b5ffa 2018-10-07 stsp view_vborder(view);
2850 e5a0f69f 2018-08-18 stsp return err;
2853 e5a0f69f 2018-08-18 stsp static const struct got_error *
2854 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2855 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2857 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
2858 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
2859 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2860 669b5ffa 2018-10-07 stsp int begin_x = 0;
2862 e5a0f69f 2018-08-18 stsp switch (ch) {
2864 e5a0f69f 2018-08-18 stsp s->done = 1;
2867 e5a0f69f 2018-08-18 stsp case KEY_UP:
2868 e5a0f69f 2018-08-18 stsp if (s->selected_line > 1)
2869 e5a0f69f 2018-08-18 stsp s->selected_line--;
2870 e5a0f69f 2018-08-18 stsp else if (s->selected_line == 1 &&
2871 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2872 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2874 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2875 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line == 1) {
2876 e5a0f69f 2018-08-18 stsp s->selected_line = 1;
2879 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > view->nlines - 2)
2880 e5a0f69f 2018-08-18 stsp s->first_displayed_line -=
2881 e5a0f69f 2018-08-18 stsp (view->nlines - 2);
2883 e5a0f69f 2018-08-18 stsp s->first_displayed_line = 1;
2886 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2887 e5a0f69f 2018-08-18 stsp if (s->selected_line < view->nlines - 2 &&
2888 e5a0f69f 2018-08-18 stsp s->first_displayed_line +
2889 e5a0f69f 2018-08-18 stsp s->selected_line <= s->blame.nlines)
2890 e5a0f69f 2018-08-18 stsp s->selected_line++;
2891 e5a0f69f 2018-08-18 stsp else if (s->last_displayed_line <
2892 e5a0f69f 2018-08-18 stsp s->blame.nlines)
2893 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2896 e5a0f69f 2018-08-18 stsp case 'p': {
2897 15a94983 2018-12-23 stsp struct got_object_id *id = NULL;
2898 e5a0f69f 2018-08-18 stsp id = get_selected_commit_id(s->blame.lines,
2899 e5a0f69f 2018-08-18 stsp s->first_displayed_line, s->selected_line);
2900 15a94983 2018-12-23 stsp if (id == NULL)
2902 15a94983 2018-12-23 stsp if (ch == 'p') {
2903 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2904 15a94983 2018-12-23 stsp struct got_object_qid *pid;
2905 15a94983 2018-12-23 stsp struct got_object_id *blob_id = NULL;
2906 15a94983 2018-12-23 stsp int obj_type;
2907 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit,
2908 15a94983 2018-12-23 stsp s->repo, id);
2911 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
2912 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
2913 15a94983 2018-12-23 stsp if (pid == NULL) {
2914 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2917 15a94983 2018-12-23 stsp /* Check if path history ends here. */
2918 15a94983 2018-12-23 stsp err = got_object_id_by_path(&blob_id, s->repo,
2919 15a94983 2018-12-23 stsp pid->id, s->path);
2920 15a94983 2018-12-23 stsp if (err) {
2921 15a94983 2018-12-23 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
2922 15a94983 2018-12-23 stsp err = NULL;
2923 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2926 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo,
2928 15a94983 2018-12-23 stsp free(blob_id);
2929 15a94983 2018-12-23 stsp /* Can't blame non-blob type objects. */
2930 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2931 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2934 15a94983 2018-12-23 stsp err = got_object_qid_alloc(&s->blamed_commit,
2936 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2938 15a94983 2018-12-23 stsp if (got_object_id_cmp(id,
2939 15a94983 2018-12-23 stsp s->blamed_commit->id) == 0)
2941 15a94983 2018-12-23 stsp err = got_object_qid_alloc(&s->blamed_commit,
2946 e5a0f69f 2018-08-18 stsp s->done = 1;
2947 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2948 e5a0f69f 2018-08-18 stsp s->done = 0;
2949 e5a0f69f 2018-08-18 stsp if (thread_err)
2951 e5a0f69f 2018-08-18 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2952 e5a0f69f 2018-08-18 stsp s->blamed_commit, entry);
2953 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2954 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2955 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof,
2956 e5a0f69f 2018-08-18 stsp s->path, s->blamed_commit->id, s->repo);
2961 e5a0f69f 2018-08-18 stsp case 'B': {
2962 e5a0f69f 2018-08-18 stsp struct got_object_qid *first;
2963 e5a0f69f 2018-08-18 stsp first = SIMPLEQ_FIRST(&s->blamed_commits);
2964 e5a0f69f 2018-08-18 stsp if (!got_object_id_cmp(first->id, s->commit_id))
2966 e5a0f69f 2018-08-18 stsp s->done = 1;
2967 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2968 e5a0f69f 2018-08-18 stsp s->done = 0;
2969 e5a0f69f 2018-08-18 stsp if (thread_err)
2971 e5a0f69f 2018-08-18 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2972 e5a0f69f 2018-08-18 stsp got_object_qid_free(s->blamed_commit);
2973 e5a0f69f 2018-08-18 stsp s->blamed_commit =
2974 e5a0f69f 2018-08-18 stsp SIMPLEQ_FIRST(&s->blamed_commits);
2975 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2976 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2977 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2978 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2983 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
2984 15a94983 2018-12-23 stsp case '\r': {
2985 15a94983 2018-12-23 stsp struct got_object_id *id = NULL;
2986 15a94983 2018-12-23 stsp struct got_object_qid *pid;
2987 15a94983 2018-12-23 stsp struct got_commit_object *commit = NULL;
2988 15a94983 2018-12-23 stsp id = get_selected_commit_id(s->blame.lines,
2989 15a94983 2018-12-23 stsp s->first_displayed_line, s->selected_line);
2990 3e9926ea 2019-01-04 stsp if (id == NULL)
2992 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, s->repo, id);
2995 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
2996 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
2997 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
2998 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
2999 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3000 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
3001 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3002 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
3005 15a94983 2018-12-23 stsp err = open_diff_view(diff_view, pid ? pid->id : NULL,
3006 8b473291 2019-02-21 stsp id, NULL, s->refs, s->repo);
3007 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3008 e5a0f69f 2018-08-18 stsp if (err) {
3009 e5a0f69f 2018-08-18 stsp view_close(diff_view);
3012 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3013 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3016 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
3017 669b5ffa 2018-10-07 stsp if (err) {
3018 669b5ffa 2018-10-07 stsp view_close(diff_view);
3021 51c68690 2018-11-07 stsp *focus_view = diff_view;
3022 51c68690 2018-11-07 stsp view->child_focussed = 1;
3024 669b5ffa 2018-10-07 stsp *new_view = diff_view;
3029 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
3031 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line >= s->blame.nlines &&
3032 e5a0f69f 2018-08-18 stsp s->selected_line < view->nlines - 2) {
3033 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
3034 e5a0f69f 2018-08-18 stsp view->nlines - 2);
3037 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line + view->nlines - 2
3038 e5a0f69f 2018-08-18 stsp <= s->blame.nlines)
3039 e5a0f69f 2018-08-18 stsp s->first_displayed_line +=
3040 e5a0f69f 2018-08-18 stsp view->nlines - 2;
3042 e5a0f69f 2018-08-18 stsp s->first_displayed_line =
3043 e5a0f69f 2018-08-18 stsp s->blame.nlines -
3044 e5a0f69f 2018-08-18 stsp (view->nlines - 3);
3046 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
3047 e5a0f69f 2018-08-18 stsp if (s->selected_line > view->nlines - 2) {
3048 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
3049 e5a0f69f 2018-08-18 stsp view->nlines - 2);
3055 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
3058 a70480e0 2018-06-23 stsp static const struct got_error *
3059 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
3061 a70480e0 2018-06-23 stsp const struct got_error *error;
3062 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
3063 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3064 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
3065 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3066 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3067 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
3069 e1cd8fed 2018-08-01 stsp struct tog_view *view;
3071 a70480e0 2018-06-23 stsp #ifndef PROFILE
3072 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3073 8e94dd5b 2019-01-04 stsp NULL) == -1)
3074 a70480e0 2018-06-23 stsp err(1, "pledge");
3077 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3078 a70480e0 2018-06-23 stsp switch (ch) {
3080 a70480e0 2018-06-23 stsp commit_id_str = optarg;
3083 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
3084 69069811 2018-08-02 stsp if (repo_path == NULL)
3085 69069811 2018-08-02 stsp err(1, "-r option");
3089 a70480e0 2018-06-23 stsp /* NOTREACHED */
3093 a70480e0 2018-06-23 stsp argc -= optind;
3094 a70480e0 2018-06-23 stsp argv += optind;
3096 69069811 2018-08-02 stsp if (argc == 1)
3097 69069811 2018-08-02 stsp path = argv[0];
3099 a70480e0 2018-06-23 stsp usage_blame();
3101 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
3102 69069811 2018-08-02 stsp if (cwd == NULL) {
3103 69069811 2018-08-02 stsp error = got_error_from_errno();
3104 69069811 2018-08-02 stsp goto done;
3106 69069811 2018-08-02 stsp if (repo_path == NULL) {
3107 eb41ed75 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3108 eb41ed75 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3109 69069811 2018-08-02 stsp goto done;
3111 eb41ed75 2019-02-05 stsp error = NULL;
3112 eb41ed75 2019-02-05 stsp if (worktree) {
3113 eb41ed75 2019-02-05 stsp repo_path =
3114 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3115 eb41ed75 2019-02-05 stsp if (repo_path == NULL)
3116 eb41ed75 2019-02-05 stsp error = got_error_from_errno();
3117 eb41ed75 2019-02-05 stsp if (error)
3118 eb41ed75 2019-02-05 stsp goto done;
3120 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
3121 eb41ed75 2019-02-05 stsp if (repo_path == NULL) {
3122 eb41ed75 2019-02-05 stsp error = got_error_from_errno();
3123 eb41ed75 2019-02-05 stsp goto done;
3128 a915003a 2019-02-05 stsp init_curses();
3130 8e94dd5b 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
3131 8e94dd5b 2019-01-04 stsp if (error)
3132 8e94dd5b 2019-01-04 stsp goto done;
3134 69069811 2018-08-02 stsp error = got_repo_open(&repo, repo_path);
3135 a70480e0 2018-06-23 stsp if (error != NULL)
3136 92205607 2019-01-04 stsp goto done;
3138 eb41ed75 2019-02-05 stsp if (worktree) {
3139 eb41ed75 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3140 eb41ed75 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3141 eb41ed75 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3142 eb41ed75 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3143 eb41ed75 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3144 eb41ed75 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3145 eb41ed75 2019-02-05 stsp path) == -1) {
3146 eb41ed75 2019-02-05 stsp error = got_error_from_errno();
3147 eb41ed75 2019-02-05 stsp goto done;
3149 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3152 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3154 eb41ed75 2019-02-05 stsp if (error)
3155 69069811 2018-08-02 stsp goto done;
3157 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
3158 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
3159 a70480e0 2018-06-23 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
3160 a70480e0 2018-06-23 stsp if (error != NULL)
3161 66b4983c 2018-06-23 stsp goto done;
3162 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3163 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
3165 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
3166 15a94983 2018-12-23 stsp commit_id_str);
3168 a19e88aa 2018-06-23 stsp if (error != NULL)
3169 8b473291 2019-02-21 stsp goto done;
3171 8b473291 2019-02-21 stsp SIMPLEQ_INIT(&refs);
3172 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
3173 8b473291 2019-02-21 stsp if (error)
3174 a19e88aa 2018-06-23 stsp goto done;
3176 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3177 e1cd8fed 2018-08-01 stsp if (view == NULL) {
3178 e1cd8fed 2018-08-01 stsp error = got_error_from_errno();
3179 e1cd8fed 2018-08-01 stsp goto done;
3181 8b473291 2019-02-21 stsp error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3182 7cbe629d 2018-08-04 stsp if (error)
3183 7cbe629d 2018-08-04 stsp goto done;
3184 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3186 69069811 2018-08-02 stsp free(repo_path);
3187 69069811 2018-08-02 stsp free(cwd);
3188 a70480e0 2018-06-23 stsp free(commit_id);
3189 eb41ed75 2019-02-05 stsp if (worktree)
3190 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
3192 a70480e0 2018-06-23 stsp got_repo_close(repo);
3193 a70480e0 2018-06-23 stsp return error;
3196 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3197 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
3198 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
3199 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
3200 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
3201 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
3202 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
3204 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3205 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
3206 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
3207 ffd1d5e5 2018-06-23 stsp int width, n;
3209 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
3211 f7d12f7e 2018-08-01 stsp werase(view->window);
3213 ffd1d5e5 2018-06-23 stsp if (limit == 0)
3214 ffd1d5e5 2018-06-23 stsp return NULL;
3216 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
3218 ffd1d5e5 2018-06-23 stsp return err;
3219 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3220 a3404814 2018-09-02 stsp wstandout(view->window);
3221 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3222 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3223 a3404814 2018-09-02 stsp wstandend(view->window);
3224 2550e4c3 2018-07-13 stsp free(wline);
3225 2550e4c3 2018-07-13 stsp wline = NULL;
3226 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
3227 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3228 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3229 ffd1d5e5 2018-06-23 stsp return NULL;
3230 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
3232 ce52c690 2018-06-23 stsp return err;
3233 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3234 2550e4c3 2018-07-13 stsp free(wline);
3235 2550e4c3 2018-07-13 stsp wline = NULL;
3236 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
3237 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3238 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3239 ffd1d5e5 2018-06-23 stsp return NULL;
3240 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3241 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
3242 a1eca9bb 2018-06-23 stsp return NULL;
3244 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3245 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
3246 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
3247 0cf4efb1 2018-09-29 stsp if (view->focussed)
3248 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3249 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
3251 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
3252 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
3253 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3254 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3255 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3256 ffd1d5e5 2018-06-23 stsp return NULL;
3260 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
3261 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3264 ffd1d5e5 2018-06-23 stsp while (te) {
3265 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
3267 1d13200f 2018-07-12 stsp if (show_ids) {
3268 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
3270 1d13200f 2018-07-12 stsp return got_error_from_errno();
3272 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3273 d8355ef1 2019-02-10 stsp te->name, S_ISDIR(te->mode) ? "/" :
3274 d8355ef1 2019-02-10 stsp ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3275 1d13200f 2018-07-12 stsp free(id_str);
3276 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3278 1d13200f 2018-07-12 stsp free(id_str);
3279 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
3280 ffd1d5e5 2018-06-23 stsp if (err) {
3281 ffd1d5e5 2018-06-23 stsp free(line);
3284 ffd1d5e5 2018-06-23 stsp if (n == selected) {
3285 0cf4efb1 2018-09-29 stsp if (view->focussed)
3286 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3287 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
3289 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3290 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
3291 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3292 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
3293 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3294 ffd1d5e5 2018-06-23 stsp free(line);
3295 2550e4c3 2018-07-13 stsp free(wline);
3296 2550e4c3 2018-07-13 stsp wline = NULL;
3298 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3299 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
3300 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3302 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3305 ffd1d5e5 2018-06-23 stsp return err;
3308 ffd1d5e5 2018-06-23 stsp static void
3309 ffd1d5e5 2018-06-23 stsp tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
3310 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
3312 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
3315 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL)
3318 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3319 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
3320 ffd1d5e5 2018-06-23 stsp if (!isroot)
3321 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3325 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
3326 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
3327 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
3328 ffd1d5e5 2018-06-23 stsp prev = te;
3329 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3331 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
3332 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3334 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3335 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3338 768394f3 2019-01-24 stsp static int
3339 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3340 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
3341 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
3343 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
3344 ffd1d5e5 2018-06-23 stsp int n = 0;
3346 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
3347 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3349 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
3350 768394f3 2019-01-24 stsp last = last_displayed_entry;
3351 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
3352 768394f3 2019-01-24 stsp last = SIMPLEQ_NEXT(last, entry);
3353 768394f3 2019-01-24 stsp if (last) {
3354 768394f3 2019-01-24 stsp *first_displayed_entry = next;
3355 768394f3 2019-01-24 stsp next = SIMPLEQ_NEXT(next, entry);
3361 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3362 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
3363 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
3365 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
3366 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
3367 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
3369 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
3370 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
3372 ce52c690 2018-06-23 stsp len += strlen(te->name);
3374 ce52c690 2018-06-23 stsp *path = calloc(1, len);
3375 ffd1d5e5 2018-06-23 stsp if (path == NULL)
3376 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3378 ce52c690 2018-06-23 stsp (*path)[0] = '/';
3379 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
3380 d9765a41 2018-06-23 stsp while (pt) {
3381 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3382 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3383 cb2ebc8a 2018-06-23 stsp goto done;
3385 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
3386 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3387 cb2ebc8a 2018-06-23 stsp goto done;
3389 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3392 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
3393 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3394 ce52c690 2018-06-23 stsp goto done;
3398 ce52c690 2018-06-23 stsp if (err) {
3399 ce52c690 2018-06-23 stsp free(*path);
3400 ce52c690 2018-06-23 stsp *path = NULL;
3402 ce52c690 2018-06-23 stsp return err;
3405 ce52c690 2018-06-23 stsp static const struct got_error *
3406 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
3407 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3408 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3409 8b473291 2019-02-21 stsp struct got_repository *repo)
3411 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
3412 ce52c690 2018-06-23 stsp char *path;
3413 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
3415 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
3417 ce52c690 2018-06-23 stsp return err;
3419 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3420 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
3421 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3423 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
3424 e5a0f69f 2018-08-18 stsp if (err) {
3425 e5a0f69f 2018-08-18 stsp view_close(blame_view);
3426 e5a0f69f 2018-08-18 stsp free(path);
3428 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
3429 69efd4c4 2018-07-18 stsp return err;
3432 69efd4c4 2018-07-18 stsp static const struct got_error *
3433 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
3434 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3435 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3436 8b473291 2019-02-21 stsp struct got_repository *repo)
3438 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
3439 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
3440 69efd4c4 2018-07-18 stsp char *path;
3442 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3443 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
3444 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3446 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
3448 69efd4c4 2018-07-18 stsp return err;
3450 8b473291 2019-02-21 stsp err = open_log_view(log_view, commit_id, refs, repo, path, 0);
3452 e5a0f69f 2018-08-18 stsp view_close(log_view);
3454 e5a0f69f 2018-08-18 stsp *new_view = log_view;
3455 cb2ebc8a 2018-06-23 stsp free(path);
3456 cb2ebc8a 2018-06-23 stsp return err;
3459 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3460 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
3461 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3462 8b473291 2019-02-21 stsp struct got_repository *repo)
3464 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3465 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
3466 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3468 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
3470 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
3471 ffd1d5e5 2018-06-23 stsp if (err != NULL)
3472 ffd1d5e5 2018-06-23 stsp goto done;
3474 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3475 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
3476 ffd1d5e5 2018-06-23 stsp goto done;
3479 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
3480 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
3481 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3482 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
3483 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
3484 6484ec90 2018-09-29 stsp err = got_error_from_errno();
3485 6484ec90 2018-09-29 stsp goto done;
3487 8b473291 2019-02-21 stsp s->refs = refs;
3488 fb2756b9 2018-08-04 stsp s->repo = repo;
3490 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
3491 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
3492 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
3494 ad80ab7b 2018-08-04 stsp free(commit_id_str);
3495 6484ec90 2018-09-29 stsp if (err) {
3496 fb2756b9 2018-08-04 stsp free(s->tree_label);
3497 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3499 ad80ab7b 2018-08-04 stsp return err;
3502 e5a0f69f 2018-08-18 stsp static const struct got_error *
3503 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
3505 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3507 fb2756b9 2018-08-04 stsp free(s->tree_label);
3508 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3509 6484ec90 2018-09-29 stsp free(s->commit_id);
3510 6484ec90 2018-09-29 stsp s->commit_id = NULL;
3511 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
3512 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
3513 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
3514 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
3515 ad80ab7b 2018-08-04 stsp free(parent);
3518 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
3519 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
3520 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
3522 e5a0f69f 2018-08-18 stsp return NULL;
3525 ad80ab7b 2018-08-04 stsp static const struct got_error *
3526 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
3528 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
3529 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3530 e5a0f69f 2018-08-18 stsp char *parent_path;
3532 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
3534 e5a0f69f 2018-08-18 stsp return err;
3536 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
3537 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
3538 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3539 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
3540 e5a0f69f 2018-08-18 stsp free(parent_path);
3542 669b5ffa 2018-10-07 stsp view_vborder(view);
3543 e5a0f69f 2018-08-18 stsp return err;
3546 e5a0f69f 2018-08-18 stsp static const struct got_error *
3547 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3548 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3550 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3551 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
3552 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
3553 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
3555 e5a0f69f 2018-08-18 stsp switch (ch) {
3557 e5a0f69f 2018-08-18 stsp s->show_ids = !s->show_ids;
3560 669b5ffa 2018-10-07 stsp if (!s->selected_entry)
3562 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
3563 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
3564 669b5ffa 2018-10-07 stsp err = log_tree_entry(&log_view, begin_x,
3565 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
3566 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
3567 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3568 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3570 669b5ffa 2018-10-07 stsp return err;
3571 669b5ffa 2018-10-07 stsp err = view_set_child(view, log_view);
3572 669b5ffa 2018-10-07 stsp if (err) {
3573 669b5ffa 2018-10-07 stsp view_close(log_view);
3576 669b5ffa 2018-10-07 stsp *focus_view = log_view;
3577 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3579 669b5ffa 2018-10-07 stsp *new_view = log_view;
3582 e5a0f69f 2018-08-18 stsp case KEY_UP:
3583 bf979164 2019-01-24 stsp if (s->selected > 0) {
3584 e5a0f69f 2018-08-18 stsp s->selected--;
3585 bf979164 2019-01-24 stsp if (s->selected == 0)
3588 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
3590 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry, 1,
3591 e5a0f69f 2018-08-18 stsp s->entries, s->tree == s->root);
3593 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
3594 67cc7991 2019-01-24 stsp tree_scroll_up(&s->first_displayed_entry,
3595 67cc7991 2019-01-24 stsp MAX(0, view->nlines - 4 - s->selected), s->entries,
3596 67cc7991 2019-01-24 stsp s->tree == s->root);
3597 8a0ead39 2018-11-03 stsp s->selected = 0;
3598 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_FIRST(&s->entries->head) ==
3599 67cc7991 2019-01-24 stsp s->first_displayed_entry && s->tree != s->root)
3600 67cc7991 2019-01-24 stsp s->first_displayed_entry = NULL;
3603 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
3604 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1) {
3605 e5a0f69f 2018-08-18 stsp s->selected++;
3608 768394f3 2019-01-24 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3609 768394f3 2019-01-24 stsp == NULL) {
3610 768394f3 2019-01-24 stsp /* can't scroll any further */
3613 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry, 1,
3614 e5a0f69f 2018-08-18 stsp s->last_displayed_entry, s->entries);
3616 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
3617 768394f3 2019-01-24 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3618 768394f3 2019-01-24 stsp == NULL) {
3619 768394f3 2019-01-24 stsp /* can't scroll any further; move cursor down */
3620 768394f3 2019-01-24 stsp if (s->selected < s->ndisplayed - 1)
3621 768394f3 2019-01-24 stsp s->selected = s->ndisplayed - 1;
3624 768394f3 2019-01-24 stsp nscrolled = tree_scroll_down(&s->first_displayed_entry,
3625 768394f3 2019-01-24 stsp view->nlines, s->last_displayed_entry, s->entries);
3626 768394f3 2019-01-24 stsp if (nscrolled < view->nlines) {
3627 768394f3 2019-01-24 stsp int ndisplayed = 0;
3628 768394f3 2019-01-24 stsp struct got_tree_entry *te;
3629 768394f3 2019-01-24 stsp te = s->first_displayed_entry;
3631 768394f3 2019-01-24 stsp ndisplayed++;
3632 768394f3 2019-01-24 stsp te = SIMPLEQ_NEXT(te, entry);
3633 768394f3 2019-01-24 stsp } while (te);
3634 768394f3 2019-01-24 stsp s->selected = ndisplayed - 1;
3637 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
3638 e5a0f69f 2018-08-18 stsp case '\r':
3639 e5a0f69f 2018-08-18 stsp if (s->selected_entry == NULL) {
3640 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3641 7837eeac 2018-09-24 stsp case KEY_BACKSPACE:
3642 e5a0f69f 2018-08-18 stsp /* user selected '..' */
3643 e5a0f69f 2018-08-18 stsp if (s->tree == s->root)
3645 e5a0f69f 2018-08-18 stsp parent = TAILQ_FIRST(&s->parents);
3646 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&s->parents, parent,
3648 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->tree);
3649 e5a0f69f 2018-08-18 stsp s->tree = parent->tree;
3650 e5a0f69f 2018-08-18 stsp s->entries =
3651 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3652 e5a0f69f 2018-08-18 stsp s->first_displayed_entry =
3653 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry;
3654 e5a0f69f 2018-08-18 stsp s->selected_entry =
3655 e5a0f69f 2018-08-18 stsp parent->selected_entry;
3656 e5a0f69f 2018-08-18 stsp s->selected = parent->selected;
3657 e5a0f69f 2018-08-18 stsp free(parent);
3658 e5a0f69f 2018-08-18 stsp } else if (S_ISDIR(s->selected_entry->mode)) {
3659 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3660 e5a0f69f 2018-08-18 stsp struct got_tree_object *child;
3661 e5a0f69f 2018-08-18 stsp err = got_object_open_as_tree(&child,
3662 e5a0f69f 2018-08-18 stsp s->repo, s->selected_entry->id);
3665 e5a0f69f 2018-08-18 stsp parent = calloc(1, sizeof(*parent));
3666 e5a0f69f 2018-08-18 stsp if (parent == NULL) {
3667 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
3670 e5a0f69f 2018-08-18 stsp parent->tree = s->tree;
3671 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry =
3672 e5a0f69f 2018-08-18 stsp s->first_displayed_entry;
3673 e5a0f69f 2018-08-18 stsp parent->selected_entry = s->selected_entry;
3674 e5a0f69f 2018-08-18 stsp parent->selected = s->selected;
3675 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3676 e5a0f69f 2018-08-18 stsp s->tree = child;
3677 e5a0f69f 2018-08-18 stsp s->entries =
3678 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3679 e5a0f69f 2018-08-18 stsp s->selected = 0;
3680 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
3681 e5a0f69f 2018-08-18 stsp } else if (S_ISREG(s->selected_entry->mode)) {
3682 669b5ffa 2018-10-07 stsp struct tog_view *blame_view;
3683 669b5ffa 2018-10-07 stsp int begin_x = view_is_parent_view(view) ?
3684 669b5ffa 2018-10-07 stsp view_split_begin_x(view->begin_x) : 0;
3686 669b5ffa 2018-10-07 stsp err = blame_tree_entry(&blame_view, begin_x,
3687 8b473291 2019-02-21 stsp s->selected_entry, &s->parents,
3688 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
3691 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3692 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3694 669b5ffa 2018-10-07 stsp return err;
3695 669b5ffa 2018-10-07 stsp err = view_set_child(view, blame_view);
3696 669b5ffa 2018-10-07 stsp if (err) {
3697 669b5ffa 2018-10-07 stsp view_close(blame_view);
3700 669b5ffa 2018-10-07 stsp *focus_view = blame_view;
3701 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3703 669b5ffa 2018-10-07 stsp *new_view = blame_view;
3706 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
3707 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines)
3708 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3714 ffd1d5e5 2018-06-23 stsp return err;
3717 ffd1d5e5 2018-06-23 stsp __dead static void
3718 ffd1d5e5 2018-06-23 stsp usage_tree(void)
3721 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3722 ffd1d5e5 2018-06-23 stsp getprogname());
3726 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3727 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
3729 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
3730 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
3731 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3732 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
3733 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3734 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
3735 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
3736 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
3738 5221c383 2018-08-01 stsp struct tog_view *view;
3740 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
3741 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3742 d188b9a6 2019-01-04 stsp NULL) == -1)
3743 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
3746 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
3747 ffd1d5e5 2018-06-23 stsp switch (ch) {
3749 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
3753 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
3757 ffd1d5e5 2018-06-23 stsp argc -= optind;
3758 ffd1d5e5 2018-06-23 stsp argv += optind;
3760 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
3761 52185f70 2019-02-05 stsp struct got_worktree *worktree;
3762 52185f70 2019-02-05 stsp char *cwd = getcwd(NULL, 0);
3763 52185f70 2019-02-05 stsp if (cwd == NULL)
3764 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3765 52185f70 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3766 52185f70 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3767 52185f70 2019-02-05 stsp goto done;
3768 52185f70 2019-02-05 stsp if (worktree) {
3769 52185f70 2019-02-05 stsp free(cwd);
3770 52185f70 2019-02-05 stsp repo_path =
3771 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3772 52185f70 2019-02-05 stsp got_worktree_close(worktree);
3774 52185f70 2019-02-05 stsp repo_path = cwd;
3775 52185f70 2019-02-05 stsp if (repo_path == NULL) {
3776 52185f70 2019-02-05 stsp error = got_error_from_errno();
3777 52185f70 2019-02-05 stsp goto done;
3779 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
3780 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
3781 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3782 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3784 ffd1d5e5 2018-06-23 stsp usage_log();
3786 a915003a 2019-02-05 stsp init_curses();
3788 d188b9a6 2019-01-04 stsp error = apply_unveil(repo_path, NULL);
3789 d188b9a6 2019-01-04 stsp if (error)
3790 52185f70 2019-02-05 stsp goto done;
3792 ffd1d5e5 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
3793 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3794 52185f70 2019-02-05 stsp goto done;
3796 15a94983 2018-12-23 stsp if (commit_id_arg == NULL)
3797 ffd1d5e5 2018-06-23 stsp error = get_head_commit_id(&commit_id, repo);
3799 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
3800 15a94983 2018-12-23 stsp commit_id_arg);
3801 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3802 ffd1d5e5 2018-06-23 stsp goto done;
3804 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3805 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3806 ffd1d5e5 2018-06-23 stsp goto done;
3808 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
3809 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
3810 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3811 8b473291 2019-02-21 stsp goto done;
3813 8b473291 2019-02-21 stsp SIMPLEQ_INIT(&refs);
3814 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
3815 8b473291 2019-02-21 stsp if (error)
3816 ffd1d5e5 2018-06-23 stsp goto done;
3818 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3819 5221c383 2018-08-01 stsp if (view == NULL) {
3820 5221c383 2018-08-01 stsp error = got_error_from_errno();
3821 5221c383 2018-08-01 stsp goto done;
3823 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
3824 ad80ab7b 2018-08-04 stsp if (error)
3825 ad80ab7b 2018-08-04 stsp goto done;
3826 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3828 52185f70 2019-02-05 stsp free(repo_path);
3829 ffd1d5e5 2018-06-23 stsp free(commit_id);
3830 ffd1d5e5 2018-06-23 stsp if (commit)
3831 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
3833 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
3835 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
3836 ffd1d5e5 2018-06-23 stsp return error;
3839 4ed7e80c 2018-05-20 stsp __dead static void
3840 9f7d7167 2018-04-29 stsp usage(void)
3844 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3845 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
3846 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3847 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
3848 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3853 c2301be8 2018-04-30 stsp static char **
3854 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
3856 c2301be8 2018-04-30 stsp char **argv;
3857 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
3859 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
3860 c2301be8 2018-04-30 stsp if (argv == NULL)
3861 c2301be8 2018-04-30 stsp err(1, "calloc");
3862 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
3863 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
3864 c2301be8 2018-04-30 stsp err(1, "calloc");
3865 c2301be8 2018-04-30 stsp if (arg1) {
3866 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
3867 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
3868 c2301be8 2018-04-30 stsp err(1, "calloc");
3871 c2301be8 2018-04-30 stsp return argv;
3875 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
3877 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
3878 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
3879 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
3880 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
3882 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
3884 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
3885 9f7d7167 2018-04-29 stsp switch (ch) {
3887 9f7d7167 2018-04-29 stsp hflag = 1;
3891 9f7d7167 2018-04-29 stsp /* NOTREACHED */
3895 9f7d7167 2018-04-29 stsp argc -= optind;
3896 9f7d7167 2018-04-29 stsp argv += optind;
3897 9f7d7167 2018-04-29 stsp optind = 0;
3898 c2301be8 2018-04-30 stsp optreset = 1;
3900 c2301be8 2018-04-30 stsp if (argc == 0) {
3901 f29d3e89 2018-06-23 stsp if (hflag)
3903 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
3904 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
3905 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
3910 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
3911 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3912 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
3913 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
3914 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
3915 9f7d7167 2018-04-29 stsp if (hflag)
3916 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
3920 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
3921 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
3922 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
3923 c2301be8 2018-04-30 stsp if (repo_path) {
3924 c2301be8 2018-04-30 stsp struct got_repository *repo;
3925 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
3926 c2301be8 2018-04-30 stsp if (error == NULL)
3927 c2301be8 2018-04-30 stsp got_repo_close(repo);
3929 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
3930 c2301be8 2018-04-30 stsp if (error) {
3931 f29d3e89 2018-06-23 stsp if (hflag) {
3932 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
3933 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
3937 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
3938 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
3939 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
3940 ad7de8d9 2018-04-30 stsp free(repo_path);
3943 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
3944 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
3946 c2301be8 2018-04-30 stsp free(repo_path);
3950 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3951 9f7d7167 2018-04-29 stsp if (error)
3952 9f7d7167 2018-04-29 stsp goto done;
3955 c2301be8 2018-04-30 stsp free(cmd_argv);
3956 9f7d7167 2018-04-29 stsp if (error)
3957 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
