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>
39 60493ae3 2019-06-20 stsp #include <regex.h>
41 53ccebc2 2019-07-30 stsp #include "got_version.h"
42 9f7d7167 2018-04-29 stsp #include "got_error.h"
43 80ddbec8 2018-04-29 stsp #include "got_object.h"
44 80ddbec8 2018-04-29 stsp #include "got_reference.h"
45 80ddbec8 2018-04-29 stsp #include "got_repository.h"
46 80ddbec8 2018-04-29 stsp #include "got_diff.h"
47 511a516b 2018-05-19 stsp #include "got_opentemp.h"
48 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
49 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
50 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
51 a70480e0 2018-06-23 stsp #include "got_blame.h"
52 c2db6724 2019-01-04 stsp #include "got_privsep.h"
53 1dd54920 2019-05-11 stsp #include "got_path.h"
54 b7165be3 2019-02-05 stsp #include "got_worktree.h"
57 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
64 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
66 9f7d7167 2018-04-29 stsp #ifndef nitems
67 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
70 9f7d7167 2018-04-29 stsp struct tog_cmd {
71 c2301be8 2018-04-30 stsp const char *name;
72 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
73 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
76 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
77 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
78 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
79 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
80 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
82 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
83 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
84 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
85 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
87 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
88 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
89 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
90 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
91 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
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 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
103 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
104 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
105 ba4f502b 2018-08-04 stsp struct got_object_id *id;
106 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
109 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
110 ba4f502b 2018-08-04 stsp struct commit_queue {
111 ba4f502b 2018-08-04 stsp int ncommits;
112 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
115 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
116 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
118 15a087fe 2019-02-21 stsp int first_displayed_line;
119 15a087fe 2019-02-21 stsp int last_displayed_line;
121 15a087fe 2019-02-21 stsp int diff_context;
122 15a087fe 2019-02-21 stsp struct got_repository *repo;
123 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
125 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
126 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
129 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
131 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
132 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
133 1a76625f 2018-10-22 stsp int commits_needed;
134 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
135 1a76625f 2018-10-22 stsp struct commit_queue *commits;
136 1a76625f 2018-10-22 stsp const char *in_repo_path;
137 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
138 1a76625f 2018-10-22 stsp struct got_repository *repo;
139 1a76625f 2018-10-22 stsp int log_complete;
140 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
141 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
142 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
143 13add988 2019-10-15 stsp int *searching;
144 13add988 2019-10-15 stsp int *search_next_done;
145 13add988 2019-10-15 stsp regex_t *regex;
148 1a76625f 2018-10-22 stsp struct tog_log_view_state {
149 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
150 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
151 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
152 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
153 b01e7d3b 2018-08-04 stsp int selected;
154 b01e7d3b 2018-08-04 stsp char *in_repo_path;
155 d01904d4 2019-06-25 stsp const char *head_ref_name;
156 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
157 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
158 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
159 1a76625f 2018-10-22 stsp sig_atomic_t quit;
160 1a76625f 2018-10-22 stsp pthread_t thread;
161 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
162 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
163 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
166 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
167 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
168 e9424729 2018-08-04 stsp int nlines;
170 e9424729 2018-08-04 stsp struct tog_view *view;
171 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
175 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
176 e9424729 2018-08-04 stsp const char *path;
177 e9424729 2018-08-04 stsp struct got_repository *repo;
178 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
179 e9424729 2018-08-04 stsp int *complete;
180 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
181 fc06ba56 2019-08-22 stsp void *cancel_arg;
184 e9424729 2018-08-04 stsp struct tog_blame {
186 e9424729 2018-08-04 stsp size_t filesize;
187 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
188 6fcac457 2018-11-19 stsp int nlines;
189 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
190 e9424729 2018-08-04 stsp pthread_t thread;
191 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
192 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
193 e9424729 2018-08-04 stsp const char *path;
196 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
197 7cbe629d 2018-08-04 stsp int first_displayed_line;
198 7cbe629d 2018-08-04 stsp int last_displayed_line;
199 7cbe629d 2018-08-04 stsp int selected_line;
200 7cbe629d 2018-08-04 stsp int blame_complete;
203 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
204 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
205 e5a0f69f 2018-08-18 stsp char *path;
206 7cbe629d 2018-08-04 stsp struct got_repository *repo;
207 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
208 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
209 e9424729 2018-08-04 stsp struct tog_blame blame;
210 6c4c42e0 2019-06-24 stsp int matched_line;
213 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
214 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
215 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
216 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
217 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
218 ad80ab7b 2018-08-04 stsp int selected;
221 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
223 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
224 ad80ab7b 2018-08-04 stsp char *tree_label;
225 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
226 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
227 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
228 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
229 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
230 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
231 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
232 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
233 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
234 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
235 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
236 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
240 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
242 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
243 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
244 669b5ffa 2018-10-07 stsp * there is enough screen estate.
246 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
247 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
249 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
250 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
251 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
253 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
254 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
256 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
258 cc3c9aac 2018-08-01 stsp struct tog_view {
259 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
260 26ed57b2 2018-05-19 stsp WINDOW *window;
261 26ed57b2 2018-05-19 stsp PANEL *panel;
262 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
263 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
264 1004088d 2018-09-29 stsp int focussed;
265 669b5ffa 2018-10-07 stsp struct tog_view *parent;
266 669b5ffa 2018-10-07 stsp struct tog_view *child;
267 669b5ffa 2018-10-07 stsp int child_focussed;
269 5dc9f4bc 2018-08-04 stsp /* type-specific state */
270 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
272 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
273 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
274 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
275 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
278 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
279 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
280 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
281 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
283 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
284 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
285 60493ae3 2019-06-20 stsp int searching;
286 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
287 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
288 60493ae3 2019-06-20 stsp int search_next_done;
289 1803e47f 2019-06-22 stsp regex_t regex;
292 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
293 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
294 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
295 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
296 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
297 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
298 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
300 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
301 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
302 d01904d4 2019-06-25 stsp struct got_repository *, const char *, const char *, int);
303 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
304 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
305 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
306 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
307 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
308 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
310 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
311 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
312 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
313 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
314 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
315 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
316 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
317 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
319 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
320 8b473291 2019-02-21 stsp struct got_tree_object *, struct got_object_id *,
321 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
322 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
323 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
324 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
325 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
326 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
327 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
329 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
330 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
332 25791caa 2018-10-24 stsp static void
333 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
335 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
338 83baff54 2019-08-12 stsp static void
339 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
341 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
344 e5a0f69f 2018-08-18 stsp static const struct got_error *
345 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
347 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
349 669b5ffa 2018-10-07 stsp if (view->child) {
350 669b5ffa 2018-10-07 stsp view_close(view->child);
351 669b5ffa 2018-10-07 stsp view->child = NULL;
353 e5a0f69f 2018-08-18 stsp if (view->close)
354 e5a0f69f 2018-08-18 stsp err = view->close(view);
355 ea5e7bb5 2018-08-01 stsp if (view->panel)
356 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
357 ea5e7bb5 2018-08-01 stsp if (view->window)
358 ea5e7bb5 2018-08-01 stsp delwin(view->window);
359 ea5e7bb5 2018-08-01 stsp free(view);
360 e5a0f69f 2018-08-18 stsp return err;
363 ea5e7bb5 2018-08-01 stsp static struct tog_view *
364 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
365 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
367 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
369 ea5e7bb5 2018-08-01 stsp if (view == NULL)
370 ea5e7bb5 2018-08-01 stsp return NULL;
372 d6b05b5b 2018-08-04 stsp view->type = type;
373 f7d12f7e 2018-08-01 stsp view->lines = LINES;
374 f7d12f7e 2018-08-01 stsp view->cols = COLS;
375 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
376 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
377 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
378 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
379 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
380 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
381 96a765a8 2018-08-04 stsp view_close(view);
382 ea5e7bb5 2018-08-01 stsp return NULL;
384 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
385 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
386 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
387 96a765a8 2018-08-04 stsp view_close(view);
388 ea5e7bb5 2018-08-01 stsp return NULL;
391 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
392 ea5e7bb5 2018-08-01 stsp return view;
396 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
398 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
400 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
403 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
405 5c60c32a 2018-10-18 stsp static const struct got_error *
406 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
408 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
410 5c60c32a 2018-10-18 stsp view->begin_y = 0;
411 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
412 5c60c32a 2018-10-18 stsp view->nlines = LINES;
413 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
414 5c60c32a 2018-10-18 stsp view->lines = LINES;
415 5c60c32a 2018-10-18 stsp view->cols = COLS;
416 5c60c32a 2018-10-18 stsp err = view_resize(view);
418 5c60c32a 2018-10-18 stsp return err;
420 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
421 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
423 5c60c32a 2018-10-18 stsp return NULL;
426 5c60c32a 2018-10-18 stsp static const struct got_error *
427 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
429 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
431 5c60c32a 2018-10-18 stsp view->begin_x = 0;
432 5c60c32a 2018-10-18 stsp view->begin_y = 0;
433 5c60c32a 2018-10-18 stsp view->nlines = LINES;
434 5c60c32a 2018-10-18 stsp view->ncols = COLS;
435 5c60c32a 2018-10-18 stsp view->lines = LINES;
436 5c60c32a 2018-10-18 stsp view->cols = COLS;
437 5c60c32a 2018-10-18 stsp err = view_resize(view);
439 5c60c32a 2018-10-18 stsp return err;
441 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
442 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
444 5c60c32a 2018-10-18 stsp return NULL;
448 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
450 5c60c32a 2018-10-18 stsp return view->parent == NULL;
453 4d8c2215 2018-08-19 stsp static const struct got_error *
454 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
456 f7d12f7e 2018-08-01 stsp int nlines, ncols;
458 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
459 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
461 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
463 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
464 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
466 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
468 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
469 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
470 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
471 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
472 25791caa 2018-10-24 stsp wclear(view->window);
474 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
475 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
476 0cf4efb1 2018-09-29 stsp view->lines = LINES;
477 0cf4efb1 2018-09-29 stsp view->cols = COLS;
479 6e3e5d9c 2018-10-18 stsp if (view->child) {
480 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
481 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
482 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
483 5c60c32a 2018-10-18 stsp if (view->child->focussed)
484 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
486 5c60c32a 2018-10-18 stsp show_panel(view->panel);
488 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
489 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
493 5c60c32a 2018-10-18 stsp return NULL;
496 669b5ffa 2018-10-07 stsp static const struct got_error *
497 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
499 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
501 669b5ffa 2018-10-07 stsp if (view->child == NULL)
502 669b5ffa 2018-10-07 stsp return NULL;
504 669b5ffa 2018-10-07 stsp err = view_close(view->child);
505 669b5ffa 2018-10-07 stsp view->child = NULL;
506 669b5ffa 2018-10-07 stsp return err;
509 669b5ffa 2018-10-07 stsp static const struct got_error *
510 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
512 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
514 669b5ffa 2018-10-07 stsp view->child = child;
515 669b5ffa 2018-10-07 stsp child->parent = view;
516 669b5ffa 2018-10-07 stsp return err;
520 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
522 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
525 34bc9ec9 2019-02-22 stsp static void
526 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
528 25791caa 2018-10-24 stsp int cols, lines;
529 25791caa 2018-10-24 stsp struct winsize size;
531 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
532 25791caa 2018-10-24 stsp cols = 80; /* Default */
533 25791caa 2018-10-24 stsp lines = 24;
535 25791caa 2018-10-24 stsp cols = size.ws_col;
536 25791caa 2018-10-24 stsp lines = size.ws_row;
538 25791caa 2018-10-24 stsp resize_term(lines, cols);
541 2b49a8ae 2019-06-22 stsp static const struct got_error *
542 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
544 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
545 2b49a8ae 2019-06-22 stsp char pattern[1024];
547 7d049c18 2019-08-21 stsp int begin_x = 0;
549 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
550 2b49a8ae 2019-06-22 stsp return NULL;
552 7d049c18 2019-08-21 stsp if (!view_is_parent_view(view))
553 7d049c18 2019-08-21 stsp begin_x = view_split_begin_x(view->begin_x);
554 2b49a8ae 2019-06-22 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1,
555 7d049c18 2019-08-21 stsp begin_x, "/");
556 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
558 2b49a8ae 2019-06-22 stsp nocbreak();
560 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
563 2b49a8ae 2019-06-22 stsp if (ret == ERR)
564 2b49a8ae 2019-06-22 stsp return NULL;
566 2b49a8ae 2019-06-22 stsp if (view->searching) {
567 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
568 2b49a8ae 2019-06-22 stsp view->searching = 0;
571 2b49a8ae 2019-06-22 stsp if (regcomp(&view->regex, pattern,
572 f5daf9b1 2019-06-24 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
573 7c32bd05 2019-06-22 stsp err = view->search_start(view);
575 7c32bd05 2019-06-22 stsp regfree(&view->regex);
576 7c32bd05 2019-06-22 stsp return err;
578 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
579 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
580 2b49a8ae 2019-06-22 stsp view->search_next(view);
583 2b49a8ae 2019-06-22 stsp return NULL;
586 0cf4efb1 2018-09-29 stsp static const struct got_error *
587 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
588 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
589 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
591 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
592 669b5ffa 2018-10-07 stsp struct tog_view *v;
593 1a76625f 2018-10-22 stsp int ch, errcode;
595 e5a0f69f 2018-08-18 stsp *new = NULL;
596 e5a0f69f 2018-08-18 stsp *dead = NULL;
597 0cf4efb1 2018-09-29 stsp *focus = NULL;
599 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
600 60493ae3 2019-06-20 stsp errcode = pthread_mutex_unlock(&tog_mutex);
601 60493ae3 2019-06-20 stsp if (errcode)
602 60493ae3 2019-06-20 stsp return got_error_set_errno(errcode,
603 60493ae3 2019-06-20 stsp "pthread_mutex_unlock");
604 60493ae3 2019-06-20 stsp pthread_yield();
605 60493ae3 2019-06-20 stsp errcode = pthread_mutex_lock(&tog_mutex);
606 60493ae3 2019-06-20 stsp if (errcode)
607 60493ae3 2019-06-20 stsp return got_error_set_errno(errcode,
608 60493ae3 2019-06-20 stsp "pthread_mutex_lock");
609 60493ae3 2019-06-20 stsp view->search_next(view);
610 60493ae3 2019-06-20 stsp return NULL;
613 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
614 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
615 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
616 1a76625f 2018-10-22 stsp if (errcode)
617 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
618 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
619 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
620 1a76625f 2018-10-22 stsp if (errcode)
621 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
622 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
624 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
625 25791caa 2018-10-24 stsp tog_resizeterm();
626 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
627 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
628 25791caa 2018-10-24 stsp err = view_resize(v);
630 25791caa 2018-10-24 stsp return err;
631 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
633 25791caa 2018-10-24 stsp return err;
637 e5a0f69f 2018-08-18 stsp switch (ch) {
641 1e37a5c2 2019-05-12 jcs if (view->child) {
642 1e37a5c2 2019-05-12 jcs *focus = view->child;
643 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
644 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
645 1e37a5c2 2019-05-12 jcs *focus = view->parent;
646 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
650 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
651 1e37a5c2 2019-05-12 jcs *dead = view;
657 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
658 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
660 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
661 669b5ffa 2018-10-07 stsp *focus = view->child;
662 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
663 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
665 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
668 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
669 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
671 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
672 1e37a5c2 2019-05-12 jcs *focus = view;
673 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
674 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
676 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
680 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
681 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
684 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
687 60493ae3 2019-06-20 stsp if (view->search_start)
688 2b49a8ae 2019-06-22 stsp view_search_start(view);
690 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
694 60493ae3 2019-06-20 stsp if (view->search_next && view->searching) {
695 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
696 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
697 60493ae3 2019-06-20 stsp view->search_next_done = 0;
698 60493ae3 2019-06-20 stsp view->search_next(view);
700 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
703 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
707 e5a0f69f 2018-08-18 stsp return err;
711 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
713 0cf4efb1 2018-09-29 stsp PANEL *panel;
714 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
716 669b5ffa 2018-10-07 stsp if (view->parent)
717 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
719 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
720 0cf4efb1 2018-09-29 stsp if (panel == NULL)
723 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
724 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
725 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
729 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
731 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
732 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
734 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
736 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
739 669b5ffa 2018-10-07 stsp return view->focussed;
742 bcbd79e2 2018-08-19 stsp static const struct got_error *
743 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
745 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
746 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
747 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
748 fd823528 2018-10-22 stsp int fast_refresh = 10;
749 1a76625f 2018-10-22 stsp int done = 0, errcode;
751 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
752 1a76625f 2018-10-22 stsp if (errcode)
753 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
755 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
756 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
758 a81bf10d 2018-09-29 stsp main_view = view;
759 1004088d 2018-09-29 stsp view->focussed = 1;
760 878940b7 2018-09-29 stsp err = view->show(view);
762 0cf4efb1 2018-09-29 stsp return err;
763 0cf4efb1 2018-09-29 stsp update_panels();
764 0cf4efb1 2018-09-29 stsp doupdate();
765 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
766 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
767 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
768 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
770 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
771 e4197bf9 2018-08-18 stsp view, &views);
774 e5a0f69f 2018-08-18 stsp if (dead_view) {
775 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
777 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
778 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
779 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
780 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
781 669b5ffa 2018-10-07 stsp prev = view->parent;
783 669b5ffa 2018-10-07 stsp if (dead_view->parent)
784 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
786 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
788 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
789 d01904d4 2019-06-25 stsp if (err || (dead_view == main_view && new_view == NULL))
792 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
793 0cf4efb1 2018-09-29 stsp if (focus_view)
794 0cf4efb1 2018-09-29 stsp view = focus_view;
795 669b5ffa 2018-10-07 stsp else if (prev)
796 669b5ffa 2018-10-07 stsp view = prev;
797 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
798 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
799 0cf4efb1 2018-09-29 stsp tog_view_list_head);
801 0cf4efb1 2018-09-29 stsp view = NULL;
802 669b5ffa 2018-10-07 stsp if (view) {
803 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
804 669b5ffa 2018-10-07 stsp focus_view = view->child;
806 669b5ffa 2018-10-07 stsp focus_view = view;
810 bcbd79e2 2018-08-19 stsp if (new_view) {
811 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
812 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
813 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
814 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
816 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
817 86c66b02 2018-10-18 stsp err = view_close(v);
822 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
823 fed7eaa8 2018-10-24 stsp view = new_view;
824 878940b7 2018-09-29 stsp if (focus_view == NULL)
825 878940b7 2018-09-29 stsp focus_view = new_view;
827 0cf4efb1 2018-09-29 stsp if (focus_view) {
828 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
830 0cf4efb1 2018-09-29 stsp view->focussed = 0;
831 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
832 0cf4efb1 2018-09-29 stsp view = focus_view;
833 878940b7 2018-09-29 stsp if (new_view)
834 878940b7 2018-09-29 stsp show_panel(new_view->panel);
835 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
836 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
838 669b5ffa 2018-10-07 stsp if (view) {
839 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
840 758194b5 2018-10-24 stsp view->focussed = 1;
841 758194b5 2018-10-24 stsp show_panel(view->panel);
842 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
843 758194b5 2018-10-24 stsp show_panel(view->child->panel);
844 1a76625f 2018-10-22 stsp focus_view = view;
846 669b5ffa 2018-10-07 stsp if (view->parent) {
847 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
851 669b5ffa 2018-10-07 stsp err = view->show(view);
854 669b5ffa 2018-10-07 stsp if (view->child) {
855 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
859 1a76625f 2018-10-22 stsp update_panels();
860 1a76625f 2018-10-22 stsp doupdate();
864 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
865 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
866 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
867 e5a0f69f 2018-08-18 stsp view_close(view);
870 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
871 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
872 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
874 e5a0f69f 2018-08-18 stsp return err;
877 4ed7e80c 2018-05-20 stsp __dead static void
878 9f7d7167 2018-04-29 stsp usage_log(void)
881 c70c5802 2018-08-01 stsp fprintf(stderr,
882 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
883 9f7d7167 2018-04-29 stsp getprogname());
887 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
888 80ddbec8 2018-04-29 stsp static const struct got_error *
889 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
891 00dfcb92 2018-06-11 stsp char *vis = NULL;
892 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
894 963b370f 2018-05-20 stsp *ws = NULL;
895 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
896 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
897 00dfcb92 2018-06-11 stsp int vislen;
898 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
899 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
901 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
902 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
904 00dfcb92 2018-06-11 stsp return err;
905 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
906 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
907 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
912 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
913 a7f50699 2018-06-11 stsp if (*ws == NULL) {
914 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
918 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
919 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
924 963b370f 2018-05-20 stsp *ws = NULL;
927 963b370f 2018-05-20 stsp return err;
930 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
931 963b370f 2018-05-20 stsp static const struct got_error *
932 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
933 27a741e5 2019-09-11 stsp int col_tab_align)
935 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
936 963b370f 2018-05-20 stsp int cols = 0;
937 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
938 963b370f 2018-05-20 stsp size_t wlen;
941 963b370f 2018-05-20 stsp *wlinep = NULL;
942 b700b5d6 2018-07-10 stsp *widthp = 0;
944 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
946 963b370f 2018-05-20 stsp return err;
949 27a741e5 2019-09-11 stsp while (i < wlen) {
950 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
952 27a741e5 2019-09-11 stsp if (width == 0) {
957 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
958 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
960 27a741e5 2019-09-11 stsp cols += width;
962 27a741e5 2019-09-11 stsp } else if (width == -1) {
963 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
964 27a741e5 2019-09-11 stsp width = TABSIZE -
965 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
966 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
968 27a741e5 2019-09-11 stsp cols += width;
972 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
976 963b370f 2018-05-20 stsp wline[i] = L'\0';
977 b700b5d6 2018-07-10 stsp if (widthp)
978 b700b5d6 2018-07-10 stsp *widthp = cols;
981 963b370f 2018-05-20 stsp free(wline);
983 963b370f 2018-05-20 stsp *wlinep = wline;
984 963b370f 2018-05-20 stsp return err;
987 8b473291 2019-02-21 stsp static const struct got_error*
988 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
989 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
991 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
992 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
994 8b473291 2019-02-21 stsp const char *name;
996 8b473291 2019-02-21 stsp *refs_str = NULL;
998 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
999 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1002 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1003 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1005 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1006 8b473291 2019-02-21 stsp name += 5;
1007 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1009 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1010 8b473291 2019-02-21 stsp name += 6;
1011 8b473291 2019-02-21 stsp if (strncmp(name, "remotes/", 8) == 0)
1012 8b473291 2019-02-21 stsp name += 8;
1013 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1014 52b5abe1 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1015 5d844a1e 2019-08-13 stsp if (err) {
1016 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1018 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1019 5d844a1e 2019-08-13 stsp err = NULL;
1020 5d844a1e 2019-08-13 stsp tag = NULL;
1023 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1024 52b5abe1 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1026 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1027 52b5abe1 2019-08-13 stsp if (cmp != 0)
1029 8b473291 2019-02-21 stsp s = *refs_str;
1030 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1031 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1032 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1034 8b473291 2019-02-21 stsp *refs_str = NULL;
1040 8b473291 2019-02-21 stsp return err;
1043 963b370f 2018-05-20 stsp static const struct got_error *
1044 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1045 27a741e5 2019-09-11 stsp int col_tab_align)
1047 5813d178 2019-03-09 stsp char *smallerthan, *at;
1049 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1050 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1051 5813d178 2019-03-09 stsp author = smallerthan + 1;
1052 5813d178 2019-03-09 stsp at = strchr(author, '@');
1054 5813d178 2019-03-09 stsp *at = '\0';
1055 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1058 5813d178 2019-03-09 stsp static const struct got_error *
1059 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1060 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1061 27a741e5 2019-09-11 stsp const size_t date_display_cols, int author_display_cols)
1063 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1064 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
1065 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1066 5813d178 2019-03-09 stsp char *author = NULL;
1067 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1068 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1069 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1070 bb737323 2018-05-20 stsp int col, limit;
1071 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1072 ccb26ccd 2018-11-05 stsp struct tm tm;
1073 45d799e2 2018-12-23 stsp time_t committer_time;
1075 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1076 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1077 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1078 ccb26ccd 2018-11-05 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
1079 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1080 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1082 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1083 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1085 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1086 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1087 27a741e5 2019-09-11 stsp col = limit;
1088 b39d25c7 2018-07-10 stsp if (col > avail)
1089 b39d25c7 2018-07-10 stsp goto done;
1091 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1092 5813d178 2019-03-09 stsp if (author == NULL) {
1093 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1094 80ddbec8 2018-04-29 stsp goto done;
1096 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1098 bb737323 2018-05-20 stsp goto done;
1099 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1100 bb737323 2018-05-20 stsp col += author_width;
1101 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1102 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1104 bb737323 2018-05-20 stsp author_width++;
1106 9c2eaf34 2018-05-20 stsp if (col > avail)
1107 9c2eaf34 2018-05-20 stsp goto done;
1109 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1111 6d9fbc00 2018-04-29 stsp goto done;
1112 bb737323 2018-05-20 stsp logmsg = logmsg0;
1113 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1115 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1116 bb737323 2018-05-20 stsp if (newline)
1117 bb737323 2018-05-20 stsp *newline = '\0';
1118 bb737323 2018-05-20 stsp limit = avail - col;
1119 27a741e5 2019-09-11 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, 0);
1121 bb737323 2018-05-20 stsp goto done;
1122 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1123 bb737323 2018-05-20 stsp col += logmsg_width;
1124 27a741e5 2019-09-11 stsp while (col < avail) {
1125 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1129 80ddbec8 2018-04-29 stsp free(logmsg0);
1130 bb737323 2018-05-20 stsp free(wlogmsg);
1131 5813d178 2019-03-09 stsp free(author);
1132 bb737323 2018-05-20 stsp free(wauthor);
1133 80ddbec8 2018-04-29 stsp free(line);
1134 80ddbec8 2018-04-29 stsp return err;
1137 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1138 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1139 899d86c2 2018-05-10 stsp struct got_object_id *id)
1141 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1143 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1144 80ddbec8 2018-04-29 stsp if (entry == NULL)
1145 899d86c2 2018-05-10 stsp return NULL;
1147 899d86c2 2018-05-10 stsp entry->id = id;
1148 99db9666 2018-05-07 stsp entry->commit = commit;
1149 899d86c2 2018-05-10 stsp return entry;
1152 99db9666 2018-05-07 stsp static void
1153 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1155 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1157 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1158 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1159 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1160 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1161 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1162 99db9666 2018-05-07 stsp free(entry);
1165 99db9666 2018-05-07 stsp static void
1166 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1168 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1169 99db9666 2018-05-07 stsp pop_commit(commits);
1172 c4972b91 2018-05-07 stsp static const struct got_error *
1173 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1174 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1176 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1177 13add988 2019-10-15 stsp regmatch_t regmatch;
1178 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1180 13add988 2019-10-15 stsp *have_match = 0;
1182 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1184 13add988 2019-10-15 stsp return err;
1186 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1188 13add988 2019-10-15 stsp goto done;
1190 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1191 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1192 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1193 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1194 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1195 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1196 13add988 2019-10-15 stsp *have_match = 1;
1198 13add988 2019-10-15 stsp free(id_str);
1199 13add988 2019-10-15 stsp free(logmsg);
1200 13add988 2019-10-15 stsp return err;
1203 13add988 2019-10-15 stsp static const struct got_error *
1204 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1205 13add988 2019-10-15 stsp int minqueue, struct got_repository *repo, const char *path,
1206 13add988 2019-10-15 stsp int *searching, int *search_next_done, regex_t *regex)
1208 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1209 13add988 2019-10-15 stsp int nqueued = 0, have_match = 0;
1212 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1213 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1214 1a76625f 2018-10-22 stsp * while updating the display.
1216 13add988 2019-10-15 stsp while (nqueued < minqueue ||
1217 13add988 2019-10-15 stsp (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1218 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1219 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1220 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1221 1a76625f 2018-10-22 stsp int errcode;
1223 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1224 9ba79e04 2018-06-11 stsp if (err) {
1225 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1227 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1228 6fb7cd11 2019-08-22 stsp minqueue, repo, NULL, NULL);
1230 ecb28ae0 2018-07-16 stsp return err;
1234 ecb28ae0 2018-07-16 stsp if (id == NULL)
1237 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1240 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1241 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1242 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1246 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1247 1a76625f 2018-10-22 stsp if (errcode) {
1248 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1249 13add988 2019-10-15 stsp "pthread_mutex_lock");
1253 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1254 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1255 ecb28ae0 2018-07-16 stsp nqueued++;
1256 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1258 13add988 2019-10-15 stsp if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1259 13add988 2019-10-15 stsp err = match_commit(&have_match, id, commit, regex);
1260 13add988 2019-10-15 stsp if (err) {
1261 13add988 2019-10-15 stsp pthread_mutex_lock(&tog_mutex);
1266 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1267 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1268 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1269 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1271 13add988 2019-10-15 stsp if (have_match)
1275 9ba79e04 2018-06-11 stsp return err;
1278 99db9666 2018-05-07 stsp static const struct got_error *
1279 19e70ad6 2019-05-14 stsp get_head_commit_id(struct got_object_id **head_id, const char *branch_name,
1280 19e70ad6 2019-05-14 stsp struct got_repository *repo)
1282 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1283 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1285 9ba79e04 2018-06-11 stsp *head_id = NULL;
1287 19e70ad6 2019-05-14 stsp err = got_ref_open(&head_ref, repo, branch_name, 0);
1289 99db9666 2018-05-07 stsp return err;
1291 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1292 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1293 9ba79e04 2018-06-11 stsp if (err) {
1294 9ba79e04 2018-06-11 stsp *head_id = NULL;
1295 99db9666 2018-05-07 stsp return err;
1298 9ba79e04 2018-06-11 stsp return NULL;
1301 0553a4e3 2018-04-30 stsp static const struct got_error *
1302 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1303 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1304 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1305 8b473291 2019-02-21 stsp struct got_reflist_head *refs, const char *path, int commits_needed)
1307 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1308 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1309 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1310 60493ae3 2019-06-20 stsp int width;
1311 60493ae3 2019-06-20 stsp int ncommits, author_cols = 10;
1312 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1313 8b473291 2019-02-21 stsp char *refs_str = NULL;
1314 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1315 27a741e5 2019-09-11 stsp static const size_t date_display_cols = 9;
1317 e0d42f60 2018-07-22 stsp entry = first;
1318 e0d42f60 2018-07-22 stsp ncommits = 0;
1319 e0d42f60 2018-07-22 stsp while (entry) {
1320 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1321 e0d42f60 2018-07-22 stsp *selected = entry;
1324 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1325 e0d42f60 2018-07-22 stsp ncommits++;
1328 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1329 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1331 ecb28ae0 2018-07-16 stsp return err;
1332 8b473291 2019-02-21 stsp if (refs) {
1333 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, (*selected)->id,
1336 8b473291 2019-02-21 stsp goto done;
1340 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1341 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1343 8b473291 2019-02-21 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1344 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1345 60493ae3 2019-06-20 stsp commits_needed > 0 ?
1346 60493ae3 2019-06-20 stsp (view->searching && view->search_next_done == 0
1347 60493ae3 2019-06-20 stsp ? "searching..." : "loading... ") :
1348 8b473291 2019-02-21 stsp (refs_str ? refs_str : "")) == -1) {
1349 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1350 8b473291 2019-02-21 stsp goto done;
1353 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1354 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1355 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1356 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1357 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1358 1a76625f 2018-10-22 stsp header = NULL;
1359 1a76625f 2018-10-22 stsp goto done;
1361 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1362 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1363 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1364 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1365 1a76625f 2018-10-22 stsp header = NULL;
1366 1a76625f 2018-10-22 stsp goto done;
1368 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1370 1a76625f 2018-10-22 stsp goto done;
1372 2814baeb 2018-08-01 stsp werase(view->window);
1374 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1375 a3404814 2018-09-02 stsp wstandout(view->window);
1376 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1377 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1378 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1381 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1382 a3404814 2018-09-02 stsp wstandend(view->window);
1383 ecb28ae0 2018-07-16 stsp free(wline);
1384 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1385 1a76625f 2018-10-22 stsp goto done;
1387 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1388 899d86c2 2018-05-10 stsp entry = first;
1389 5813d178 2019-03-09 stsp ncommits = 0;
1390 5813d178 2019-03-09 stsp while (entry) {
1391 5813d178 2019-03-09 stsp char *author;
1392 5813d178 2019-03-09 stsp wchar_t *wauthor;
1393 5813d178 2019-03-09 stsp int width;
1394 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1396 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1397 5813d178 2019-03-09 stsp if (author == NULL) {
1398 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1399 5813d178 2019-03-09 stsp goto done;
1401 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1402 27a741e5 2019-09-11 stsp date_display_cols);
1403 5813d178 2019-03-09 stsp if (author_cols < width)
1404 5813d178 2019-03-09 stsp author_cols = width;
1405 5813d178 2019-03-09 stsp free(wauthor);
1406 5813d178 2019-03-09 stsp free(author);
1407 7ca04879 2019-10-19 stsp ncommits++;
1408 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1411 5813d178 2019-03-09 stsp entry = first;
1412 899d86c2 2018-05-10 stsp *last = first;
1413 867c6645 2018-07-10 stsp ncommits = 0;
1414 899d86c2 2018-05-10 stsp while (entry) {
1415 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1417 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1418 2814baeb 2018-08-01 stsp wstandout(view->window);
1419 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1420 27a741e5 2019-09-11 stsp date_display_cols, author_cols);
1421 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1422 2814baeb 2018-08-01 stsp wstandend(view->window);
1424 60493ae3 2019-06-20 stsp goto done;
1425 0553a4e3 2018-04-30 stsp ncommits++;
1426 899d86c2 2018-05-10 stsp *last = entry;
1427 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1430 1a57306a 2018-09-02 stsp view_vborder(view);
1432 1a76625f 2018-10-22 stsp free(id_str);
1433 8b473291 2019-02-21 stsp free(refs_str);
1434 1a76625f 2018-10-22 stsp free(ncommits_str);
1435 1a76625f 2018-10-22 stsp free(header);
1436 80ddbec8 2018-04-29 stsp return err;
1439 07b55e75 2018-05-10 stsp static void
1440 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1441 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1442 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1444 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1445 07b55e75 2018-05-10 stsp int nscrolled = 0;
1447 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1448 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1451 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1452 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1453 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1454 07b55e75 2018-05-10 stsp if (entry) {
1455 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1456 07b55e75 2018-05-10 stsp nscrolled++;
1461 aa075928 2018-05-10 stsp static const struct got_error *
1462 5e224a3e 2019-02-22 stsp trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1463 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1465 5e224a3e 2019-02-22 stsp int errcode;
1466 8a42fca8 2019-02-22 stsp int max_wait = 20;
1468 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1470 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1471 5e224a3e 2019-02-22 stsp if (*log_complete)
1474 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1475 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1476 7aafa0d1 2019-02-22 stsp if (errcode)
1477 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1478 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1479 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1480 7aafa0d1 2019-02-22 stsp if (errcode)
1481 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1482 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1483 7aafa0d1 2019-02-22 stsp pthread_yield();
1484 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1485 7aafa0d1 2019-02-22 stsp if (errcode)
1486 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1487 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1489 8a42fca8 2019-02-22 stsp if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1491 5e224a3e 2019-02-22 stsp * Thread is not done yet; lose a key press
1492 5e224a3e 2019-02-22 stsp * and let the user retry... this way the GUI
1493 5e224a3e 2019-02-22 stsp * remains interactive while logging deep paths
1494 5e224a3e 2019-02-22 stsp * with few commits in history.
1496 7aafa0d1 2019-02-22 stsp return NULL;
1500 5e224a3e 2019-02-22 stsp return NULL;
1503 5e224a3e 2019-02-22 stsp static const struct got_error *
1504 34bc9ec9 2019-02-22 stsp scroll_down(struct tog_view *view,
1505 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1506 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1507 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1508 5e224a3e 2019-02-22 stsp pthread_cond_t *need_commits)
1510 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1511 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1512 5e224a3e 2019-02-22 stsp int nscrolled = 0;
1514 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1515 5e224a3e 2019-02-22 stsp return NULL;
1517 5e224a3e 2019-02-22 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1518 5e224a3e 2019-02-22 stsp if (pentry == NULL && !*log_complete) {
1520 08ebd0a9 2019-02-22 stsp * Ask the log thread for required amount of commits
1521 08ebd0a9 2019-02-22 stsp * plus some amount of pre-fetching.
1523 08ebd0a9 2019-02-22 stsp (*commits_needed) += maxscroll + 20;
1524 5e224a3e 2019-02-22 stsp err = trigger_log_thread(0, commits_needed, log_complete,
1525 5e224a3e 2019-02-22 stsp need_commits);
1527 5e224a3e 2019-02-22 stsp return err;
1531 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1532 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1535 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1537 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1538 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1540 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1541 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1543 dd0a52c1 2018-05-20 stsp return err;
1546 cd0acaa7 2018-05-20 stsp static const struct got_error *
1547 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1548 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1549 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1550 8b473291 2019-02-21 stsp struct got_repository *repo)
1552 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1553 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1554 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1556 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1557 15a94983 2018-12-23 stsp if (diff_view == NULL)
1558 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1560 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1561 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1562 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1563 e5a0f69f 2018-08-18 stsp if (err == NULL)
1564 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1565 cd0acaa7 2018-05-20 stsp return err;
1568 80ddbec8 2018-04-29 stsp static const struct got_error *
1569 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1570 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1572 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1574 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1575 941e9f74 2019-05-21 stsp if (parent == NULL)
1576 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1578 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1579 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1580 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1581 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1582 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1583 941e9f74 2019-05-21 stsp s->tree = subtree;
1584 941e9f74 2019-05-21 stsp s->entries = got_object_tree_get_entries(s->tree);
1585 941e9f74 2019-05-21 stsp s->selected = 0;
1586 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1587 941e9f74 2019-05-21 stsp return NULL;
1591 941e9f74 2019-05-21 stsp static const struct got_error *
1592 941e9f74 2019-05-21 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1593 941e9f74 2019-05-21 stsp struct commit_queue_entry *entry, const char *path,
1594 941e9f74 2019-05-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
1596 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1597 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1598 941e9f74 2019-05-21 stsp struct got_tree_entry *te;
1599 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s;
1600 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1601 b03c880f 2019-05-21 stsp char *slash, *subpath = NULL;
1602 941e9f74 2019-05-21 stsp const char *p;
1604 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree, repo,
1605 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(entry->commit));
1607 9343a5fb 2018-06-23 stsp return err;
1609 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1610 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1611 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1613 8b473291 2019-02-21 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1614 941e9f74 2019-05-21 stsp if (err) {
1615 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1616 941e9f74 2019-05-21 stsp return err;
1618 941e9f74 2019-05-21 stsp s = &tree_view->state.tree;
1620 941e9f74 2019-05-21 stsp *new_view = tree_view;
1622 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1624 8d0fe45a 2019-08-12 stsp while (p[0] == '/')
1626 941e9f74 2019-05-21 stsp while (*p) {
1627 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1629 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1630 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1631 941e9f74 2019-05-21 stsp if (slash == NULL)
1632 941e9f74 2019-05-21 stsp slash = strchr(p, '\0');
1633 941e9f74 2019-05-21 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
1634 941e9f74 2019-05-21 stsp if (strncmp(p, te->name, slash - p) == 0) {
1635 941e9f74 2019-05-21 stsp s->selected_entry = te;
1638 b03c880f 2019-05-21 stsp s->selected++;
1640 941e9f74 2019-05-21 stsp if (s->selected_entry == NULL) {
1641 941e9f74 2019-05-21 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1644 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1645 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1647 67409a31 2019-05-24 stsp if (!S_ISDIR(s->selected_entry->mode)) {
1648 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1649 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1650 67409a31 2019-05-24 stsp s->selected = 0;
1654 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1655 941e9f74 2019-05-21 stsp if (slash)
1656 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1658 941e9f74 2019-05-21 stsp subpath = strdup(path);
1659 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1660 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1664 941e9f74 2019-05-21 stsp err = got_object_id_by_path(&tree_id, repo, entry->id,
1669 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1670 941e9f74 2019-05-21 stsp free(tree_id);
1674 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1675 941e9f74 2019-05-21 stsp if (err) {
1676 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1679 941e9f74 2019-05-21 stsp if (slash == NULL)
1681 941e9f74 2019-05-21 stsp free(subpath);
1682 941e9f74 2019-05-21 stsp subpath = NULL;
1683 941e9f74 2019-05-21 stsp p = slash;
1686 941e9f74 2019-05-21 stsp free(subpath);
1687 1a76625f 2018-10-22 stsp return err;
1690 1a76625f 2018-10-22 stsp static void *
1691 1a76625f 2018-10-22 stsp log_thread(void *arg)
1693 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1694 1a76625f 2018-10-22 stsp int errcode = 0;
1695 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1696 1a76625f 2018-10-22 stsp int done = 0;
1698 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo,
1699 6fb7cd11 2019-08-22 stsp NULL, NULL);
1701 1a76625f 2018-10-22 stsp return (void *)err;
1703 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1704 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1705 13add988 2019-10-15 stsp a->in_repo_path, a->searching, a->search_next_done,
1706 13add988 2019-10-15 stsp a->regex);
1707 1a76625f 2018-10-22 stsp if (err) {
1708 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1709 1a76625f 2018-10-22 stsp return (void *)err;
1710 1a76625f 2018-10-22 stsp err = NULL;
1712 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1713 1a76625f 2018-10-22 stsp a->commits_needed--;
1715 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1716 3abe8080 2019-04-10 stsp if (errcode) {
1717 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1718 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1720 3abe8080 2019-04-10 stsp } else if (*a->quit)
1722 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1723 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1724 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1725 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1729 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1730 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1731 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1732 1a76625f 2018-10-22 stsp &tog_mutex);
1733 1a76625f 2018-10-22 stsp if (errcode)
1734 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1735 2af4a041 2019-05-11 jcs "pthread_cond_wait");
1738 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1739 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1740 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1741 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1743 3abe8080 2019-04-10 stsp a->log_complete = 1;
1744 1a76625f 2018-10-22 stsp return (void *)err;
1747 1a76625f 2018-10-22 stsp static const struct got_error *
1748 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1750 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1751 1a76625f 2018-10-22 stsp int errcode;
1753 1a76625f 2018-10-22 stsp if (s->thread) {
1754 1a76625f 2018-10-22 stsp s->quit = 1;
1755 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1756 1a76625f 2018-10-22 stsp if (errcode)
1757 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1758 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1759 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1760 1a76625f 2018-10-22 stsp if (errcode)
1761 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1762 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1763 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1764 1a76625f 2018-10-22 stsp if (errcode)
1765 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
1766 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1767 1a76625f 2018-10-22 stsp if (errcode)
1768 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1769 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1770 1a76625f 2018-10-22 stsp s->thread = NULL;
1773 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1774 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1775 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
1777 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1778 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1779 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1782 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1783 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1784 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1787 9343a5fb 2018-06-23 stsp return err;
1790 9343a5fb 2018-06-23 stsp static const struct got_error *
1791 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1793 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1794 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1796 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1797 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1798 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1799 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1800 1a76625f 2018-10-22 stsp free(s->start_id);
1801 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1802 1a76625f 2018-10-22 stsp return err;
1805 1a76625f 2018-10-22 stsp static const struct got_error *
1806 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
1808 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
1810 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
1811 96e2b566 2019-07-08 stsp s->search_entry = NULL;
1812 60493ae3 2019-06-20 stsp return NULL;
1815 60493ae3 2019-06-20 stsp static const struct got_error *
1816 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
1818 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
1819 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
1820 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
1822 60493ae3 2019-06-20 stsp if (!view->searching) {
1823 60493ae3 2019-06-20 stsp view->search_next_done = 1;
1824 60493ae3 2019-06-20 stsp return NULL;
1827 96e2b566 2019-07-08 stsp if (s->search_entry) {
1828 13add988 2019-10-15 stsp int errcode, ch;
1829 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1830 13add988 2019-10-15 stsp if (errcode)
1831 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
1832 13add988 2019-10-15 stsp "pthread_mutex_unlock");
1833 13add988 2019-10-15 stsp ch = wgetch(view->window);
1834 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
1835 13add988 2019-10-15 stsp if (errcode)
1836 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
1837 13add988 2019-10-15 stsp "pthread_mutex_lock");
1838 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
1839 678cbce5 2019-07-28 stsp view->search_next_done = 1;
1840 678cbce5 2019-07-28 stsp return NULL;
1842 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
1843 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
1845 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
1846 96e2b566 2019-07-08 stsp commit_queue_head, entry);
1847 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
1848 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1849 b55df7bc 2019-06-21 stsp entry = TAILQ_NEXT(s->selected_entry, entry);
1851 b55df7bc 2019-06-21 stsp entry = TAILQ_PREV(s->selected_entry,
1852 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
1854 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1855 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
1857 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
1860 60493ae3 2019-06-20 stsp while (1) {
1861 13add988 2019-10-15 stsp int have_match = 0;
1863 60493ae3 2019-06-20 stsp if (entry == NULL) {
1864 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
1865 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
1866 f801134a 2019-06-25 stsp view->search_next_done = 1;
1867 f801134a 2019-06-25 stsp return NULL;
1870 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
1871 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
1872 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
1874 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
1875 57b33b64 2019-07-08 stsp return trigger_log_thread(1,
1876 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
1877 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
1878 f801134a 2019-06-25 stsp &s->thread_args.need_commits);
1881 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
1882 13add988 2019-10-15 stsp &view->regex);
1885 13add988 2019-10-15 stsp if (have_match) {
1886 60493ae3 2019-06-20 stsp view->search_next_done = 1;
1887 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
1891 96e2b566 2019-07-08 stsp s->search_entry = entry;
1892 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1893 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
1895 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1898 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
1899 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
1900 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
1901 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
1903 60493ae3 2019-06-20 stsp return err;
1906 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
1907 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
1909 60493ae3 2019-06-20 stsp return err;
1914 96e2b566 2019-07-08 stsp s->search_entry = NULL;
1916 60493ae3 2019-06-20 stsp return NULL;
1919 60493ae3 2019-06-20 stsp static const struct got_error *
1920 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1921 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
1922 d01904d4 2019-06-25 stsp const char *head_ref_name, const char *path, int check_disk)
1924 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1925 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1926 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1927 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1928 1a76625f 2018-10-22 stsp int errcode;
1930 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1931 ecb28ae0 2018-07-16 stsp if (err != NULL)
1932 ecb28ae0 2018-07-16 stsp goto done;
1934 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1935 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1936 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1938 8b473291 2019-02-21 stsp s->refs = refs;
1939 fb2756b9 2018-08-04 stsp s->repo = repo;
1940 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
1941 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1942 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1943 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
1944 5036bf37 2018-09-24 stsp goto done;
1947 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1948 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1949 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1950 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
1951 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
1953 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
1955 1a76625f 2018-10-22 stsp goto done;
1956 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1957 1a76625f 2018-10-22 stsp 0, thread_repo);
1959 1a76625f 2018-10-22 stsp goto done;
1961 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1962 1a76625f 2018-10-22 stsp if (errcode) {
1963 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
1964 1a76625f 2018-10-22 stsp goto done;
1967 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1968 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1969 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1970 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1971 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1972 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1973 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1974 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1975 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1976 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1977 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
1978 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
1979 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
1982 1a76625f 2018-10-22 stsp close_log_view(view);
1983 ba4f502b 2018-08-04 stsp return err;
1986 e5a0f69f 2018-08-18 stsp static const struct got_error *
1987 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1989 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1991 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1992 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1993 2b380cc8 2018-10-24 stsp &s->thread_args);
1994 2b380cc8 2018-10-24 stsp if (errcode)
1995 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
1998 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1999 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
2000 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
2001 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
2004 e5a0f69f 2018-08-18 stsp static const struct got_error *
2005 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2006 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2008 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2009 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2010 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
2011 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2012 669b5ffa 2018-10-07 stsp int begin_x = 0;
2013 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
2015 e5a0f69f 2018-08-18 stsp switch (ch) {
2017 1e37a5c2 2019-05-12 jcs s->quit = 1;
2020 1e37a5c2 2019-05-12 jcs case KEY_UP:
2023 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2025 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2026 1e37a5c2 2019-05-12 jcs s->selected--;
2028 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
2029 1144d21a 2019-06-21 stsp &s->commits);
2031 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2032 a4292ac5 2019-05-12 jcs case CTRL('b'):
2033 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2035 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
2036 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
2037 1e37a5c2 2019-05-12 jcs s->selected = 0;
2040 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
2041 1e37a5c2 2019-05-12 jcs view->nlines, &s->commits);
2044 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2047 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2049 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2050 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2051 1e37a5c2 2019-05-12 jcs s->selected++;
2054 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
2055 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
2056 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
2057 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2058 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
2060 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2061 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2062 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2063 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2064 1e37a5c2 2019-05-12 jcs if (first == NULL)
2066 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
2067 1e37a5c2 2019-05-12 jcs view->nlines, &s->last_displayed_entry,
2068 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
2069 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2070 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
2073 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2074 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2075 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2076 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2077 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2078 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2080 1e37a5c2 2019-05-12 jcs err = NULL;
2083 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2084 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2085 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2086 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2087 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2089 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2092 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2094 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2095 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2096 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2097 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2098 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2101 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2102 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2104 1e37a5c2 2019-05-12 jcs return err;
2105 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2107 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2110 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2111 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2113 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2116 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2118 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2119 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2120 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2121 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2124 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2125 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2127 1e37a5c2 2019-05-12 jcs return err;
2128 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2130 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2133 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2134 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2136 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2138 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2139 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
2141 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
2142 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
2143 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
2145 1e37a5c2 2019-05-12 jcs return err;
2146 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
2147 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
2148 1e37a5c2 2019-05-12 jcs if (lv == NULL)
2149 638f9024 2019-05-13 stsp return got_error_from_errno(
2150 1e37a5c2 2019-05-12 jcs "view_open");
2151 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
2152 d01904d4 2019-06-25 stsp s->repo, s->head_ref_name, parent_path, 0);
2154 1e37a5c2 2019-05-12 jcs return err;;
2155 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2156 1e37a5c2 2019-05-12 jcs *new_view = lv;
2158 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
2159 1e37a5c2 2019-05-12 jcs *focus_view = lv;
2161 1e37a5c2 2019-05-12 jcs return NULL;
2164 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2165 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2167 d01904d4 2019-06-25 stsp return err;
2168 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2169 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2170 d01904d4 2019-06-25 stsp if (lv == NULL)
2171 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2172 d01904d4 2019-06-25 stsp err = get_head_commit_id(&start_id, s->head_ref_name ?
2173 d01904d4 2019-06-25 stsp s->head_ref_name : GOT_REF_HEAD, s->repo);
2174 ef129c5e 2019-08-03 stsp if (err) {
2175 ef129c5e 2019-08-03 stsp view_close(lv);
2176 d01904d4 2019-06-25 stsp return err;
2178 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2179 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2180 e6b23735 2019-10-04 stsp free(start_id);
2181 e6b23735 2019-10-04 stsp view_close(lv);
2182 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2184 e6b23735 2019-10-04 stsp got_ref_list_free(s->refs);
2185 e6b23735 2019-10-04 stsp err = got_ref_list(s->refs, s->repo, NULL,
2186 e6b23735 2019-10-04 stsp got_ref_cmp_by_name, NULL);
2187 e6b23735 2019-10-04 stsp if (err) {
2188 d01904d4 2019-06-25 stsp free(start_id);
2189 ef129c5e 2019-08-03 stsp view_close(lv);
2190 50284065 2019-10-04 stsp return err;
2192 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2193 d01904d4 2019-06-25 stsp s->head_ref_name, in_repo_path, 0);
2194 ef129c5e 2019-08-03 stsp if (err) {
2195 ef129c5e 2019-08-03 stsp free(start_id);
2196 ef129c5e 2019-08-03 stsp view_close(lv);
2197 d01904d4 2019-06-25 stsp return err;;
2199 d01904d4 2019-06-25 stsp *dead_view = view;
2200 d01904d4 2019-06-25 stsp *new_view = lv;
2206 80ddbec8 2018-04-29 stsp return err;
2209 4ed7e80c 2018-05-20 stsp static const struct got_error *
2210 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2212 c2db6724 2019-01-04 stsp const struct got_error *error;
2214 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2215 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2216 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2218 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2219 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2221 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2222 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2224 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
2225 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
2227 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2228 c2db6724 2019-01-04 stsp if (error != NULL)
2229 c2db6724 2019-01-04 stsp return error;
2231 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2232 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2234 c2db6724 2019-01-04 stsp return NULL;
2237 a915003a 2019-02-05 stsp static void
2238 a915003a 2019-02-05 stsp init_curses(void)
2240 a915003a 2019-02-05 stsp initscr();
2242 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2245 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2246 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2247 a915003a 2019-02-05 stsp curs_set(0);
2248 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2249 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2252 c2db6724 2019-01-04 stsp static const struct got_error *
2253 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2255 80ddbec8 2018-04-29 stsp const struct got_error *error;
2256 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2257 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2258 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2259 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2260 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
2261 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2263 04cc582a 2018-08-01 stsp struct tog_view *view;
2265 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2267 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2268 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2269 c2db6724 2019-01-04 stsp NULL) == -1)
2270 80ddbec8 2018-04-29 stsp err(1, "pledge");
2273 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2274 80ddbec8 2018-04-29 stsp switch (ch) {
2276 80ddbec8 2018-04-29 stsp start_commit = optarg;
2279 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2280 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2281 ecb28ae0 2018-07-16 stsp err(1, "-r option");
2284 17020d27 2019-03-07 stsp usage_log();
2285 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2289 80ddbec8 2018-04-29 stsp argc -= optind;
2290 80ddbec8 2018-04-29 stsp argv += optind;
2292 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2293 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
2294 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2295 ecb28ae0 2018-07-16 stsp goto done;
2297 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2298 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2299 963f97a1 2019-03-18 stsp goto done;
2300 963f97a1 2019-03-18 stsp error = NULL;
2302 963f97a1 2019-03-18 stsp if (argc == 0) {
2303 963f97a1 2019-03-18 stsp path = strdup("");
2304 963f97a1 2019-03-18 stsp if (path == NULL) {
2305 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2306 ecb28ae0 2018-07-16 stsp goto done;
2308 963f97a1 2019-03-18 stsp } else if (argc == 1) {
2309 963f97a1 2019-03-18 stsp if (worktree) {
2310 963f97a1 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2312 963f97a1 2019-03-18 stsp if (error)
2313 963f97a1 2019-03-18 stsp goto done;
2315 963f97a1 2019-03-18 stsp path = strdup(argv[0]);
2316 963f97a1 2019-03-18 stsp if (path == NULL) {
2317 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2318 963f97a1 2019-03-18 stsp goto done;
2322 963f97a1 2019-03-18 stsp usage_log();
2324 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2325 a1fbf39a 2019-08-11 stsp if (worktree)
2326 b9d7675a 2019-08-11 stsp repo_path = strdup(
2327 b9d7675a 2019-08-11 stsp got_worktree_get_repo_path(worktree));
2329 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2331 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2332 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2333 963f97a1 2019-03-18 stsp goto done;
2336 a915003a 2019-02-05 stsp init_curses();
2338 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2339 80ddbec8 2018-04-29 stsp if (error != NULL)
2340 ecb28ae0 2018-07-16 stsp goto done;
2342 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2343 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2344 c02c541e 2019-03-29 stsp if (error)
2345 c02c541e 2019-03-29 stsp goto done;
2347 15a94983 2018-12-23 stsp if (start_commit == NULL)
2348 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&start_id, worktree ?
2349 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2352 f2b6a97d 2019-07-15 stsp error = get_head_commit_id(&start_id, start_commit, repo);
2353 f2b6a97d 2019-07-15 stsp if (error) {
2354 f2b6a97d 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
2355 f2b6a97d 2019-07-15 stsp goto done;
2356 f2b6a97d 2019-07-15 stsp error = got_repo_match_object_id_prefix(&start_id,
2357 f2b6a97d 2019-07-15 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2360 80ddbec8 2018-04-29 stsp if (error != NULL)
2361 8b473291 2019-02-21 stsp goto done;
2363 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2364 8b473291 2019-02-21 stsp if (error)
2365 ecb28ae0 2018-07-16 stsp goto done;
2367 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2368 04cc582a 2018-08-01 stsp if (view == NULL) {
2369 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2370 04cc582a 2018-08-01 stsp goto done;
2372 2fc00ff4 2019-08-31 stsp if (worktree) {
2373 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2374 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2375 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2376 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2377 2fc00ff4 2019-08-31 stsp goto done;
2380 2fc00ff4 2019-08-31 stsp error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2382 ba4f502b 2018-08-04 stsp if (error)
2383 ba4f502b 2018-08-04 stsp goto done;
2384 2fc00ff4 2019-08-31 stsp if (worktree) {
2385 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2386 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2387 2fc00ff4 2019-08-31 stsp worktree = NULL;
2389 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2391 ecb28ae0 2018-07-16 stsp free(repo_path);
2392 ecb28ae0 2018-07-16 stsp free(cwd);
2393 ecb28ae0 2018-07-16 stsp free(path);
2394 899d86c2 2018-05-10 stsp free(start_id);
2395 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2397 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2398 ec142235 2019-03-07 stsp if (worktree)
2399 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2400 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2401 80ddbec8 2018-04-29 stsp return error;
2404 4ed7e80c 2018-05-20 stsp __dead static void
2405 9f7d7167 2018-04-29 stsp usage_diff(void)
2408 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
2409 9f7d7167 2018-04-29 stsp getprogname());
2413 b304db33 2018-05-20 stsp static char *
2414 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2416 b304db33 2018-05-20 stsp char *line;
2417 b304db33 2018-05-20 stsp size_t linelen;
2418 b304db33 2018-05-20 stsp size_t lineno;
2419 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2421 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2423 b304db33 2018-05-20 stsp *len = linelen;
2424 b304db33 2018-05-20 stsp return line;
2427 4ed7e80c 2018-05-20 stsp static const struct got_error *
2428 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
2429 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
2430 c3e9aa98 2019-05-13 jcs char *header)
2432 61e69b96 2018-05-20 stsp const struct got_error *err;
2433 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
2434 b304db33 2018-05-20 stsp char *line;
2435 b304db33 2018-05-20 stsp size_t len;
2436 61e69b96 2018-05-20 stsp wchar_t *wline;
2437 e0b650dd 2018-05-20 stsp int width;
2439 26ed57b2 2018-05-19 stsp rewind(f);
2440 f7d12f7e 2018-08-01 stsp werase(view->window);
2442 a3404814 2018-09-02 stsp if (header) {
2443 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
2444 a3404814 2018-09-02 stsp if (err) {
2445 a3404814 2018-09-02 stsp return err;
2448 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2449 a3404814 2018-09-02 stsp wstandout(view->window);
2450 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2451 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2452 a3404814 2018-09-02 stsp wstandend(view->window);
2453 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2454 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2456 a3404814 2018-09-02 stsp if (max_lines <= 1)
2457 a3404814 2018-09-02 stsp return NULL;
2458 a3404814 2018-09-02 stsp max_lines--;
2462 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2463 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2464 26ed57b2 2018-05-19 stsp if (line == NULL) {
2468 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
2469 26ed57b2 2018-05-19 stsp free(line);
2473 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2474 61e69b96 2018-05-20 stsp if (err) {
2475 61e69b96 2018-05-20 stsp free(line);
2476 61e69b96 2018-05-20 stsp return err;
2478 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2479 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2480 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2481 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2482 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
2483 26ed57b2 2018-05-19 stsp free(line);
2484 2550e4c3 2018-07-13 stsp free(wline);
2485 2550e4c3 2018-07-13 stsp wline = NULL;
2487 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
2489 1a57306a 2018-09-02 stsp view_vborder(view);
2491 c3e9aa98 2019-05-13 jcs if (*eof) {
2492 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2493 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2494 c3e9aa98 2019-05-13 jcs nprinted++;
2497 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2499 c3e9aa98 2019-05-13 jcs return err;
2502 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2503 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2504 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2507 26ed57b2 2018-05-19 stsp return NULL;
2510 abd2672a 2018-12-23 stsp static char *
2511 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2513 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2514 09867e48 2019-08-13 stsp char *p, *s;
2516 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2517 09867e48 2019-08-13 stsp if (tm == NULL)
2518 09867e48 2019-08-13 stsp return NULL;
2519 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2520 09867e48 2019-08-13 stsp if (s == NULL)
2521 09867e48 2019-08-13 stsp return NULL;
2522 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2524 abd2672a 2018-12-23 stsp *p = '\0';
2528 4ed7e80c 2018-05-20 stsp static const struct got_error *
2529 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2530 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2532 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2533 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
2534 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2535 5943eee2 2019-08-13 stsp char *id_str = NULL, *logmsg = NULL;
2536 45d799e2 2018-12-23 stsp time_t committer_time;
2537 45d799e2 2018-12-23 stsp const char *author, *committer;
2538 8b473291 2019-02-21 stsp char *refs_str = NULL;
2540 8b473291 2019-02-21 stsp if (refs) {
2541 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
2543 8b473291 2019-02-21 stsp return err;
2546 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2548 abd2672a 2018-12-23 stsp return err;
2550 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2551 15a94983 2018-12-23 stsp if (err) {
2552 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2553 15a94983 2018-12-23 stsp goto done;
2556 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2557 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2558 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2559 abd2672a 2018-12-23 stsp goto done;
2561 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2562 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2563 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2564 abd2672a 2018-12-23 stsp goto done;
2566 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2567 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
2568 09867e48 2019-08-13 stsp if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2569 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2570 abd2672a 2018-12-23 stsp goto done;
2572 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2573 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2574 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2575 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2576 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2577 abd2672a 2018-12-23 stsp goto done;
2579 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
2581 5943eee2 2019-08-13 stsp goto done;
2582 5943eee2 2019-08-13 stsp if (fprintf(outfile, "%s\n", logmsg) < 0) {
2583 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2584 abd2672a 2018-12-23 stsp goto done;
2587 abd2672a 2018-12-23 stsp free(id_str);
2588 5943eee2 2019-08-13 stsp free(logmsg);
2589 8b473291 2019-02-21 stsp free(refs_str);
2590 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2591 abd2672a 2018-12-23 stsp return err;
2594 abd2672a 2018-12-23 stsp static const struct got_error *
2595 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
2597 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
2598 48ae06ee 2018-10-18 stsp FILE *f = NULL;
2599 15a94983 2018-12-23 stsp int obj_type;
2601 511a516b 2018-05-19 stsp f = got_opentemp();
2602 48ae06ee 2018-10-18 stsp if (f == NULL) {
2603 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
2604 48ae06ee 2018-10-18 stsp goto done;
2606 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
2607 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2608 fb43ecf1 2019-02-11 stsp goto done;
2612 15a94983 2018-12-23 stsp if (s->id1)
2613 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
2615 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
2617 15a94983 2018-12-23 stsp goto done;
2619 15a94983 2018-12-23 stsp switch (obj_type) {
2620 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
2621 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2622 63035f9f 2019-10-06 stsp s->diff_context, 0, s->repo, f);
2624 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
2625 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2626 63035f9f 2019-10-06 stsp s->diff_context, 0, s->repo, f);
2628 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
2629 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
2630 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
2631 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
2633 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2636 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
2637 15a087fe 2019-02-21 stsp if (s->id1 == NULL)
2638 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs, s->repo, f);
2640 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
2641 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2642 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
2643 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs,
2644 8b473291 2019-02-21 stsp s->repo, f);
2649 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
2651 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
2652 63035f9f 2019-10-06 stsp s->diff_context, 0, s->repo, f);
2656 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2660 cbe7f848 2019-02-11 stsp if (f && fflush(f) != 0 && err == NULL)
2661 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
2662 48ae06ee 2018-10-18 stsp return err;
2665 f5215bb9 2019-02-22 stsp static void
2666 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
2668 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
2669 f5215bb9 2019-02-22 stsp update_panels();
2670 f5215bb9 2019-02-22 stsp doupdate();
2673 48ae06ee 2018-10-18 stsp static const struct got_error *
2674 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
2675 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
2676 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
2678 48ae06ee 2018-10-18 stsp const struct got_error *err;
2680 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
2681 15a94983 2018-12-23 stsp int type1, type2;
2682 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
2684 15a94983 2018-12-23 stsp return err;
2685 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
2687 15a94983 2018-12-23 stsp return err;
2689 15a94983 2018-12-23 stsp if (type1 != type2)
2690 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
2693 15a94983 2018-12-23 stsp if (id1) {
2694 15a94983 2018-12-23 stsp view->state.diff.id1 = got_object_id_dup(id1);
2695 15a94983 2018-12-23 stsp if (view->state.diff.id1 == NULL)
2696 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2698 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2700 15a94983 2018-12-23 stsp view->state.diff.id2 = got_object_id_dup(id2);
2701 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
2702 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2703 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2704 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2706 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
2707 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
2708 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
2709 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
2710 fb872ab2 2019-02-21 stsp view->state.diff.log_view = log_view;
2711 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
2712 8b473291 2019-02-21 stsp view->state.diff.refs = refs;
2714 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
2715 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
2716 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
2718 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
2719 48ae06ee 2018-10-18 stsp if (err) {
2720 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2721 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2722 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2723 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2724 48ae06ee 2018-10-18 stsp return err;
2727 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
2728 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
2729 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
2731 5dc9f4bc 2018-08-04 stsp return NULL;
2734 e5a0f69f 2018-08-18 stsp static const struct got_error *
2735 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
2737 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2739 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2740 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2741 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2742 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2743 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2744 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2745 e5a0f69f 2018-08-18 stsp return err;
2748 5dc9f4bc 2018-08-04 stsp static const struct got_error *
2749 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
2751 a3404814 2018-09-02 stsp const struct got_error *err;
2752 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
2753 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
2755 a3404814 2018-09-02 stsp if (s->id1) {
2756 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
2758 a3404814 2018-09-02 stsp return err;
2760 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
2762 a3404814 2018-09-02 stsp return err;
2764 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
2765 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2766 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2767 a3404814 2018-09-02 stsp free(id_str1);
2768 a3404814 2018-09-02 stsp free(id_str2);
2769 a3404814 2018-09-02 stsp return err;
2771 a3404814 2018-09-02 stsp free(id_str1);
2772 a3404814 2018-09-02 stsp free(id_str2);
2774 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
2775 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
2779 15a087fe 2019-02-21 stsp static const struct got_error *
2780 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
2781 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
2783 d7a04538 2019-02-21 stsp const struct got_error *err;
2784 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
2785 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
2786 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
2788 15a087fe 2019-02-21 stsp free(s->id2);
2789 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
2790 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
2791 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2793 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2795 d7a04538 2019-02-21 stsp return err;
2796 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
2797 15a087fe 2019-02-21 stsp free(s->id1);
2798 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
2799 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2800 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
2801 15a087fe 2019-02-21 stsp return NULL;
2804 0cf4efb1 2018-09-29 stsp static const struct got_error *
2805 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2806 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2808 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
2809 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
2810 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
2811 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
2814 e5a0f69f 2018-08-18 stsp switch (ch) {
2816 1e37a5c2 2019-05-12 jcs case KEY_UP:
2817 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
2818 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2820 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2821 a60a9dc4 2019-05-13 jcs case CTRL('b'):
2822 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
2825 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
2826 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
2827 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2830 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2831 1e37a5c2 2019-05-12 jcs if (!s->eof)
2832 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2834 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
2835 a60a9dc4 2019-05-13 jcs case CTRL('f'):
2837 00ba99a7 2019-05-12 jcs if (s->eof)
2840 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
2841 1e37a5c2 2019-05-12 jcs char *line;
2842 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
2843 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2844 1e37a5c2 2019-05-12 jcs if (line == NULL)
2849 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
2850 1e37a5c2 2019-05-12 jcs s->diff_context--;
2851 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2852 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2856 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2857 1e37a5c2 2019-05-12 jcs s->diff_context++;
2858 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2859 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2864 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2866 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2867 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
2868 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
2869 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2872 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2877 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2881 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2882 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2884 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2885 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2889 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2891 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2893 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2894 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
2896 1e37a5c2 2019-05-12 jcs /* Display "loading..." in log view. */
2897 1e37a5c2 2019-05-12 jcs show_log_view(s->log_view);
2898 1e37a5c2 2019-05-12 jcs update_panels();
2899 1e37a5c2 2019-05-12 jcs doupdate();
2901 1e37a5c2 2019-05-12 jcs err = trigger_log_thread(1 /* load_all */,
2902 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
2903 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
2904 1e37a5c2 2019-05-12 jcs &ls->thread_args.need_commits);
2908 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2913 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
2914 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2917 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2921 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2922 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2924 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2925 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2931 bcbd79e2 2018-08-19 stsp return err;
2934 4ed7e80c 2018-05-20 stsp static const struct got_error *
2935 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2937 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2938 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2939 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2940 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2941 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2942 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
2944 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2946 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2948 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2949 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2950 eb6600df 2019-01-04 stsp NULL) == -1)
2951 26ed57b2 2018-05-19 stsp err(1, "pledge");
2954 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2955 26ed57b2 2018-05-19 stsp switch (ch) {
2957 17020d27 2019-03-07 stsp usage_diff();
2958 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2962 26ed57b2 2018-05-19 stsp argc -= optind;
2963 26ed57b2 2018-05-19 stsp argv += optind;
2965 26ed57b2 2018-05-19 stsp if (argc == 0) {
2966 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2967 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2968 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2969 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2970 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2971 15a94983 2018-12-23 stsp id_str1 = argv[0];
2972 15a94983 2018-12-23 stsp id_str2 = argv[1];
2973 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2974 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2975 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2976 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2977 15a94983 2018-12-23 stsp id_str1 = argv[1];
2978 15a94983 2018-12-23 stsp id_str2 = argv[2];
2980 26ed57b2 2018-05-19 stsp usage_diff();
2982 a915003a 2019-02-05 stsp init_curses();
2984 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2985 eb6600df 2019-01-04 stsp if (error)
2986 eb6600df 2019-01-04 stsp goto done;
2988 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
2989 26ed57b2 2018-05-19 stsp if (error)
2990 26ed57b2 2018-05-19 stsp goto done;
2992 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
2993 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
2994 26ed57b2 2018-05-19 stsp if (error)
2995 26ed57b2 2018-05-19 stsp goto done;
2997 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
2998 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
2999 26ed57b2 2018-05-19 stsp if (error)
3000 26ed57b2 2018-05-19 stsp goto done;
3002 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3003 8b473291 2019-02-21 stsp if (error)
3004 8b473291 2019-02-21 stsp goto done;
3006 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3007 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3008 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3009 ea5e7bb5 2018-08-01 stsp goto done;
3011 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3012 5dc9f4bc 2018-08-04 stsp if (error)
3013 5dc9f4bc 2018-08-04 stsp goto done;
3014 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3016 c02c541e 2019-03-29 stsp free(repo_path);
3018 921be706 2019-06-28 stsp got_repo_close(repo);
3019 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3020 26ed57b2 2018-05-19 stsp return error;
3023 4ed7e80c 2018-05-20 stsp __dead static void
3024 9f7d7167 2018-04-29 stsp usage_blame(void)
3027 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3028 9f7d7167 2018-04-29 stsp getprogname());
3032 84451b3e 2018-07-10 stsp struct tog_blame_line {
3033 84451b3e 2018-07-10 stsp int annotated;
3034 84451b3e 2018-07-10 stsp struct got_object_id *id;
3037 4ed7e80c 2018-05-20 stsp static const struct got_error *
3038 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3039 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
3040 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
3041 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
3043 84451b3e 2018-07-10 stsp const struct got_error *err;
3044 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3045 84451b3e 2018-07-10 stsp char *line;
3046 84451b3e 2018-07-10 stsp size_t len;
3047 84451b3e 2018-07-10 stsp wchar_t *wline;
3048 27a741e5 2019-09-11 stsp int width;
3049 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3050 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3051 ab089a2a 2018-07-12 stsp char *id_str;
3053 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
3055 ab089a2a 2018-07-12 stsp return err;
3057 84451b3e 2018-07-10 stsp rewind(f);
3058 f7d12f7e 2018-08-01 stsp werase(view->window);
3060 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3061 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3062 ab089a2a 2018-07-12 stsp free(id_str);
3063 ab089a2a 2018-07-12 stsp return err;
3066 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3067 ab089a2a 2018-07-12 stsp free(line);
3068 2550e4c3 2018-07-13 stsp line = NULL;
3070 1cae65b4 2019-09-22 stsp return err;
3071 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3072 a3404814 2018-09-02 stsp wstandout(view->window);
3073 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3074 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3075 a3404814 2018-09-02 stsp wstandend(view->window);
3076 2550e4c3 2018-07-13 stsp free(wline);
3077 2550e4c3 2018-07-13 stsp wline = NULL;
3078 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3079 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3081 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3082 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
3083 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
3084 ab089a2a 2018-07-12 stsp free(id_str);
3085 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3087 ab089a2a 2018-07-12 stsp free(id_str);
3088 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3089 3f60a8ef 2018-07-10 stsp free(line);
3090 2550e4c3 2018-07-13 stsp line = NULL;
3092 3f60a8ef 2018-07-10 stsp return err;
3093 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3094 2550e4c3 2018-07-13 stsp free(wline);
3095 2550e4c3 2018-07-13 stsp wline = NULL;
3096 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3097 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3100 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
3101 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
3102 84451b3e 2018-07-10 stsp if (line == NULL) {
3106 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
3107 84451b3e 2018-07-10 stsp free(line);
3111 27a741e5 2019-09-11 stsp if (view->ncols <= 9) {
3112 27a741e5 2019-09-11 stsp width = 9;
3113 27a741e5 2019-09-11 stsp wline = wcsdup(L"");
3114 27a741e5 2019-09-11 stsp if (wline == NULL)
3115 27a741e5 2019-09-11 stsp err = got_error_from_errno("wcsdup");
3117 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line,
3118 27a741e5 2019-09-11 stsp view->ncols - 9, 9);
3119 27a741e5 2019-09-11 stsp width += 9;
3121 84451b3e 2018-07-10 stsp if (err) {
3122 84451b3e 2018-07-10 stsp free(line);
3123 84451b3e 2018-07-10 stsp return err;
3126 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3127 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3129 8d0fe45a 2019-08-12 stsp if (nlines > 0) {
3130 8d0fe45a 2019-08-12 stsp blame_line = &lines[lineno - 1];
3131 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3132 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3133 27a741e5 2019-09-11 stsp !(view->focussed &&
3134 27a741e5 2019-09-11 stsp nprinted == selected_line - 1)) {
3135 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3136 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3137 8d0fe45a 2019-08-12 stsp char *id_str;
3138 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3139 8d0fe45a 2019-08-12 stsp if (err) {
3140 8d0fe45a 2019-08-12 stsp free(line);
3141 8d0fe45a 2019-08-12 stsp free(wline);
3142 8d0fe45a 2019-08-12 stsp return err;
3144 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3145 8d0fe45a 2019-08-12 stsp free(id_str);
3146 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3148 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3149 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3152 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3153 ee41ec32 2018-07-10 stsp prev_id = NULL;
3156 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3157 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3158 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3160 27a741e5 2019-09-11 stsp waddwstr(view->window, wline);
3161 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
3162 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
3163 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3164 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3165 84451b3e 2018-07-10 stsp free(line);
3166 2550e4c3 2018-07-13 stsp free(wline);
3167 2550e4c3 2018-07-13 stsp wline = NULL;
3169 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3171 1a57306a 2018-09-02 stsp view_vborder(view);
3173 84451b3e 2018-07-10 stsp return NULL;
3176 84451b3e 2018-07-10 stsp static const struct got_error *
3177 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3179 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3180 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3181 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3182 1a76625f 2018-10-22 stsp int errcode;
3184 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3185 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3186 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3188 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3189 1a76625f 2018-10-22 stsp if (errcode)
3190 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3192 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3193 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3194 d68a0a7d 2018-07-10 stsp goto done;
3197 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3198 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3200 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3201 d68a0a7d 2018-07-10 stsp if (line->annotated)
3202 d68a0a7d 2018-07-10 stsp goto done;
3204 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3205 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3206 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3207 84451b3e 2018-07-10 stsp goto done;
3209 84451b3e 2018-07-10 stsp line->annotated = 1;
3211 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3212 1a76625f 2018-10-22 stsp if (errcode)
3213 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3214 84451b3e 2018-07-10 stsp return err;
3217 84451b3e 2018-07-10 stsp static void *
3218 84451b3e 2018-07-10 stsp blame_thread(void *arg)
3220 18430de3 2018-07-10 stsp const struct got_error *err;
3221 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
3222 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
3223 1a76625f 2018-10-22 stsp int errcode;
3225 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
3226 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3227 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
3228 fc06ba56 2019-08-22 stsp err = NULL;
3230 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3231 1a76625f 2018-10-22 stsp if (errcode)
3232 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
3233 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3235 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
3236 c9beca56 2018-07-22 stsp ta->repo = NULL;
3237 c9beca56 2018-07-22 stsp *ta->complete = 1;
3239 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3240 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
3241 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3243 18430de3 2018-07-10 stsp return (void *)err;
3246 245d91c1 2018-07-12 stsp static struct got_object_id *
3247 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3248 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
3250 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
3252 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
3253 8d0fe45a 2019-08-12 stsp return NULL;
3255 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
3256 245d91c1 2018-07-12 stsp if (!line->annotated)
3257 245d91c1 2018-07-12 stsp return NULL;
3259 245d91c1 2018-07-12 stsp return line->id;
3262 b880a918 2018-07-10 stsp static const struct got_error *
3263 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
3265 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
3268 245d91c1 2018-07-12 stsp if (blame->thread) {
3269 1a76625f 2018-10-22 stsp int errcode;
3270 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3271 1a76625f 2018-10-22 stsp if (errcode)
3272 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3273 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
3274 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
3275 1a76625f 2018-10-22 stsp if (errcode)
3276 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
3277 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3278 1a76625f 2018-10-22 stsp if (errcode)
3279 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3280 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3281 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
3282 245d91c1 2018-07-12 stsp err = NULL;
3283 245d91c1 2018-07-12 stsp blame->thread = NULL;
3285 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
3286 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
3287 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
3289 245d91c1 2018-07-12 stsp if (blame->f) {
3290 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
3291 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3292 245d91c1 2018-07-12 stsp blame->f = NULL;
3294 57670559 2018-12-23 stsp if (blame->lines) {
3295 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
3296 57670559 2018-12-23 stsp free(blame->lines[i].id);
3297 57670559 2018-12-23 stsp free(blame->lines);
3298 57670559 2018-12-23 stsp blame->lines = NULL;
3300 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
3301 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
3303 245d91c1 2018-07-12 stsp return err;
3306 245d91c1 2018-07-12 stsp static const struct got_error *
3307 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
3309 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
3310 fc06ba56 2019-08-22 stsp int *done = arg;
3311 fc06ba56 2019-08-22 stsp int errcode;
3313 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3314 fc06ba56 2019-08-22 stsp if (errcode)
3315 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3316 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
3318 fc06ba56 2019-08-22 stsp if (*done)
3319 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
3321 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3322 fc06ba56 2019-08-22 stsp if (errcode)
3323 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3324 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
3326 fc06ba56 2019-08-22 stsp return err;
3329 fc06ba56 2019-08-22 stsp static const struct got_error *
3330 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3331 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
3332 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
3333 245d91c1 2018-07-12 stsp struct got_repository *repo)
3335 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
3336 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
3337 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
3338 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
3339 15a94983 2018-12-23 stsp int obj_type;
3341 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3343 15a94983 2018-12-23 stsp return err;
3344 15a94983 2018-12-23 stsp if (obj_id == NULL)
3345 15a94983 2018-12-23 stsp return got_error(GOT_ERR_NO_OBJ);
3347 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
3349 84451b3e 2018-07-10 stsp goto done;
3351 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
3352 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3353 84451b3e 2018-07-10 stsp goto done;
3356 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3358 a70480e0 2018-06-23 stsp goto done;
3359 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
3360 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
3361 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3362 84451b3e 2018-07-10 stsp goto done;
3364 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3365 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
3366 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
3367 84451b3e 2018-07-10 stsp goto done;
3369 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
3370 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
3371 b02560ec 2019-08-19 stsp blame->nlines--;
3373 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
3374 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
3375 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3376 84451b3e 2018-07-10 stsp goto done;
3379 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
3381 bd24772e 2018-07-11 stsp goto done;
3383 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
3384 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
3385 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
3386 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
3387 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
3388 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3389 245d91c1 2018-07-12 stsp goto done;
3391 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
3393 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
3394 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
3395 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
3396 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
3397 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
3398 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_arg = done;
3399 245d91c1 2018-07-12 stsp *blame_complete = 0;
3403 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
3404 27d434c2 2018-09-15 stsp free(obj_id);
3406 245d91c1 2018-07-12 stsp stop_blame(blame);
3407 245d91c1 2018-07-12 stsp return err;
3410 245d91c1 2018-07-12 stsp static const struct got_error *
3411 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
3412 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3413 8b473291 2019-02-21 stsp struct got_repository *repo)
3415 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
3416 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3418 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
3420 c4843652 2019-08-12 stsp s->path = strdup(path);
3421 c4843652 2019-08-12 stsp if (s->path == NULL)
3422 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
3424 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
3425 c4843652 2019-08-12 stsp if (err) {
3426 c4843652 2019-08-12 stsp free(s->path);
3427 7cbe629d 2018-08-04 stsp return err;
3430 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
3431 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
3432 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
3433 fb2756b9 2018-08-04 stsp s->selected_line = 1;
3434 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
3435 fb2756b9 2018-08-04 stsp s->repo = repo;
3436 8b473291 2019-02-21 stsp s->refs = refs;
3437 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
3438 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
3440 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
3441 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
3442 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
3443 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
3444 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
3446 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
3447 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
3448 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
3449 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
3452 e5a0f69f 2018-08-18 stsp static const struct got_error *
3453 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
3455 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3456 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3458 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
3459 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
3461 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
3462 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
3463 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
3464 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3465 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
3468 e5a0f69f 2018-08-18 stsp free(s->path);
3470 e5a0f69f 2018-08-18 stsp return err;
3473 7cbe629d 2018-08-04 stsp static const struct got_error *
3474 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
3476 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
3478 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
3479 6c4c42e0 2019-06-24 stsp return NULL;
3482 6c4c42e0 2019-06-24 stsp static int
3483 6c4c42e0 2019-06-24 stsp match_line(const char *line, regex_t *regex)
3485 6c4c42e0 2019-06-24 stsp regmatch_t regmatch;
3487 6c4c42e0 2019-06-24 stsp return regexec(regex, line, 1, ®match, 0) == 0;
3491 6c4c42e0 2019-06-24 stsp static const struct got_error *
3492 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
3494 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
3495 6c4c42e0 2019-06-24 stsp int lineno;
3497 6c4c42e0 2019-06-24 stsp if (!view->searching) {
3498 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3499 6c4c42e0 2019-06-24 stsp return NULL;
3502 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
3503 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3504 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
3506 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
3508 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3509 6c4c42e0 2019-06-24 stsp lineno = 1;
3511 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
3514 6c4c42e0 2019-06-24 stsp while (1) {
3515 6c4c42e0 2019-06-24 stsp char *line = NULL;
3516 6c4c42e0 2019-06-24 stsp off_t offset;
3517 6c4c42e0 2019-06-24 stsp size_t len;
3519 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
3520 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
3521 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3522 6c4c42e0 2019-06-24 stsp free(line);
3526 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3527 6c4c42e0 2019-06-24 stsp lineno = 1;
3529 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
3532 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
3533 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
3534 6c4c42e0 2019-06-24 stsp free(line);
3535 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
3537 6c4c42e0 2019-06-24 stsp free(line);
3538 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
3539 2246482e 2019-06-25 stsp if (line && match_line(line, &view->regex)) {
3540 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3541 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
3542 6c4c42e0 2019-06-24 stsp free(line);
3545 6c4c42e0 2019-06-24 stsp free(line);
3546 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3552 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
3553 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
3554 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
3557 6c4c42e0 2019-06-24 stsp return NULL;
3560 6c4c42e0 2019-06-24 stsp static const struct got_error *
3561 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
3563 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3564 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
3565 2b380cc8 2018-10-24 stsp int errcode;
3567 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
3568 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
3569 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
3570 2b380cc8 2018-10-24 stsp if (errcode)
3571 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
3573 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
3576 51fe7530 2019-08-19 stsp if (s->blame_complete)
3577 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
3579 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
3580 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
3581 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
3582 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
3584 669b5ffa 2018-10-07 stsp view_vborder(view);
3585 e5a0f69f 2018-08-18 stsp return err;
3588 e5a0f69f 2018-08-18 stsp static const struct got_error *
3589 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
3590 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3592 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
3593 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
3594 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3595 669b5ffa 2018-10-07 stsp int begin_x = 0;
3597 e5a0f69f 2018-08-18 stsp switch (ch) {
3599 1e37a5c2 2019-05-12 jcs s->done = 1;
3602 1e37a5c2 2019-05-12 jcs case KEY_UP:
3603 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
3604 1e37a5c2 2019-05-12 jcs s->selected_line--;
3605 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
3606 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3607 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3609 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3610 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
3611 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
3614 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
3615 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
3616 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
3618 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3621 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3622 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
3623 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
3624 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
3625 1e37a5c2 2019-05-12 jcs s->selected_line++;
3626 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
3627 1e37a5c2 2019-05-12 jcs s->blame.nlines)
3628 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3631 1e37a5c2 2019-05-12 jcs case 'p': {
3632 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3633 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
3634 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3635 1e37a5c2 2019-05-12 jcs if (id == NULL)
3637 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
3638 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
3639 15a94983 2018-12-23 stsp struct got_object_qid *pid;
3640 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
3641 1e37a5c2 2019-05-12 jcs int obj_type;
3642 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
3643 1e37a5c2 2019-05-12 jcs s->repo, id);
3646 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
3647 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
3648 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
3649 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3652 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
3653 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
3654 1e37a5c2 2019-05-12 jcs pid->id, s->path);
3655 e5a0f69f 2018-08-18 stsp if (err) {
3656 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
3657 1e37a5c2 2019-05-12 jcs err = NULL;
3658 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3661 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
3663 1e37a5c2 2019-05-12 jcs free(blob_id);
3664 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
3665 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
3666 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3669 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3671 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3673 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
3674 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
3676 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3681 1e37a5c2 2019-05-12 jcs s->done = 1;
3682 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3683 1e37a5c2 2019-05-12 jcs s->done = 0;
3684 1e37a5c2 2019-05-12 jcs if (thread_err)
3686 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3687 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
3688 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3689 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3690 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
3691 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
3696 1e37a5c2 2019-05-12 jcs case 'B': {
3697 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
3698 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
3699 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
3701 1e37a5c2 2019-05-12 jcs s->done = 1;
3702 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3703 1e37a5c2 2019-05-12 jcs s->done = 0;
3704 1e37a5c2 2019-05-12 jcs if (thread_err)
3706 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3707 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
3708 1e37a5c2 2019-05-12 jcs s->blamed_commit =
3709 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
3710 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3711 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3712 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
3713 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
3718 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
3719 1e37a5c2 2019-05-12 jcs case '\r': {
3720 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3721 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
3722 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
3723 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
3724 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3725 1e37a5c2 2019-05-12 jcs if (id == NULL)
3727 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
3730 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
3731 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
3732 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
3733 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
3734 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3735 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
3736 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3737 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
3740 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
3741 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
3742 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3744 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3747 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
3748 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
3751 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
3753 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3756 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
3757 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
3759 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
3764 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3766 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3767 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
3768 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
3771 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3772 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
3773 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3774 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3777 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
3778 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
3779 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
3780 1e37a5c2 2019-05-12 jcs view->nlines - 2;
3782 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
3783 1e37a5c2 2019-05-12 jcs s->blame.nlines -
3784 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
3786 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
3787 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
3788 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3789 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3795 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
3798 a70480e0 2018-06-23 stsp static const struct got_error *
3799 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
3801 a70480e0 2018-06-23 stsp const struct got_error *error;
3802 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
3803 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3804 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
3805 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3806 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3807 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
3809 e1cd8fed 2018-08-01 stsp struct tog_view *view;
3811 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3813 a70480e0 2018-06-23 stsp #ifndef PROFILE
3814 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3815 8e94dd5b 2019-01-04 stsp NULL) == -1)
3816 a70480e0 2018-06-23 stsp err(1, "pledge");
3819 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3820 a70480e0 2018-06-23 stsp switch (ch) {
3822 a70480e0 2018-06-23 stsp commit_id_str = optarg;
3825 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
3826 69069811 2018-08-02 stsp if (repo_path == NULL)
3827 69069811 2018-08-02 stsp err(1, "-r option");
3830 17020d27 2019-03-07 stsp usage_blame();
3831 a70480e0 2018-06-23 stsp /* NOTREACHED */
3835 a70480e0 2018-06-23 stsp argc -= optind;
3836 a70480e0 2018-06-23 stsp argv += optind;
3838 69069811 2018-08-02 stsp if (argc == 1)
3839 69069811 2018-08-02 stsp path = argv[0];
3841 a70480e0 2018-06-23 stsp usage_blame();
3843 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
3844 69069811 2018-08-02 stsp if (cwd == NULL) {
3845 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3846 69069811 2018-08-02 stsp goto done;
3848 69069811 2018-08-02 stsp if (repo_path == NULL) {
3849 eb41ed75 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3850 eb41ed75 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3851 69069811 2018-08-02 stsp goto done;
3853 eb41ed75 2019-02-05 stsp error = NULL;
3854 eb41ed75 2019-02-05 stsp if (worktree) {
3855 eb41ed75 2019-02-05 stsp repo_path =
3856 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3857 eb41ed75 2019-02-05 stsp if (repo_path == NULL)
3858 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3859 eb41ed75 2019-02-05 stsp if (error)
3860 eb41ed75 2019-02-05 stsp goto done;
3862 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
3863 eb41ed75 2019-02-05 stsp if (repo_path == NULL) {
3864 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3865 eb41ed75 2019-02-05 stsp goto done;
3870 a915003a 2019-02-05 stsp init_curses();
3872 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3873 c02c541e 2019-03-29 stsp if (error != NULL)
3874 8e94dd5b 2019-01-04 stsp goto done;
3876 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3877 c02c541e 2019-03-29 stsp if (error)
3878 92205607 2019-01-04 stsp goto done;
3880 eb41ed75 2019-02-05 stsp if (worktree) {
3881 eb41ed75 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3882 eb41ed75 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3883 eb41ed75 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3884 eb41ed75 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3885 eb41ed75 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3886 eb41ed75 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3887 eb41ed75 2019-02-05 stsp path) == -1) {
3888 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3889 eb41ed75 2019-02-05 stsp goto done;
3891 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3894 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3896 eb41ed75 2019-02-05 stsp if (error)
3897 69069811 2018-08-02 stsp goto done;
3899 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
3900 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
3901 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3902 a70480e0 2018-06-23 stsp if (error != NULL)
3903 66b4983c 2018-06-23 stsp goto done;
3904 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3905 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
3907 f2b6a97d 2019-07-15 stsp error = get_head_commit_id(&commit_id, commit_id_str, repo);
3908 f2b6a97d 2019-07-15 stsp if (error) {
3909 f2b6a97d 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
3910 f2b6a97d 2019-07-15 stsp goto done;
3911 f2b6a97d 2019-07-15 stsp error = got_repo_match_object_id_prefix(&commit_id,
3912 f2b6a97d 2019-07-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
3915 a19e88aa 2018-06-23 stsp if (error != NULL)
3916 8b473291 2019-02-21 stsp goto done;
3918 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3919 8b473291 2019-02-21 stsp if (error)
3920 a19e88aa 2018-06-23 stsp goto done;
3922 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3923 e1cd8fed 2018-08-01 stsp if (view == NULL) {
3924 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3925 e1cd8fed 2018-08-01 stsp goto done;
3927 8b473291 2019-02-21 stsp error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3928 7cbe629d 2018-08-04 stsp if (error)
3929 7cbe629d 2018-08-04 stsp goto done;
3930 12314ad4 2019-08-31 stsp if (worktree) {
3931 12314ad4 2019-08-31 stsp /* Release work tree lock. */
3932 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
3933 12314ad4 2019-08-31 stsp worktree = NULL;
3935 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3937 69069811 2018-08-02 stsp free(repo_path);
3938 69069811 2018-08-02 stsp free(cwd);
3939 a70480e0 2018-06-23 stsp free(commit_id);
3940 eb41ed75 2019-02-05 stsp if (worktree)
3941 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
3943 a70480e0 2018-06-23 stsp got_repo_close(repo);
3944 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3945 a70480e0 2018-06-23 stsp return error;
3948 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3949 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
3950 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
3951 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
3952 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
3953 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
3954 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
3956 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3957 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
3958 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
3959 ffd1d5e5 2018-06-23 stsp int width, n;
3961 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
3963 f7d12f7e 2018-08-01 stsp werase(view->window);
3965 ffd1d5e5 2018-06-23 stsp if (limit == 0)
3966 ffd1d5e5 2018-06-23 stsp return NULL;
3968 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, label, view->ncols, 0);
3970 ffd1d5e5 2018-06-23 stsp return err;
3971 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3972 a3404814 2018-09-02 stsp wstandout(view->window);
3973 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3974 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3975 a3404814 2018-09-02 stsp wstandend(view->window);
3976 2550e4c3 2018-07-13 stsp free(wline);
3977 2550e4c3 2018-07-13 stsp wline = NULL;
3978 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3979 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3980 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3981 ffd1d5e5 2018-06-23 stsp return NULL;
3982 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
3984 ce52c690 2018-06-23 stsp return err;
3985 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3986 2550e4c3 2018-07-13 stsp free(wline);
3987 2550e4c3 2018-07-13 stsp wline = NULL;
3988 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3989 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3990 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3991 ffd1d5e5 2018-06-23 stsp return NULL;
3992 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3993 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
3994 a1eca9bb 2018-06-23 stsp return NULL;
3996 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3997 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
3998 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
3999 0cf4efb1 2018-09-29 stsp if (view->focussed)
4000 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4001 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
4003 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4004 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
4005 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4006 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4007 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4008 ffd1d5e5 2018-06-23 stsp return NULL;
4012 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
4013 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
4016 ffd1d5e5 2018-06-23 stsp while (te) {
4017 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
4018 848d6979 2019-08-12 stsp const char *modestr = "";
4020 1d13200f 2018-07-12 stsp if (show_ids) {
4021 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
4023 638f9024 2019-05-13 stsp return got_error_from_errno(
4024 230a42bd 2019-05-11 jcs "got_object_id_str");
4026 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4027 63c5ca5d 2019-08-24 stsp modestr = "$";
4028 63c5ca5d 2019-08-24 stsp else if (S_ISLNK(te->mode))
4029 848d6979 2019-08-12 stsp modestr = "@";
4030 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
4031 848d6979 2019-08-12 stsp modestr = "/";
4032 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
4033 848d6979 2019-08-12 stsp modestr = "*";
4034 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
4035 848d6979 2019-08-12 stsp te->name, modestr) == -1) {
4036 1d13200f 2018-07-12 stsp free(id_str);
4037 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4039 1d13200f 2018-07-12 stsp free(id_str);
4040 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4041 ffd1d5e5 2018-06-23 stsp if (err) {
4042 ffd1d5e5 2018-06-23 stsp free(line);
4045 ffd1d5e5 2018-06-23 stsp if (n == selected) {
4046 0cf4efb1 2018-09-29 stsp if (view->focussed)
4047 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4048 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
4050 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4051 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4052 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4053 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
4054 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4055 ffd1d5e5 2018-06-23 stsp free(line);
4056 2550e4c3 2018-07-13 stsp free(wline);
4057 2550e4c3 2018-07-13 stsp wline = NULL;
4059 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4060 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
4061 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4063 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
4066 ffd1d5e5 2018-06-23 stsp return err;
4069 ffd1d5e5 2018-06-23 stsp static void
4070 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
4071 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
4072 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
4074 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
4077 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
4080 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
4081 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
4082 ffd1d5e5 2018-06-23 stsp if (!isroot)
4083 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4087 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
4088 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
4089 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
4090 ffd1d5e5 2018-06-23 stsp prev = te;
4091 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
4093 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
4094 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
4096 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
4097 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4100 768394f3 2019-01-24 stsp static int
4101 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4102 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
4103 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
4105 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4106 ffd1d5e5 2018-06-23 stsp int n = 0;
4108 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
4109 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
4111 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
4112 768394f3 2019-01-24 stsp last = last_displayed_entry;
4113 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4114 768394f3 2019-01-24 stsp last = SIMPLEQ_NEXT(last, entry);
4115 768394f3 2019-01-24 stsp if (last) {
4116 768394f3 2019-01-24 stsp *first_displayed_entry = next;
4117 768394f3 2019-01-24 stsp next = SIMPLEQ_NEXT(next, entry);
4123 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4124 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4125 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4127 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4128 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4129 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4131 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4132 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
4134 ce52c690 2018-06-23 stsp len += strlen(te->name);
4136 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4137 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4138 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4140 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4141 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4142 d9765a41 2018-06-23 stsp while (pt) {
4143 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
4144 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4145 cb2ebc8a 2018-06-23 stsp goto done;
4147 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4148 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4149 cb2ebc8a 2018-06-23 stsp goto done;
4151 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4154 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
4155 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4156 ce52c690 2018-06-23 stsp goto done;
4160 ce52c690 2018-06-23 stsp if (err) {
4161 ce52c690 2018-06-23 stsp free(*path);
4162 ce52c690 2018-06-23 stsp *path = NULL;
4164 ce52c690 2018-06-23 stsp return err;
4167 ce52c690 2018-06-23 stsp static const struct got_error *
4168 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4169 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4170 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4171 8b473291 2019-02-21 stsp struct got_repository *repo)
4173 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
4174 ce52c690 2018-06-23 stsp char *path;
4175 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
4177 a0de39f3 2019-08-09 stsp *new_view = NULL;
4179 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
4181 ce52c690 2018-06-23 stsp return err;
4183 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4184 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
4185 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
4186 83ce39e3 2019-08-12 stsp goto done;
4189 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
4190 e5a0f69f 2018-08-18 stsp if (err) {
4191 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
4192 fc06ba56 2019-08-22 stsp err = NULL;
4193 e5a0f69f 2018-08-18 stsp view_close(blame_view);
4195 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
4197 83ce39e3 2019-08-12 stsp free(path);
4198 69efd4c4 2018-07-18 stsp return err;
4201 69efd4c4 2018-07-18 stsp static const struct got_error *
4202 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
4203 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4204 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4205 8b473291 2019-02-21 stsp struct got_repository *repo)
4207 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
4208 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
4209 69efd4c4 2018-07-18 stsp char *path;
4211 a0de39f3 2019-08-09 stsp *new_view = NULL;
4213 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4214 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
4215 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
4217 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
4219 69efd4c4 2018-07-18 stsp return err;
4221 d01904d4 2019-06-25 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4223 e5a0f69f 2018-08-18 stsp view_close(log_view);
4225 e5a0f69f 2018-08-18 stsp *new_view = log_view;
4226 cb2ebc8a 2018-06-23 stsp free(path);
4227 cb2ebc8a 2018-06-23 stsp return err;
4230 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4231 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
4232 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4233 8b473291 2019-02-21 stsp struct got_repository *repo)
4235 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4236 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
4237 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4239 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
4241 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
4242 ffd1d5e5 2018-06-23 stsp if (err != NULL)
4243 ffd1d5e5 2018-06-23 stsp goto done;
4245 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4246 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4247 ffd1d5e5 2018-06-23 stsp goto done;
4250 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
4251 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
4252 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
4253 8d0fe45a 2019-08-12 stsp s->selected_entry = SIMPLEQ_FIRST(&s->entries->head);
4254 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
4255 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
4256 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4257 6484ec90 2018-09-29 stsp goto done;
4259 8b473291 2019-02-21 stsp s->refs = refs;
4260 fb2756b9 2018-08-04 stsp s->repo = repo;
4262 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
4263 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
4264 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
4265 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
4266 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
4268 ad80ab7b 2018-08-04 stsp free(commit_id_str);
4269 6484ec90 2018-09-29 stsp if (err) {
4270 fb2756b9 2018-08-04 stsp free(s->tree_label);
4271 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4273 ad80ab7b 2018-08-04 stsp return err;
4276 e5a0f69f 2018-08-18 stsp static const struct got_error *
4277 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
4279 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4281 fb2756b9 2018-08-04 stsp free(s->tree_label);
4282 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4283 6484ec90 2018-09-29 stsp free(s->commit_id);
4284 6484ec90 2018-09-29 stsp s->commit_id = NULL;
4285 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
4286 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
4287 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
4288 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
4289 ad80ab7b 2018-08-04 stsp free(parent);
4292 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
4293 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
4294 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
4296 7c32bd05 2019-06-22 stsp return NULL;
4299 7c32bd05 2019-06-22 stsp static const struct got_error *
4300 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
4302 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4304 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
4305 7c32bd05 2019-06-22 stsp return NULL;
4308 7c32bd05 2019-06-22 stsp static int
4309 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4311 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
4313 7c32bd05 2019-06-22 stsp return regexec(regex, te->name, 1, ®match, 0) == 0;
4316 7c32bd05 2019-06-22 stsp static const struct got_error *
4317 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
4319 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4320 a0de39f3 2019-08-09 stsp struct got_tree_entry *entry = NULL, *te;
4322 7c32bd05 2019-06-22 stsp if (!view->searching) {
4323 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4324 7c32bd05 2019-06-22 stsp return NULL;
4327 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4328 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
4329 7c32bd05 2019-06-22 stsp if (s->selected_entry)
4330 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_NEXT(s->selected_entry, entry);
4332 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4335 7c32bd05 2019-06-22 stsp if (s->selected_entry == NULL) {
4336 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4337 7c32bd05 2019-06-22 stsp entry = te;
4339 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4340 7c32bd05 2019-06-22 stsp entry = te;
4341 7c32bd05 2019-06-22 stsp if (SIMPLEQ_NEXT(te, entry) ==
4342 7c32bd05 2019-06-22 stsp s->selected_entry)
4348 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4349 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4351 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4352 7c32bd05 2019-06-22 stsp entry = te;
4356 7c32bd05 2019-06-22 stsp while (1) {
4357 7c32bd05 2019-06-22 stsp if (entry == NULL) {
4358 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
4359 ac66afb8 2019-06-24 stsp view->search_next_done = 1;
4360 ac66afb8 2019-06-24 stsp return NULL;
4362 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4363 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4365 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4366 7c32bd05 2019-06-22 stsp entry = te;
4370 7c32bd05 2019-06-22 stsp if (match_tree_entry(entry, &view->regex)) {
4371 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4372 7c32bd05 2019-06-22 stsp s->matched_entry = entry;
4376 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4377 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_NEXT(entry, entry);
4379 7c32bd05 2019-06-22 stsp if (SIMPLEQ_FIRST(&s->entries->head) == entry)
4380 7c32bd05 2019-06-22 stsp entry = NULL;
4382 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4383 7c32bd05 2019-06-22 stsp if (SIMPLEQ_NEXT(te, entry) == entry) {
4384 7c32bd05 2019-06-22 stsp entry = te;
4392 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4393 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
4394 7c32bd05 2019-06-22 stsp s->selected = 0;
4397 e5a0f69f 2018-08-18 stsp return NULL;
4400 ad80ab7b 2018-08-04 stsp static const struct got_error *
4401 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
4403 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
4404 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4405 e5a0f69f 2018-08-18 stsp char *parent_path;
4407 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
4409 e5a0f69f 2018-08-18 stsp return err;
4411 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
4412 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
4413 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
4414 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
4415 e5a0f69f 2018-08-18 stsp free(parent_path);
4417 669b5ffa 2018-10-07 stsp view_vborder(view);
4418 e5a0f69f 2018-08-18 stsp return err;
4421 e5a0f69f 2018-08-18 stsp static const struct got_error *
4422 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
4423 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4425 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4426 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
4427 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
4428 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
4430 e5a0f69f 2018-08-18 stsp switch (ch) {
4432 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
4435 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
4437 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4438 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4439 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
4440 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
4441 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
4442 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4443 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4445 1e37a5c2 2019-05-12 jcs return err;
4446 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
4448 1e37a5c2 2019-05-12 jcs view_close(log_view);
4451 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
4452 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4454 1e37a5c2 2019-05-12 jcs *new_view = log_view;
4457 1e37a5c2 2019-05-12 jcs case KEY_UP:
4458 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
4459 1e37a5c2 2019-05-12 jcs s->selected--;
4460 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
4463 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
4465 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
4466 1e37a5c2 2019-05-12 jcs s->entries, s->tree == s->root);
4468 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4469 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
4470 1e37a5c2 2019-05-12 jcs MAX(0, view->nlines - 4 - s->selected), s->entries,
4471 1e37a5c2 2019-05-12 jcs s->tree == s->root);
4472 1e37a5c2 2019-05-12 jcs s->selected = 0;
4473 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_FIRST(&s->entries->head) ==
4474 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
4475 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
4478 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4479 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
4480 1e37a5c2 2019-05-12 jcs s->selected++;
4483 00ba99a7 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry) == NULL)
4484 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
4486 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
4487 1e37a5c2 2019-05-12 jcs s->last_displayed_entry, s->entries);
4489 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4490 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
4492 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
4493 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
4494 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
4497 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
4498 1e37a5c2 2019-05-12 jcs view->nlines, s->last_displayed_entry, s->entries);
4499 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
4500 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
4501 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
4502 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
4504 1e37a5c2 2019-05-12 jcs ndisplayed++;
4505 1e37a5c2 2019-05-12 jcs te = SIMPLEQ_NEXT(te, entry);
4506 1e37a5c2 2019-05-12 jcs } while (te);
4507 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
4510 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4512 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
4513 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
4514 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
4515 1e37a5c2 2019-05-12 jcs /* user selected '..' */
4516 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
4518 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
4519 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
4521 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
4522 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
4523 1e37a5c2 2019-05-12 jcs s->entries =
4524 1e37a5c2 2019-05-12 jcs got_object_tree_get_entries(s->tree);
4525 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
4526 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
4527 1e37a5c2 2019-05-12 jcs s->selected_entry =
4528 1e37a5c2 2019-05-12 jcs parent->selected_entry;
4529 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
4530 1e37a5c2 2019-05-12 jcs free(parent);
4531 1e37a5c2 2019-05-12 jcs } else if (S_ISDIR(s->selected_entry->mode)) {
4532 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
4533 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&subtree,
4534 1e37a5c2 2019-05-12 jcs s->repo, s->selected_entry->id);
4537 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
4538 941e9f74 2019-05-21 stsp if (err) {
4539 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
4542 1e37a5c2 2019-05-12 jcs } else if (S_ISREG(s->selected_entry->mode)) {
4543 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
4544 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
4545 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
4547 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
4548 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
4549 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
4552 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
4553 669b5ffa 2018-10-07 stsp err = view_close_child(view);
4555 669b5ffa 2018-10-07 stsp return err;
4556 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
4557 669b5ffa 2018-10-07 stsp if (err) {
4558 1e37a5c2 2019-05-12 jcs view_close(blame_view);
4561 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
4562 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
4564 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
4567 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4568 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
4569 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
4575 ffd1d5e5 2018-06-23 stsp return err;
4578 ffd1d5e5 2018-06-23 stsp __dead static void
4579 ffd1d5e5 2018-06-23 stsp usage_tree(void)
4582 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
4583 ffd1d5e5 2018-06-23 stsp getprogname());
4587 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4588 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
4590 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
4591 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
4592 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4593 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
4594 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4595 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
4596 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
4597 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
4599 5221c383 2018-08-01 stsp struct tog_view *view;
4601 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4603 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
4604 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4605 d188b9a6 2019-01-04 stsp NULL) == -1)
4606 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
4609 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
4610 ffd1d5e5 2018-06-23 stsp switch (ch) {
4612 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
4615 17020d27 2019-03-07 stsp usage_tree();
4616 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
4620 ffd1d5e5 2018-06-23 stsp argc -= optind;
4621 ffd1d5e5 2018-06-23 stsp argv += optind;
4623 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
4624 52185f70 2019-02-05 stsp struct got_worktree *worktree;
4625 52185f70 2019-02-05 stsp char *cwd = getcwd(NULL, 0);
4626 52185f70 2019-02-05 stsp if (cwd == NULL)
4627 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
4628 52185f70 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4629 52185f70 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4630 52185f70 2019-02-05 stsp goto done;
4631 52185f70 2019-02-05 stsp if (worktree) {
4632 52185f70 2019-02-05 stsp free(cwd);
4633 52185f70 2019-02-05 stsp repo_path =
4634 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4635 52185f70 2019-02-05 stsp got_worktree_close(worktree);
4637 52185f70 2019-02-05 stsp repo_path = cwd;
4638 52185f70 2019-02-05 stsp if (repo_path == NULL) {
4639 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4640 52185f70 2019-02-05 stsp goto done;
4642 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
4643 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
4644 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
4645 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
4647 ffd1d5e5 2018-06-23 stsp usage_log();
4649 a915003a 2019-02-05 stsp init_curses();
4651 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4652 c02c541e 2019-03-29 stsp if (error != NULL)
4653 52185f70 2019-02-05 stsp goto done;
4655 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4656 c02c541e 2019-03-29 stsp if (error)
4657 52185f70 2019-02-05 stsp goto done;
4659 15a94983 2018-12-23 stsp if (commit_id_arg == NULL)
4660 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&commit_id, GOT_REF_HEAD, repo);
4662 f2b6a97d 2019-07-15 stsp error = get_head_commit_id(&commit_id, commit_id_arg, repo);
4663 f2b6a97d 2019-07-15 stsp if (error) {
4664 f2b6a97d 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
4665 f2b6a97d 2019-07-15 stsp goto done;
4666 f2b6a97d 2019-07-15 stsp error = got_repo_match_object_id_prefix(&commit_id,
4667 f2b6a97d 2019-07-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
4670 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4671 ffd1d5e5 2018-06-23 stsp goto done;
4673 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4674 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4675 ffd1d5e5 2018-06-23 stsp goto done;
4677 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
4678 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
4679 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4680 8b473291 2019-02-21 stsp goto done;
4682 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4683 8b473291 2019-02-21 stsp if (error)
4684 ffd1d5e5 2018-06-23 stsp goto done;
4686 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
4687 5221c383 2018-08-01 stsp if (view == NULL) {
4688 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4689 5221c383 2018-08-01 stsp goto done;
4691 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
4692 ad80ab7b 2018-08-04 stsp if (error)
4693 ad80ab7b 2018-08-04 stsp goto done;
4694 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4696 52185f70 2019-02-05 stsp free(repo_path);
4697 ffd1d5e5 2018-06-23 stsp free(commit_id);
4698 ffd1d5e5 2018-06-23 stsp if (commit)
4699 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
4701 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
4703 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
4704 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4705 ffd1d5e5 2018-06-23 stsp return error;
4708 ce5b7c56 2019-07-09 stsp static void
4709 ce5b7c56 2019-07-09 stsp list_commands(void)
4713 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
4714 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
4715 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
4716 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->name);
4718 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
4721 4ed7e80c 2018-05-20 stsp __dead static void
4722 ce5b7c56 2019-07-09 stsp usage(int hflag)
4724 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] [command] [arg ...]\n",
4725 53ccebc2 2019-07-30 stsp getprogname());
4726 ce5b7c56 2019-07-09 stsp if (hflag)
4727 ce5b7c56 2019-07-09 stsp list_commands();
4731 c2301be8 2018-04-30 stsp static char **
4732 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
4734 c2301be8 2018-04-30 stsp char **argv;
4735 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
4737 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
4738 c2301be8 2018-04-30 stsp if (argv == NULL)
4739 c2301be8 2018-04-30 stsp err(1, "calloc");
4740 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
4741 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
4742 e10c916e 2019-09-15 hiltjo err(1, "strdup");
4743 c2301be8 2018-04-30 stsp if (arg1) {
4744 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
4745 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
4746 e10c916e 2019-09-15 hiltjo err(1, "strdup");
4749 c2301be8 2018-04-30 stsp return argv;
4753 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
4755 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
4756 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
4757 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
4758 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
4760 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
4762 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
4763 9f7d7167 2018-04-29 stsp switch (ch) {
4765 9f7d7167 2018-04-29 stsp hflag = 1;
4768 53ccebc2 2019-07-30 stsp Vflag = 1;
4771 ce5b7c56 2019-07-09 stsp usage(hflag);
4772 9f7d7167 2018-04-29 stsp /* NOTREACHED */
4776 9f7d7167 2018-04-29 stsp argc -= optind;
4777 9f7d7167 2018-04-29 stsp argv += optind;
4778 9f7d7167 2018-04-29 stsp optind = 0;
4779 c2301be8 2018-04-30 stsp optreset = 1;
4781 53ccebc2 2019-07-30 stsp if (Vflag) {
4782 53ccebc2 2019-07-30 stsp got_version_print_str();
4786 c2301be8 2018-04-30 stsp if (argc == 0) {
4787 f29d3e89 2018-06-23 stsp if (hflag)
4788 ce5b7c56 2019-07-09 stsp usage(hflag);
4789 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
4790 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
4791 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
4796 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
4797 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
4798 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
4799 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
4800 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
4805 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
4806 d70c3147 2019-07-09 stsp fprintf(stderr, "%s: unknown command '%s'\n",
4807 3642c4c6 2019-07-09 stsp getprogname(), argv[0]);
4808 ce5b7c56 2019-07-09 stsp list_commands();
4813 3642c4c6 2019-07-09 stsp if (hflag)
4814 3642c4c6 2019-07-09 stsp cmd->cmd_usage();
4816 3642c4c6 2019-07-09 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4819 c2301be8 2018-04-30 stsp free(cmd_argv);
4820 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
4821 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
