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 tog_view *view;
142 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
143 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
146 1a76625f 2018-10-22 stsp struct tog_log_view_state {
147 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
148 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
149 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
150 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
151 b01e7d3b 2018-08-04 stsp int selected;
152 b01e7d3b 2018-08-04 stsp char *in_repo_path;
153 d01904d4 2019-06-25 stsp const char *head_ref_name;
154 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
155 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
156 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
157 1a76625f 2018-10-22 stsp sig_atomic_t quit;
158 1a76625f 2018-10-22 stsp pthread_t thread;
159 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
160 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
161 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
164 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
165 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
166 e9424729 2018-08-04 stsp int nlines;
168 e9424729 2018-08-04 stsp struct tog_view *view;
169 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
173 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
174 e9424729 2018-08-04 stsp const char *path;
175 e9424729 2018-08-04 stsp struct got_repository *repo;
176 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
177 e9424729 2018-08-04 stsp int *complete;
178 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
179 fc06ba56 2019-08-22 stsp void *cancel_arg;
182 e9424729 2018-08-04 stsp struct tog_blame {
184 e9424729 2018-08-04 stsp size_t filesize;
185 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
186 6fcac457 2018-11-19 stsp int nlines;
187 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
188 e9424729 2018-08-04 stsp pthread_t thread;
189 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
190 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
191 e9424729 2018-08-04 stsp const char *path;
194 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
195 7cbe629d 2018-08-04 stsp int first_displayed_line;
196 7cbe629d 2018-08-04 stsp int last_displayed_line;
197 7cbe629d 2018-08-04 stsp int selected_line;
198 7cbe629d 2018-08-04 stsp int blame_complete;
201 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
202 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
203 e5a0f69f 2018-08-18 stsp char *path;
204 7cbe629d 2018-08-04 stsp struct got_repository *repo;
205 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
206 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
207 e9424729 2018-08-04 stsp struct tog_blame blame;
208 6c4c42e0 2019-06-24 stsp int matched_line;
211 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
212 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
213 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
214 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
215 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
216 ad80ab7b 2018-08-04 stsp int selected;
219 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
221 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
222 ad80ab7b 2018-08-04 stsp char *tree_label;
223 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
224 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
225 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
226 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
227 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
228 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
229 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
230 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
231 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
232 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
233 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
234 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
238 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
240 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
241 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
242 669b5ffa 2018-10-07 stsp * there is enough screen estate.
244 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
245 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
247 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
248 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
249 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
251 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
252 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
254 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
256 cc3c9aac 2018-08-01 stsp struct tog_view {
257 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
258 26ed57b2 2018-05-19 stsp WINDOW *window;
259 26ed57b2 2018-05-19 stsp PANEL *panel;
260 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
261 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
262 1004088d 2018-09-29 stsp int focussed;
263 669b5ffa 2018-10-07 stsp struct tog_view *parent;
264 669b5ffa 2018-10-07 stsp struct tog_view *child;
265 669b5ffa 2018-10-07 stsp int child_focussed;
267 5dc9f4bc 2018-08-04 stsp /* type-specific state */
268 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
270 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
271 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
272 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
273 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
276 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
277 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
278 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
279 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
281 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
282 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
283 60493ae3 2019-06-20 stsp int searching;
284 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
285 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
286 60493ae3 2019-06-20 stsp int search_next_done;
287 1803e47f 2019-06-22 stsp regex_t regex;
290 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
291 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
292 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
293 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
294 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
295 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
296 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
298 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
299 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
300 d01904d4 2019-06-25 stsp struct got_repository *, const char *, const char *, int);
301 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
302 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
303 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
304 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
305 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
306 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
308 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
309 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
310 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
311 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
312 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
313 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
314 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
315 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
317 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
318 8b473291 2019-02-21 stsp struct got_tree_object *, struct got_object_id *,
319 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
320 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
321 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
322 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
323 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
324 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
325 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
327 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
328 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
330 25791caa 2018-10-24 stsp static void
331 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
333 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
336 83baff54 2019-08-12 stsp static void
337 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
339 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
342 e5a0f69f 2018-08-18 stsp static const struct got_error *
343 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
345 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
347 669b5ffa 2018-10-07 stsp if (view->child) {
348 669b5ffa 2018-10-07 stsp view_close(view->child);
349 669b5ffa 2018-10-07 stsp view->child = NULL;
351 e5a0f69f 2018-08-18 stsp if (view->close)
352 e5a0f69f 2018-08-18 stsp err = view->close(view);
353 ea5e7bb5 2018-08-01 stsp if (view->panel)
354 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
355 ea5e7bb5 2018-08-01 stsp if (view->window)
356 ea5e7bb5 2018-08-01 stsp delwin(view->window);
357 ea5e7bb5 2018-08-01 stsp free(view);
358 e5a0f69f 2018-08-18 stsp return err;
361 ea5e7bb5 2018-08-01 stsp static struct tog_view *
362 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
363 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
365 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
367 ea5e7bb5 2018-08-01 stsp if (view == NULL)
368 ea5e7bb5 2018-08-01 stsp return NULL;
370 d6b05b5b 2018-08-04 stsp view->type = type;
371 f7d12f7e 2018-08-01 stsp view->lines = LINES;
372 f7d12f7e 2018-08-01 stsp view->cols = COLS;
373 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
374 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
375 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
376 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
377 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
378 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
379 96a765a8 2018-08-04 stsp view_close(view);
380 ea5e7bb5 2018-08-01 stsp return NULL;
382 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
383 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
384 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
385 96a765a8 2018-08-04 stsp view_close(view);
386 ea5e7bb5 2018-08-01 stsp return NULL;
389 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
390 ea5e7bb5 2018-08-01 stsp return view;
394 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
396 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
398 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
401 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
403 5c60c32a 2018-10-18 stsp static const struct got_error *
404 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
406 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
408 5c60c32a 2018-10-18 stsp view->begin_y = 0;
409 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
410 5c60c32a 2018-10-18 stsp view->nlines = LINES;
411 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
412 5c60c32a 2018-10-18 stsp view->lines = LINES;
413 5c60c32a 2018-10-18 stsp view->cols = COLS;
414 5c60c32a 2018-10-18 stsp err = view_resize(view);
416 5c60c32a 2018-10-18 stsp return err;
418 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
419 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
421 5c60c32a 2018-10-18 stsp return NULL;
424 5c60c32a 2018-10-18 stsp static const struct got_error *
425 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
427 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
429 5c60c32a 2018-10-18 stsp view->begin_x = 0;
430 5c60c32a 2018-10-18 stsp view->begin_y = 0;
431 5c60c32a 2018-10-18 stsp view->nlines = LINES;
432 5c60c32a 2018-10-18 stsp view->ncols = COLS;
433 5c60c32a 2018-10-18 stsp view->lines = LINES;
434 5c60c32a 2018-10-18 stsp view->cols = COLS;
435 5c60c32a 2018-10-18 stsp err = view_resize(view);
437 5c60c32a 2018-10-18 stsp return err;
439 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
440 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
442 5c60c32a 2018-10-18 stsp return NULL;
446 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
448 5c60c32a 2018-10-18 stsp return view->parent == NULL;
451 4d8c2215 2018-08-19 stsp static const struct got_error *
452 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
454 f7d12f7e 2018-08-01 stsp int nlines, ncols;
456 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
457 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
459 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
461 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
462 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
464 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
466 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
467 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
468 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
469 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
470 25791caa 2018-10-24 stsp wclear(view->window);
472 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
473 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
474 0cf4efb1 2018-09-29 stsp view->lines = LINES;
475 0cf4efb1 2018-09-29 stsp view->cols = COLS;
477 6e3e5d9c 2018-10-18 stsp if (view->child) {
478 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
479 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
480 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
481 5c60c32a 2018-10-18 stsp if (view->child->focussed)
482 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
484 5c60c32a 2018-10-18 stsp show_panel(view->panel);
486 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
487 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
491 5c60c32a 2018-10-18 stsp return NULL;
494 669b5ffa 2018-10-07 stsp static const struct got_error *
495 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
497 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
499 669b5ffa 2018-10-07 stsp if (view->child == NULL)
500 669b5ffa 2018-10-07 stsp return NULL;
502 669b5ffa 2018-10-07 stsp err = view_close(view->child);
503 669b5ffa 2018-10-07 stsp view->child = NULL;
504 669b5ffa 2018-10-07 stsp return err;
507 669b5ffa 2018-10-07 stsp static const struct got_error *
508 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
510 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
512 669b5ffa 2018-10-07 stsp view->child = child;
513 669b5ffa 2018-10-07 stsp child->parent = view;
514 669b5ffa 2018-10-07 stsp return err;
518 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
520 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
523 34bc9ec9 2019-02-22 stsp static void
524 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
526 25791caa 2018-10-24 stsp int cols, lines;
527 25791caa 2018-10-24 stsp struct winsize size;
529 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
530 25791caa 2018-10-24 stsp cols = 80; /* Default */
531 25791caa 2018-10-24 stsp lines = 24;
533 25791caa 2018-10-24 stsp cols = size.ws_col;
534 25791caa 2018-10-24 stsp lines = size.ws_row;
536 25791caa 2018-10-24 stsp resize_term(lines, cols);
539 2b49a8ae 2019-06-22 stsp static const struct got_error *
540 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
542 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
543 2b49a8ae 2019-06-22 stsp char pattern[1024];
545 7d049c18 2019-08-21 stsp int begin_x = 0;
547 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
548 2b49a8ae 2019-06-22 stsp return NULL;
550 7d049c18 2019-08-21 stsp if (!view_is_parent_view(view))
551 7d049c18 2019-08-21 stsp begin_x = view_split_begin_x(view->begin_x);
552 2b49a8ae 2019-06-22 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1,
553 7d049c18 2019-08-21 stsp begin_x, "/");
554 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
556 2b49a8ae 2019-06-22 stsp nocbreak();
558 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
561 2b49a8ae 2019-06-22 stsp if (ret == ERR)
562 2b49a8ae 2019-06-22 stsp return NULL;
564 2b49a8ae 2019-06-22 stsp if (view->searching) {
565 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
566 2b49a8ae 2019-06-22 stsp view->searching = 0;
569 2b49a8ae 2019-06-22 stsp if (regcomp(&view->regex, pattern,
570 f5daf9b1 2019-06-24 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
571 7c32bd05 2019-06-22 stsp err = view->search_start(view);
573 7c32bd05 2019-06-22 stsp regfree(&view->regex);
574 7c32bd05 2019-06-22 stsp return err;
576 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
577 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
578 2b49a8ae 2019-06-22 stsp view->search_next(view);
581 2b49a8ae 2019-06-22 stsp return NULL;
584 0cf4efb1 2018-09-29 stsp static const struct got_error *
585 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
586 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
587 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
589 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
590 669b5ffa 2018-10-07 stsp struct tog_view *v;
591 1a76625f 2018-10-22 stsp int ch, errcode;
593 e5a0f69f 2018-08-18 stsp *new = NULL;
594 e5a0f69f 2018-08-18 stsp *dead = NULL;
595 0cf4efb1 2018-09-29 stsp *focus = NULL;
597 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
598 60493ae3 2019-06-20 stsp errcode = pthread_mutex_unlock(&tog_mutex);
599 60493ae3 2019-06-20 stsp if (errcode)
600 60493ae3 2019-06-20 stsp return got_error_set_errno(errcode,
601 60493ae3 2019-06-20 stsp "pthread_mutex_unlock");
602 60493ae3 2019-06-20 stsp pthread_yield();
603 60493ae3 2019-06-20 stsp errcode = pthread_mutex_lock(&tog_mutex);
604 60493ae3 2019-06-20 stsp if (errcode)
605 60493ae3 2019-06-20 stsp return got_error_set_errno(errcode,
606 60493ae3 2019-06-20 stsp "pthread_mutex_lock");
607 60493ae3 2019-06-20 stsp view->search_next(view);
608 60493ae3 2019-06-20 stsp return NULL;
611 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
612 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
613 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
614 1a76625f 2018-10-22 stsp if (errcode)
615 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
616 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
617 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
618 1a76625f 2018-10-22 stsp if (errcode)
619 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
620 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
622 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
623 25791caa 2018-10-24 stsp tog_resizeterm();
624 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
625 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
626 25791caa 2018-10-24 stsp err = view_resize(v);
628 25791caa 2018-10-24 stsp return err;
629 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
631 25791caa 2018-10-24 stsp return err;
635 e5a0f69f 2018-08-18 stsp switch (ch) {
639 1e37a5c2 2019-05-12 jcs if (view->child) {
640 1e37a5c2 2019-05-12 jcs *focus = view->child;
641 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
642 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
643 1e37a5c2 2019-05-12 jcs *focus = view->parent;
644 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
648 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
649 1e37a5c2 2019-05-12 jcs *dead = view;
655 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
656 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
658 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
659 669b5ffa 2018-10-07 stsp *focus = view->child;
660 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
661 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
663 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
666 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
667 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
669 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
670 1e37a5c2 2019-05-12 jcs *focus = view;
671 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
672 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
674 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
678 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
679 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
682 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
685 60493ae3 2019-06-20 stsp if (view->search_start)
686 2b49a8ae 2019-06-22 stsp view_search_start(view);
688 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
692 60493ae3 2019-06-20 stsp if (view->search_next && view->searching) {
693 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
694 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
695 60493ae3 2019-06-20 stsp view->search_next_done = 0;
696 60493ae3 2019-06-20 stsp view->search_next(view);
698 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
701 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
705 e5a0f69f 2018-08-18 stsp return err;
709 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
711 0cf4efb1 2018-09-29 stsp PANEL *panel;
712 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
714 669b5ffa 2018-10-07 stsp if (view->parent)
715 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
717 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
718 0cf4efb1 2018-09-29 stsp if (panel == NULL)
721 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
722 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
723 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
727 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
729 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
730 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
732 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
734 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
737 669b5ffa 2018-10-07 stsp return view->focussed;
740 bcbd79e2 2018-08-19 stsp static const struct got_error *
741 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
743 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
744 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
745 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
746 fd823528 2018-10-22 stsp int fast_refresh = 10;
747 1a76625f 2018-10-22 stsp int done = 0, errcode;
749 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
750 1a76625f 2018-10-22 stsp if (errcode)
751 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
753 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
754 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
756 a81bf10d 2018-09-29 stsp main_view = view;
757 1004088d 2018-09-29 stsp view->focussed = 1;
758 878940b7 2018-09-29 stsp err = view->show(view);
760 0cf4efb1 2018-09-29 stsp return err;
761 0cf4efb1 2018-09-29 stsp update_panels();
762 0cf4efb1 2018-09-29 stsp doupdate();
763 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
764 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
765 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
766 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
768 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
769 e4197bf9 2018-08-18 stsp view, &views);
772 e5a0f69f 2018-08-18 stsp if (dead_view) {
773 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
775 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
776 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
777 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
778 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
779 669b5ffa 2018-10-07 stsp prev = view->parent;
781 669b5ffa 2018-10-07 stsp if (dead_view->parent)
782 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
784 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
786 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
787 d01904d4 2019-06-25 stsp if (err || (dead_view == main_view && new_view == NULL))
790 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
791 0cf4efb1 2018-09-29 stsp if (focus_view)
792 0cf4efb1 2018-09-29 stsp view = focus_view;
793 669b5ffa 2018-10-07 stsp else if (prev)
794 669b5ffa 2018-10-07 stsp view = prev;
795 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
796 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
797 0cf4efb1 2018-09-29 stsp tog_view_list_head);
799 0cf4efb1 2018-09-29 stsp view = NULL;
800 669b5ffa 2018-10-07 stsp if (view) {
801 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
802 669b5ffa 2018-10-07 stsp focus_view = view->child;
804 669b5ffa 2018-10-07 stsp focus_view = view;
808 bcbd79e2 2018-08-19 stsp if (new_view) {
809 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
810 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
811 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
812 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
814 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
815 86c66b02 2018-10-18 stsp err = view_close(v);
820 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
821 fed7eaa8 2018-10-24 stsp view = new_view;
822 878940b7 2018-09-29 stsp if (focus_view == NULL)
823 878940b7 2018-09-29 stsp focus_view = new_view;
825 0cf4efb1 2018-09-29 stsp if (focus_view) {
826 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
828 0cf4efb1 2018-09-29 stsp view->focussed = 0;
829 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
830 0cf4efb1 2018-09-29 stsp view = focus_view;
831 878940b7 2018-09-29 stsp if (new_view)
832 878940b7 2018-09-29 stsp show_panel(new_view->panel);
833 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
834 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
836 669b5ffa 2018-10-07 stsp if (view) {
837 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
838 758194b5 2018-10-24 stsp view->focussed = 1;
839 758194b5 2018-10-24 stsp show_panel(view->panel);
840 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
841 758194b5 2018-10-24 stsp show_panel(view->child->panel);
842 1a76625f 2018-10-22 stsp focus_view = view;
844 669b5ffa 2018-10-07 stsp if (view->parent) {
845 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
849 669b5ffa 2018-10-07 stsp err = view->show(view);
852 669b5ffa 2018-10-07 stsp if (view->child) {
853 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
857 1a76625f 2018-10-22 stsp update_panels();
858 1a76625f 2018-10-22 stsp doupdate();
862 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
863 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
864 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
865 e5a0f69f 2018-08-18 stsp view_close(view);
868 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
869 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
870 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
872 e5a0f69f 2018-08-18 stsp return err;
875 4ed7e80c 2018-05-20 stsp __dead static void
876 9f7d7167 2018-04-29 stsp usage_log(void)
879 c70c5802 2018-08-01 stsp fprintf(stderr,
880 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
881 9f7d7167 2018-04-29 stsp getprogname());
885 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
886 80ddbec8 2018-04-29 stsp static const struct got_error *
887 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
889 00dfcb92 2018-06-11 stsp char *vis = NULL;
890 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
892 963b370f 2018-05-20 stsp *ws = NULL;
893 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
894 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
895 00dfcb92 2018-06-11 stsp int vislen;
896 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
897 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
899 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
900 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
902 00dfcb92 2018-06-11 stsp return err;
903 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
904 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
905 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
910 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
911 a7f50699 2018-06-11 stsp if (*ws == NULL) {
912 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
916 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
917 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
922 963b370f 2018-05-20 stsp *ws = NULL;
925 963b370f 2018-05-20 stsp return err;
928 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
929 963b370f 2018-05-20 stsp static const struct got_error *
930 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
931 27a741e5 2019-09-11 stsp int col_tab_align)
933 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
934 963b370f 2018-05-20 stsp int cols = 0;
935 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
936 963b370f 2018-05-20 stsp size_t wlen;
939 963b370f 2018-05-20 stsp *wlinep = NULL;
940 b700b5d6 2018-07-10 stsp *widthp = 0;
942 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
944 963b370f 2018-05-20 stsp return err;
947 27a741e5 2019-09-11 stsp while (i < wlen) {
948 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
950 27a741e5 2019-09-11 stsp if (width == 0) {
955 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
956 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
958 27a741e5 2019-09-11 stsp cols += width;
960 27a741e5 2019-09-11 stsp } else if (width == -1) {
961 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
962 27a741e5 2019-09-11 stsp width = TABSIZE -
963 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
964 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
966 27a741e5 2019-09-11 stsp cols += width;
970 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
974 963b370f 2018-05-20 stsp wline[i] = L'\0';
975 b700b5d6 2018-07-10 stsp if (widthp)
976 b700b5d6 2018-07-10 stsp *widthp = cols;
979 963b370f 2018-05-20 stsp free(wline);
981 963b370f 2018-05-20 stsp *wlinep = wline;
982 963b370f 2018-05-20 stsp return err;
985 8b473291 2019-02-21 stsp static const struct got_error*
986 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
987 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
989 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
990 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
992 8b473291 2019-02-21 stsp const char *name;
994 8b473291 2019-02-21 stsp *refs_str = NULL;
996 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
997 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1000 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1001 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1003 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1004 8b473291 2019-02-21 stsp name += 5;
1005 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1007 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1008 8b473291 2019-02-21 stsp name += 6;
1009 8b473291 2019-02-21 stsp if (strncmp(name, "remotes/", 8) == 0)
1010 8b473291 2019-02-21 stsp name += 8;
1011 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1012 52b5abe1 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1013 5d844a1e 2019-08-13 stsp if (err) {
1014 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1016 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1017 5d844a1e 2019-08-13 stsp err = NULL;
1018 5d844a1e 2019-08-13 stsp tag = NULL;
1021 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1022 52b5abe1 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1024 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1025 52b5abe1 2019-08-13 stsp if (cmp != 0)
1027 8b473291 2019-02-21 stsp s = *refs_str;
1028 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1029 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1030 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1032 8b473291 2019-02-21 stsp *refs_str = NULL;
1038 8b473291 2019-02-21 stsp return err;
1041 963b370f 2018-05-20 stsp static const struct got_error *
1042 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1043 27a741e5 2019-09-11 stsp int col_tab_align)
1045 5813d178 2019-03-09 stsp char *smallerthan, *at;
1047 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1048 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1049 5813d178 2019-03-09 stsp author = smallerthan + 1;
1050 5813d178 2019-03-09 stsp at = strchr(author, '@');
1052 5813d178 2019-03-09 stsp *at = '\0';
1053 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1056 5813d178 2019-03-09 stsp static const struct got_error *
1057 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1058 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1059 27a741e5 2019-09-11 stsp const size_t date_display_cols, int author_display_cols)
1061 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1062 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
1063 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1064 5813d178 2019-03-09 stsp char *author = NULL;
1065 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1066 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1067 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1068 bb737323 2018-05-20 stsp int col, limit;
1069 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1070 ccb26ccd 2018-11-05 stsp struct tm tm;
1071 45d799e2 2018-12-23 stsp time_t committer_time;
1073 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1074 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1075 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1076 ccb26ccd 2018-11-05 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
1077 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1078 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1080 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1081 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1083 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1084 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1085 27a741e5 2019-09-11 stsp col = limit;
1086 b39d25c7 2018-07-10 stsp if (col > avail)
1087 b39d25c7 2018-07-10 stsp goto done;
1089 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1090 5813d178 2019-03-09 stsp if (author == NULL) {
1091 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1092 80ddbec8 2018-04-29 stsp goto done;
1094 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1096 bb737323 2018-05-20 stsp goto done;
1097 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1098 bb737323 2018-05-20 stsp col += author_width;
1099 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1100 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1102 bb737323 2018-05-20 stsp author_width++;
1104 9c2eaf34 2018-05-20 stsp if (col > avail)
1105 9c2eaf34 2018-05-20 stsp goto done;
1107 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1109 6d9fbc00 2018-04-29 stsp goto done;
1110 bb737323 2018-05-20 stsp logmsg = logmsg0;
1111 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1113 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1114 bb737323 2018-05-20 stsp if (newline)
1115 bb737323 2018-05-20 stsp *newline = '\0';
1116 bb737323 2018-05-20 stsp limit = avail - col;
1117 27a741e5 2019-09-11 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, 0);
1119 bb737323 2018-05-20 stsp goto done;
1120 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1121 bb737323 2018-05-20 stsp col += logmsg_width;
1122 27a741e5 2019-09-11 stsp while (col < avail) {
1123 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1127 80ddbec8 2018-04-29 stsp free(logmsg0);
1128 bb737323 2018-05-20 stsp free(wlogmsg);
1129 5813d178 2019-03-09 stsp free(author);
1130 bb737323 2018-05-20 stsp free(wauthor);
1131 80ddbec8 2018-04-29 stsp free(line);
1132 80ddbec8 2018-04-29 stsp return err;
1135 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1136 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1137 899d86c2 2018-05-10 stsp struct got_object_id *id)
1139 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1141 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1142 80ddbec8 2018-04-29 stsp if (entry == NULL)
1143 899d86c2 2018-05-10 stsp return NULL;
1145 899d86c2 2018-05-10 stsp entry->id = id;
1146 99db9666 2018-05-07 stsp entry->commit = commit;
1147 899d86c2 2018-05-10 stsp return entry;
1150 99db9666 2018-05-07 stsp static void
1151 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1153 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1155 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1156 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1157 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1158 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1159 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1160 99db9666 2018-05-07 stsp free(entry);
1163 99db9666 2018-05-07 stsp static void
1164 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1166 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1167 99db9666 2018-05-07 stsp pop_commit(commits);
1170 c4972b91 2018-05-07 stsp static const struct got_error *
1171 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1172 1a76625f 2018-10-22 stsp int minqueue, struct got_repository *repo, const char *path)
1174 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1175 93e45b7c 2018-09-24 stsp int nqueued = 0;
1178 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1179 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1180 1a76625f 2018-10-22 stsp * while updating the display.
1182 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
1183 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1184 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1185 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1186 1a76625f 2018-10-22 stsp int errcode;
1188 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1189 9ba79e04 2018-06-11 stsp if (err) {
1190 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1192 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1193 6fb7cd11 2019-08-22 stsp minqueue, repo, NULL, NULL);
1195 ecb28ae0 2018-07-16 stsp return err;
1199 ecb28ae0 2018-07-16 stsp if (id == NULL)
1202 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1205 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1206 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1207 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1211 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1212 1a76625f 2018-10-22 stsp if (errcode) {
1213 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_lock");
1217 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1218 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1219 ecb28ae0 2018-07-16 stsp nqueued++;
1220 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1222 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1223 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1224 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1225 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1228 9ba79e04 2018-06-11 stsp return err;
1231 99db9666 2018-05-07 stsp static const struct got_error *
1232 19e70ad6 2019-05-14 stsp get_head_commit_id(struct got_object_id **head_id, const char *branch_name,
1233 19e70ad6 2019-05-14 stsp struct got_repository *repo)
1235 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1236 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1238 9ba79e04 2018-06-11 stsp *head_id = NULL;
1240 19e70ad6 2019-05-14 stsp err = got_ref_open(&head_ref, repo, branch_name, 0);
1242 99db9666 2018-05-07 stsp return err;
1244 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1245 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1246 9ba79e04 2018-06-11 stsp if (err) {
1247 9ba79e04 2018-06-11 stsp *head_id = NULL;
1248 99db9666 2018-05-07 stsp return err;
1251 9ba79e04 2018-06-11 stsp return NULL;
1254 0553a4e3 2018-04-30 stsp static const struct got_error *
1255 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1256 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1257 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1258 8b473291 2019-02-21 stsp struct got_reflist_head *refs, const char *path, int commits_needed)
1260 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1261 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1262 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1263 60493ae3 2019-06-20 stsp int width;
1264 60493ae3 2019-06-20 stsp int ncommits, author_cols = 10;
1265 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1266 8b473291 2019-02-21 stsp char *refs_str = NULL;
1267 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1268 27a741e5 2019-09-11 stsp static const size_t date_display_cols = 9;
1270 e0d42f60 2018-07-22 stsp entry = first;
1271 e0d42f60 2018-07-22 stsp ncommits = 0;
1272 e0d42f60 2018-07-22 stsp while (entry) {
1273 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1274 e0d42f60 2018-07-22 stsp *selected = entry;
1277 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1278 e0d42f60 2018-07-22 stsp ncommits++;
1281 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1282 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1284 ecb28ae0 2018-07-16 stsp return err;
1285 8b473291 2019-02-21 stsp if (refs) {
1286 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, (*selected)->id,
1289 8b473291 2019-02-21 stsp goto done;
1293 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1294 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1296 8b473291 2019-02-21 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1297 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1298 60493ae3 2019-06-20 stsp commits_needed > 0 ?
1299 60493ae3 2019-06-20 stsp (view->searching && view->search_next_done == 0
1300 60493ae3 2019-06-20 stsp ? "searching..." : "loading... ") :
1301 8b473291 2019-02-21 stsp (refs_str ? refs_str : "")) == -1) {
1302 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1303 8b473291 2019-02-21 stsp goto done;
1306 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1307 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1308 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1309 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1310 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1311 1a76625f 2018-10-22 stsp header = NULL;
1312 1a76625f 2018-10-22 stsp goto done;
1314 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1315 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1316 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1317 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1318 1a76625f 2018-10-22 stsp header = NULL;
1319 1a76625f 2018-10-22 stsp goto done;
1321 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1323 1a76625f 2018-10-22 stsp goto done;
1325 2814baeb 2018-08-01 stsp werase(view->window);
1327 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1328 a3404814 2018-09-02 stsp wstandout(view->window);
1329 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1330 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1331 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1334 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1335 a3404814 2018-09-02 stsp wstandend(view->window);
1336 ecb28ae0 2018-07-16 stsp free(wline);
1337 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1338 1a76625f 2018-10-22 stsp goto done;
1340 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1341 899d86c2 2018-05-10 stsp entry = first;
1342 5813d178 2019-03-09 stsp ncommits = 0;
1343 5813d178 2019-03-09 stsp while (entry) {
1344 5813d178 2019-03-09 stsp char *author;
1345 5813d178 2019-03-09 stsp wchar_t *wauthor;
1346 5813d178 2019-03-09 stsp int width;
1347 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1349 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1350 5813d178 2019-03-09 stsp if (author == NULL) {
1351 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1352 5813d178 2019-03-09 stsp goto done;
1354 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1355 27a741e5 2019-09-11 stsp date_display_cols);
1356 5813d178 2019-03-09 stsp if (author_cols < width)
1357 5813d178 2019-03-09 stsp author_cols = width;
1358 5813d178 2019-03-09 stsp free(wauthor);
1359 5813d178 2019-03-09 stsp free(author);
1360 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1363 5813d178 2019-03-09 stsp entry = first;
1364 899d86c2 2018-05-10 stsp *last = first;
1365 867c6645 2018-07-10 stsp ncommits = 0;
1366 899d86c2 2018-05-10 stsp while (entry) {
1367 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1369 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1370 2814baeb 2018-08-01 stsp wstandout(view->window);
1371 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1372 27a741e5 2019-09-11 stsp date_display_cols, author_cols);
1373 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1374 2814baeb 2018-08-01 stsp wstandend(view->window);
1376 60493ae3 2019-06-20 stsp goto done;
1377 0553a4e3 2018-04-30 stsp ncommits++;
1378 899d86c2 2018-05-10 stsp *last = entry;
1379 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1382 1a57306a 2018-09-02 stsp view_vborder(view);
1384 1a76625f 2018-10-22 stsp free(id_str);
1385 8b473291 2019-02-21 stsp free(refs_str);
1386 1a76625f 2018-10-22 stsp free(ncommits_str);
1387 1a76625f 2018-10-22 stsp free(header);
1388 80ddbec8 2018-04-29 stsp return err;
1391 07b55e75 2018-05-10 stsp static void
1392 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1393 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1394 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1396 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1397 07b55e75 2018-05-10 stsp int nscrolled = 0;
1399 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1400 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1403 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1404 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1405 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1406 07b55e75 2018-05-10 stsp if (entry) {
1407 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1408 07b55e75 2018-05-10 stsp nscrolled++;
1413 aa075928 2018-05-10 stsp static const struct got_error *
1414 5e224a3e 2019-02-22 stsp trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1415 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1417 5e224a3e 2019-02-22 stsp int errcode;
1418 8a42fca8 2019-02-22 stsp int max_wait = 20;
1420 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1422 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1423 5e224a3e 2019-02-22 stsp if (*log_complete)
1426 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1427 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1428 7aafa0d1 2019-02-22 stsp if (errcode)
1429 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1430 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1431 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1432 7aafa0d1 2019-02-22 stsp if (errcode)
1433 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1434 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1435 7aafa0d1 2019-02-22 stsp pthread_yield();
1436 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1437 7aafa0d1 2019-02-22 stsp if (errcode)
1438 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1439 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1441 8a42fca8 2019-02-22 stsp if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1443 5e224a3e 2019-02-22 stsp * Thread is not done yet; lose a key press
1444 5e224a3e 2019-02-22 stsp * and let the user retry... this way the GUI
1445 5e224a3e 2019-02-22 stsp * remains interactive while logging deep paths
1446 5e224a3e 2019-02-22 stsp * with few commits in history.
1448 7aafa0d1 2019-02-22 stsp return NULL;
1452 5e224a3e 2019-02-22 stsp return NULL;
1455 5e224a3e 2019-02-22 stsp static const struct got_error *
1456 34bc9ec9 2019-02-22 stsp scroll_down(struct tog_view *view,
1457 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1458 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1459 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1460 5e224a3e 2019-02-22 stsp pthread_cond_t *need_commits)
1462 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1463 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1464 5e224a3e 2019-02-22 stsp int nscrolled = 0;
1466 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1467 5e224a3e 2019-02-22 stsp return NULL;
1469 5e224a3e 2019-02-22 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1470 5e224a3e 2019-02-22 stsp if (pentry == NULL && !*log_complete) {
1472 08ebd0a9 2019-02-22 stsp * Ask the log thread for required amount of commits
1473 08ebd0a9 2019-02-22 stsp * plus some amount of pre-fetching.
1475 08ebd0a9 2019-02-22 stsp (*commits_needed) += maxscroll + 20;
1476 5e224a3e 2019-02-22 stsp err = trigger_log_thread(0, commits_needed, log_complete,
1477 5e224a3e 2019-02-22 stsp need_commits);
1479 5e224a3e 2019-02-22 stsp return err;
1483 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1484 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1487 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1489 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1490 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1492 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1493 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1495 dd0a52c1 2018-05-20 stsp return err;
1498 cd0acaa7 2018-05-20 stsp static const struct got_error *
1499 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1500 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1501 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1502 8b473291 2019-02-21 stsp struct got_repository *repo)
1504 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1505 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1506 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1508 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1509 15a94983 2018-12-23 stsp if (diff_view == NULL)
1510 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1512 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1513 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1514 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1515 e5a0f69f 2018-08-18 stsp if (err == NULL)
1516 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1517 cd0acaa7 2018-05-20 stsp return err;
1520 80ddbec8 2018-04-29 stsp static const struct got_error *
1521 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1522 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1524 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1526 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1527 941e9f74 2019-05-21 stsp if (parent == NULL)
1528 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1530 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1531 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1532 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1533 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1534 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1535 941e9f74 2019-05-21 stsp s->tree = subtree;
1536 941e9f74 2019-05-21 stsp s->entries = got_object_tree_get_entries(s->tree);
1537 941e9f74 2019-05-21 stsp s->selected = 0;
1538 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1539 941e9f74 2019-05-21 stsp return NULL;
1543 941e9f74 2019-05-21 stsp static const struct got_error *
1544 941e9f74 2019-05-21 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1545 941e9f74 2019-05-21 stsp struct commit_queue_entry *entry, const char *path,
1546 941e9f74 2019-05-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
1548 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1549 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1550 941e9f74 2019-05-21 stsp struct got_tree_entry *te;
1551 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s;
1552 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1553 b03c880f 2019-05-21 stsp char *slash, *subpath = NULL;
1554 941e9f74 2019-05-21 stsp const char *p;
1556 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree, repo,
1557 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(entry->commit));
1559 9343a5fb 2018-06-23 stsp return err;
1561 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1562 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1563 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1565 8b473291 2019-02-21 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1566 941e9f74 2019-05-21 stsp if (err) {
1567 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1568 941e9f74 2019-05-21 stsp return err;
1570 941e9f74 2019-05-21 stsp s = &tree_view->state.tree;
1572 941e9f74 2019-05-21 stsp *new_view = tree_view;
1574 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1576 8d0fe45a 2019-08-12 stsp while (p[0] == '/')
1578 941e9f74 2019-05-21 stsp while (*p) {
1579 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1581 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1582 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1583 941e9f74 2019-05-21 stsp if (slash == NULL)
1584 941e9f74 2019-05-21 stsp slash = strchr(p, '\0');
1585 941e9f74 2019-05-21 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
1586 941e9f74 2019-05-21 stsp if (strncmp(p, te->name, slash - p) == 0) {
1587 941e9f74 2019-05-21 stsp s->selected_entry = te;
1590 b03c880f 2019-05-21 stsp s->selected++;
1592 941e9f74 2019-05-21 stsp if (s->selected_entry == NULL) {
1593 941e9f74 2019-05-21 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1596 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1597 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1599 67409a31 2019-05-24 stsp if (!S_ISDIR(s->selected_entry->mode)) {
1600 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1601 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1602 67409a31 2019-05-24 stsp s->selected = 0;
1606 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1607 941e9f74 2019-05-21 stsp if (slash)
1608 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1610 941e9f74 2019-05-21 stsp subpath = strdup(path);
1611 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1612 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1616 941e9f74 2019-05-21 stsp err = got_object_id_by_path(&tree_id, repo, entry->id,
1621 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1622 941e9f74 2019-05-21 stsp free(tree_id);
1626 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1627 941e9f74 2019-05-21 stsp if (err) {
1628 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1631 941e9f74 2019-05-21 stsp if (slash == NULL)
1633 941e9f74 2019-05-21 stsp free(subpath);
1634 941e9f74 2019-05-21 stsp subpath = NULL;
1635 941e9f74 2019-05-21 stsp p = slash;
1638 941e9f74 2019-05-21 stsp free(subpath);
1639 1a76625f 2018-10-22 stsp return err;
1642 1a76625f 2018-10-22 stsp static void *
1643 1a76625f 2018-10-22 stsp log_thread(void *arg)
1645 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1646 1a76625f 2018-10-22 stsp int errcode = 0;
1647 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1648 1a76625f 2018-10-22 stsp int done = 0;
1650 6fb7cd11 2019-08-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo,
1651 6fb7cd11 2019-08-22 stsp NULL, NULL);
1653 1a76625f 2018-10-22 stsp return (void *)err;
1655 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1656 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1657 1a76625f 2018-10-22 stsp a->in_repo_path);
1658 1a76625f 2018-10-22 stsp if (err) {
1659 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1660 1a76625f 2018-10-22 stsp return (void *)err;
1661 1a76625f 2018-10-22 stsp err = NULL;
1663 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1664 1a76625f 2018-10-22 stsp a->commits_needed--;
1666 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1667 3abe8080 2019-04-10 stsp if (errcode) {
1668 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1669 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1671 3abe8080 2019-04-10 stsp } else if (*a->quit)
1673 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1674 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1675 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1676 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1680 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1681 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1682 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1683 1a76625f 2018-10-22 stsp &tog_mutex);
1684 1a76625f 2018-10-22 stsp if (errcode)
1685 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1686 2af4a041 2019-05-11 jcs "pthread_cond_wait");
1689 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1690 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1691 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1692 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1694 3abe8080 2019-04-10 stsp a->log_complete = 1;
1695 1a76625f 2018-10-22 stsp return (void *)err;
1698 1a76625f 2018-10-22 stsp static const struct got_error *
1699 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1701 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1702 1a76625f 2018-10-22 stsp int errcode;
1704 1a76625f 2018-10-22 stsp if (s->thread) {
1705 1a76625f 2018-10-22 stsp s->quit = 1;
1706 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1707 1a76625f 2018-10-22 stsp if (errcode)
1708 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1709 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1710 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1711 1a76625f 2018-10-22 stsp if (errcode)
1712 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1713 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1714 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1715 1a76625f 2018-10-22 stsp if (errcode)
1716 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
1717 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1718 1a76625f 2018-10-22 stsp if (errcode)
1719 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1720 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1721 1a76625f 2018-10-22 stsp s->thread = NULL;
1724 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1725 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1726 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
1728 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1729 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1730 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1733 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1734 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1735 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1738 9343a5fb 2018-06-23 stsp return err;
1741 9343a5fb 2018-06-23 stsp static const struct got_error *
1742 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1744 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1745 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1747 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1748 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1749 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1750 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1751 1a76625f 2018-10-22 stsp free(s->start_id);
1752 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1753 1a76625f 2018-10-22 stsp return err;
1756 1a76625f 2018-10-22 stsp static const struct got_error *
1757 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
1759 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
1761 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
1762 96e2b566 2019-07-08 stsp s->search_entry = NULL;
1763 60493ae3 2019-06-20 stsp return NULL;
1766 60493ae3 2019-06-20 stsp static int
1767 df0b3d8a 2019-06-28 stsp match_commit(struct got_commit_object *commit, const char *id_str,
1768 5943eee2 2019-08-13 stsp const char *logmsg, regex_t *regex)
1770 60493ae3 2019-06-20 stsp regmatch_t regmatch;
1772 60493ae3 2019-06-20 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1773 60493ae3 2019-06-20 stsp ®match, 0) == 0 ||
1774 60493ae3 2019-06-20 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1775 60493ae3 2019-06-20 stsp ®match, 0) == 0 ||
1776 5943eee2 2019-08-13 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1777 5943eee2 2019-08-13 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1783 60493ae3 2019-06-20 stsp static const struct got_error *
1784 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
1786 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
1787 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
1788 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
1790 60493ae3 2019-06-20 stsp if (!view->searching) {
1791 60493ae3 2019-06-20 stsp view->search_next_done = 1;
1792 60493ae3 2019-06-20 stsp return NULL;
1795 96e2b566 2019-07-08 stsp if (s->search_entry) {
1796 678cbce5 2019-07-28 stsp if (wgetch(view->window) == KEY_BACKSPACE) {
1797 678cbce5 2019-07-28 stsp view->search_next_done = 1;
1798 678cbce5 2019-07-28 stsp return NULL;
1800 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
1801 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
1803 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
1804 96e2b566 2019-07-08 stsp commit_queue_head, entry);
1805 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
1806 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1807 b55df7bc 2019-06-21 stsp entry = TAILQ_NEXT(s->selected_entry, entry);
1809 b55df7bc 2019-06-21 stsp entry = TAILQ_PREV(s->selected_entry,
1810 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
1812 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1813 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
1815 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
1818 60493ae3 2019-06-20 stsp while (1) {
1819 5943eee2 2019-08-13 stsp char *id_str, *logmsg;
1820 60493ae3 2019-06-20 stsp if (entry == NULL) {
1821 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
1822 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
1823 f801134a 2019-06-25 stsp view->search_next_done = 1;
1824 f801134a 2019-06-25 stsp return NULL;
1827 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
1828 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
1829 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
1831 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
1832 57b33b64 2019-07-08 stsp return trigger_log_thread(1,
1833 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
1834 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
1835 f801134a 2019-06-25 stsp &s->thread_args.need_commits);
1838 df0b3d8a 2019-06-28 stsp err = got_object_id_str(&id_str, entry->id);
1840 df0b3d8a 2019-06-28 stsp return err;
1842 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, entry->commit);
1844 5943eee2 2019-08-13 stsp return err;
1845 5943eee2 2019-08-13 stsp if (match_commit(entry->commit, id_str, logmsg, &view->regex)) {
1846 5943eee2 2019-08-13 stsp free(logmsg);
1847 60493ae3 2019-06-20 stsp view->search_next_done = 1;
1848 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
1849 df0b3d8a 2019-06-28 stsp free(id_str);
1852 5943eee2 2019-08-13 stsp free(logmsg);
1853 df0b3d8a 2019-06-28 stsp free(id_str);
1854 96e2b566 2019-07-08 stsp s->search_entry = entry;
1855 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1856 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
1858 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1861 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
1862 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
1863 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
1864 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
1866 60493ae3 2019-06-20 stsp return err;
1869 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
1870 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
1872 60493ae3 2019-06-20 stsp return err;
1877 96e2b566 2019-07-08 stsp s->search_entry = NULL;
1879 60493ae3 2019-06-20 stsp return NULL;
1882 60493ae3 2019-06-20 stsp static const struct got_error *
1883 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1884 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
1885 d01904d4 2019-06-25 stsp const char *head_ref_name, const char *path, int check_disk)
1887 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1888 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1889 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1890 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1891 1a76625f 2018-10-22 stsp int errcode;
1893 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1894 ecb28ae0 2018-07-16 stsp if (err != NULL)
1895 ecb28ae0 2018-07-16 stsp goto done;
1897 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1898 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1899 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1901 8b473291 2019-02-21 stsp s->refs = refs;
1902 fb2756b9 2018-08-04 stsp s->repo = repo;
1903 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
1904 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1905 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1906 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
1907 5036bf37 2018-09-24 stsp goto done;
1910 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1911 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1912 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1913 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
1914 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
1916 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
1918 1a76625f 2018-10-22 stsp goto done;
1919 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1920 1a76625f 2018-10-22 stsp 0, thread_repo);
1922 1a76625f 2018-10-22 stsp goto done;
1924 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1925 1a76625f 2018-10-22 stsp if (errcode) {
1926 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
1927 1a76625f 2018-10-22 stsp goto done;
1930 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1931 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1932 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1933 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1934 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1935 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1936 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1937 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1938 1a76625f 2018-10-22 stsp s->thread_args.view = view;
1939 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1940 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1943 1a76625f 2018-10-22 stsp close_log_view(view);
1944 ba4f502b 2018-08-04 stsp return err;
1947 e5a0f69f 2018-08-18 stsp static const struct got_error *
1948 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1950 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1952 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1953 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1954 2b380cc8 2018-10-24 stsp &s->thread_args);
1955 2b380cc8 2018-10-24 stsp if (errcode)
1956 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
1959 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1960 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1961 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
1962 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
1965 e5a0f69f 2018-08-18 stsp static const struct got_error *
1966 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1967 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1969 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1970 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1971 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
1972 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
1973 669b5ffa 2018-10-07 stsp int begin_x = 0;
1974 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
1976 e5a0f69f 2018-08-18 stsp switch (ch) {
1978 1e37a5c2 2019-05-12 jcs s->quit = 1;
1981 1e37a5c2 2019-05-12 jcs case KEY_UP:
1984 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1986 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
1987 1e37a5c2 2019-05-12 jcs s->selected--;
1989 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
1990 1144d21a 2019-06-21 stsp &s->commits);
1992 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
1993 a4292ac5 2019-05-12 jcs case CTRL('b'):
1994 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1996 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
1997 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
1998 1e37a5c2 2019-05-12 jcs s->selected = 0;
2001 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
2002 1e37a5c2 2019-05-12 jcs view->nlines, &s->commits);
2005 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2008 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2010 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2011 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2012 1e37a5c2 2019-05-12 jcs s->selected++;
2015 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
2016 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
2017 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
2018 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2019 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
2021 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2022 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2023 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2024 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2025 1e37a5c2 2019-05-12 jcs if (first == NULL)
2027 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
2028 1e37a5c2 2019-05-12 jcs view->nlines, &s->last_displayed_entry,
2029 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
2030 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2031 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
2034 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2035 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2036 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2037 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2038 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2039 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2041 1e37a5c2 2019-05-12 jcs err = NULL;
2044 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2045 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2046 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2047 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2048 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2050 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2053 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2055 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2056 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2057 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2058 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2059 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2062 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2063 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2065 1e37a5c2 2019-05-12 jcs return err;
2066 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2068 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2071 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2072 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2074 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2077 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2079 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2080 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2081 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2082 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2085 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2086 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2088 1e37a5c2 2019-05-12 jcs return err;
2089 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2091 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2094 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2095 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2097 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2099 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2100 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
2102 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
2103 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
2104 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
2106 1e37a5c2 2019-05-12 jcs return err;
2107 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
2108 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
2109 1e37a5c2 2019-05-12 jcs if (lv == NULL)
2110 638f9024 2019-05-13 stsp return got_error_from_errno(
2111 1e37a5c2 2019-05-12 jcs "view_open");
2112 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
2113 d01904d4 2019-06-25 stsp s->repo, s->head_ref_name, parent_path, 0);
2115 1e37a5c2 2019-05-12 jcs return err;;
2116 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2117 1e37a5c2 2019-05-12 jcs *new_view = lv;
2119 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
2120 1e37a5c2 2019-05-12 jcs *focus_view = lv;
2122 1e37a5c2 2019-05-12 jcs return NULL;
2125 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2126 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2128 d01904d4 2019-06-25 stsp return err;
2129 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2130 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2131 d01904d4 2019-06-25 stsp if (lv == NULL)
2132 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2133 d01904d4 2019-06-25 stsp err = get_head_commit_id(&start_id, s->head_ref_name ?
2134 d01904d4 2019-06-25 stsp s->head_ref_name : GOT_REF_HEAD, s->repo);
2135 ef129c5e 2019-08-03 stsp if (err) {
2136 ef129c5e 2019-08-03 stsp view_close(lv);
2137 d01904d4 2019-06-25 stsp return err;
2139 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2140 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2141 e6b23735 2019-10-04 stsp free(start_id);
2142 e6b23735 2019-10-04 stsp view_close(lv);
2143 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2145 e6b23735 2019-10-04 stsp got_ref_list_free(s->refs);
2146 e6b23735 2019-10-04 stsp err = got_ref_list(s->refs, s->repo, NULL,
2147 e6b23735 2019-10-04 stsp got_ref_cmp_by_name, NULL);
2148 e6b23735 2019-10-04 stsp if (err) {
2149 d01904d4 2019-06-25 stsp free(start_id);
2150 ef129c5e 2019-08-03 stsp view_close(lv);
2151 50284065 2019-10-04 stsp return err;
2153 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2154 d01904d4 2019-06-25 stsp s->head_ref_name, in_repo_path, 0);
2155 ef129c5e 2019-08-03 stsp if (err) {
2156 ef129c5e 2019-08-03 stsp free(start_id);
2157 ef129c5e 2019-08-03 stsp view_close(lv);
2158 d01904d4 2019-06-25 stsp return err;;
2160 d01904d4 2019-06-25 stsp *dead_view = view;
2161 d01904d4 2019-06-25 stsp *new_view = lv;
2167 80ddbec8 2018-04-29 stsp return err;
2170 4ed7e80c 2018-05-20 stsp static const struct got_error *
2171 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2173 c2db6724 2019-01-04 stsp const struct got_error *error;
2175 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2176 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2177 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2179 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2180 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2182 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2183 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2185 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
2186 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
2188 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2189 c2db6724 2019-01-04 stsp if (error != NULL)
2190 c2db6724 2019-01-04 stsp return error;
2192 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2193 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2195 c2db6724 2019-01-04 stsp return NULL;
2198 a915003a 2019-02-05 stsp static void
2199 a915003a 2019-02-05 stsp init_curses(void)
2201 a915003a 2019-02-05 stsp initscr();
2203 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2206 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2207 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2208 a915003a 2019-02-05 stsp curs_set(0);
2209 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2210 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2213 c2db6724 2019-01-04 stsp static const struct got_error *
2214 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2216 80ddbec8 2018-04-29 stsp const struct got_error *error;
2217 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2218 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2219 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2220 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2221 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
2222 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2224 04cc582a 2018-08-01 stsp struct tog_view *view;
2226 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2228 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2229 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2230 c2db6724 2019-01-04 stsp NULL) == -1)
2231 80ddbec8 2018-04-29 stsp err(1, "pledge");
2234 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2235 80ddbec8 2018-04-29 stsp switch (ch) {
2237 80ddbec8 2018-04-29 stsp start_commit = optarg;
2240 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2241 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2242 ecb28ae0 2018-07-16 stsp err(1, "-r option");
2245 17020d27 2019-03-07 stsp usage_log();
2246 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2250 80ddbec8 2018-04-29 stsp argc -= optind;
2251 80ddbec8 2018-04-29 stsp argv += optind;
2253 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2254 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
2255 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2256 ecb28ae0 2018-07-16 stsp goto done;
2258 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2259 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2260 963f97a1 2019-03-18 stsp goto done;
2261 963f97a1 2019-03-18 stsp error = NULL;
2263 963f97a1 2019-03-18 stsp if (argc == 0) {
2264 963f97a1 2019-03-18 stsp path = strdup("");
2265 963f97a1 2019-03-18 stsp if (path == NULL) {
2266 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2267 ecb28ae0 2018-07-16 stsp goto done;
2269 963f97a1 2019-03-18 stsp } else if (argc == 1) {
2270 963f97a1 2019-03-18 stsp if (worktree) {
2271 963f97a1 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2273 963f97a1 2019-03-18 stsp if (error)
2274 963f97a1 2019-03-18 stsp goto done;
2276 963f97a1 2019-03-18 stsp path = strdup(argv[0]);
2277 963f97a1 2019-03-18 stsp if (path == NULL) {
2278 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2279 963f97a1 2019-03-18 stsp goto done;
2283 963f97a1 2019-03-18 stsp usage_log();
2285 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2286 a1fbf39a 2019-08-11 stsp if (worktree)
2287 b9d7675a 2019-08-11 stsp repo_path = strdup(
2288 b9d7675a 2019-08-11 stsp got_worktree_get_repo_path(worktree));
2290 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2292 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2293 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2294 963f97a1 2019-03-18 stsp goto done;
2297 a915003a 2019-02-05 stsp init_curses();
2299 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2300 80ddbec8 2018-04-29 stsp if (error != NULL)
2301 ecb28ae0 2018-07-16 stsp goto done;
2303 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2304 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2305 c02c541e 2019-03-29 stsp if (error)
2306 c02c541e 2019-03-29 stsp goto done;
2308 15a94983 2018-12-23 stsp if (start_commit == NULL)
2309 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&start_id, worktree ?
2310 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2313 f2b6a97d 2019-07-15 stsp error = get_head_commit_id(&start_id, start_commit, repo);
2314 f2b6a97d 2019-07-15 stsp if (error) {
2315 f2b6a97d 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
2316 f2b6a97d 2019-07-15 stsp goto done;
2317 f2b6a97d 2019-07-15 stsp error = got_repo_match_object_id_prefix(&start_id,
2318 f2b6a97d 2019-07-15 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2321 80ddbec8 2018-04-29 stsp if (error != NULL)
2322 8b473291 2019-02-21 stsp goto done;
2324 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2325 8b473291 2019-02-21 stsp if (error)
2326 ecb28ae0 2018-07-16 stsp goto done;
2328 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2329 04cc582a 2018-08-01 stsp if (view == NULL) {
2330 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2331 04cc582a 2018-08-01 stsp goto done;
2333 2fc00ff4 2019-08-31 stsp if (worktree) {
2334 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2335 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2336 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2337 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2338 2fc00ff4 2019-08-31 stsp goto done;
2341 2fc00ff4 2019-08-31 stsp error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2343 ba4f502b 2018-08-04 stsp if (error)
2344 ba4f502b 2018-08-04 stsp goto done;
2345 2fc00ff4 2019-08-31 stsp if (worktree) {
2346 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2347 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2348 2fc00ff4 2019-08-31 stsp worktree = NULL;
2350 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2352 ecb28ae0 2018-07-16 stsp free(repo_path);
2353 ecb28ae0 2018-07-16 stsp free(cwd);
2354 ecb28ae0 2018-07-16 stsp free(path);
2355 899d86c2 2018-05-10 stsp free(start_id);
2356 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2358 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2359 ec142235 2019-03-07 stsp if (worktree)
2360 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2361 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2362 80ddbec8 2018-04-29 stsp return error;
2365 4ed7e80c 2018-05-20 stsp __dead static void
2366 9f7d7167 2018-04-29 stsp usage_diff(void)
2369 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
2370 9f7d7167 2018-04-29 stsp getprogname());
2374 b304db33 2018-05-20 stsp static char *
2375 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2377 b304db33 2018-05-20 stsp char *line;
2378 b304db33 2018-05-20 stsp size_t linelen;
2379 b304db33 2018-05-20 stsp size_t lineno;
2380 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2382 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2384 b304db33 2018-05-20 stsp *len = linelen;
2385 b304db33 2018-05-20 stsp return line;
2388 4ed7e80c 2018-05-20 stsp static const struct got_error *
2389 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
2390 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
2391 c3e9aa98 2019-05-13 jcs char *header)
2393 61e69b96 2018-05-20 stsp const struct got_error *err;
2394 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
2395 b304db33 2018-05-20 stsp char *line;
2396 b304db33 2018-05-20 stsp size_t len;
2397 61e69b96 2018-05-20 stsp wchar_t *wline;
2398 e0b650dd 2018-05-20 stsp int width;
2400 26ed57b2 2018-05-19 stsp rewind(f);
2401 f7d12f7e 2018-08-01 stsp werase(view->window);
2403 a3404814 2018-09-02 stsp if (header) {
2404 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
2405 a3404814 2018-09-02 stsp if (err) {
2406 a3404814 2018-09-02 stsp return err;
2409 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2410 a3404814 2018-09-02 stsp wstandout(view->window);
2411 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2412 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2413 a3404814 2018-09-02 stsp wstandend(view->window);
2414 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2415 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2417 a3404814 2018-09-02 stsp if (max_lines <= 1)
2418 a3404814 2018-09-02 stsp return NULL;
2419 a3404814 2018-09-02 stsp max_lines--;
2423 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2424 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2425 26ed57b2 2018-05-19 stsp if (line == NULL) {
2429 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
2430 26ed57b2 2018-05-19 stsp free(line);
2434 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2435 61e69b96 2018-05-20 stsp if (err) {
2436 61e69b96 2018-05-20 stsp free(line);
2437 61e69b96 2018-05-20 stsp return err;
2439 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2440 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2441 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2442 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2443 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
2444 26ed57b2 2018-05-19 stsp free(line);
2445 2550e4c3 2018-07-13 stsp free(wline);
2446 2550e4c3 2018-07-13 stsp wline = NULL;
2448 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
2450 1a57306a 2018-09-02 stsp view_vborder(view);
2452 c3e9aa98 2019-05-13 jcs if (*eof) {
2453 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2454 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2455 c3e9aa98 2019-05-13 jcs nprinted++;
2458 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2460 c3e9aa98 2019-05-13 jcs return err;
2463 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2464 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2465 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2468 26ed57b2 2018-05-19 stsp return NULL;
2471 abd2672a 2018-12-23 stsp static char *
2472 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2474 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2475 09867e48 2019-08-13 stsp char *p, *s;
2477 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2478 09867e48 2019-08-13 stsp if (tm == NULL)
2479 09867e48 2019-08-13 stsp return NULL;
2480 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2481 09867e48 2019-08-13 stsp if (s == NULL)
2482 09867e48 2019-08-13 stsp return NULL;
2483 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2485 abd2672a 2018-12-23 stsp *p = '\0';
2489 4ed7e80c 2018-05-20 stsp static const struct got_error *
2490 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2491 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2493 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2494 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
2495 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2496 5943eee2 2019-08-13 stsp char *id_str = NULL, *logmsg = NULL;
2497 45d799e2 2018-12-23 stsp time_t committer_time;
2498 45d799e2 2018-12-23 stsp const char *author, *committer;
2499 8b473291 2019-02-21 stsp char *refs_str = NULL;
2501 8b473291 2019-02-21 stsp if (refs) {
2502 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
2504 8b473291 2019-02-21 stsp return err;
2507 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2509 abd2672a 2018-12-23 stsp return err;
2511 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2512 15a94983 2018-12-23 stsp if (err) {
2513 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2514 15a94983 2018-12-23 stsp goto done;
2517 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2518 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2519 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2520 abd2672a 2018-12-23 stsp goto done;
2522 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2523 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2524 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2525 abd2672a 2018-12-23 stsp goto done;
2527 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2528 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
2529 09867e48 2019-08-13 stsp if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2530 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2531 abd2672a 2018-12-23 stsp goto done;
2533 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2534 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2535 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2536 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2537 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2538 abd2672a 2018-12-23 stsp goto done;
2540 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
2542 5943eee2 2019-08-13 stsp goto done;
2543 5943eee2 2019-08-13 stsp if (fprintf(outfile, "%s\n", logmsg) < 0) {
2544 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2545 abd2672a 2018-12-23 stsp goto done;
2548 abd2672a 2018-12-23 stsp free(id_str);
2549 5943eee2 2019-08-13 stsp free(logmsg);
2550 8b473291 2019-02-21 stsp free(refs_str);
2551 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2552 abd2672a 2018-12-23 stsp return err;
2555 abd2672a 2018-12-23 stsp static const struct got_error *
2556 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
2558 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
2559 48ae06ee 2018-10-18 stsp FILE *f = NULL;
2560 15a94983 2018-12-23 stsp int obj_type;
2562 511a516b 2018-05-19 stsp f = got_opentemp();
2563 48ae06ee 2018-10-18 stsp if (f == NULL) {
2564 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
2565 48ae06ee 2018-10-18 stsp goto done;
2567 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
2568 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2569 fb43ecf1 2019-02-11 stsp goto done;
2573 15a94983 2018-12-23 stsp if (s->id1)
2574 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
2576 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
2578 15a94983 2018-12-23 stsp goto done;
2580 15a94983 2018-12-23 stsp switch (obj_type) {
2581 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
2582 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2583 63035f9f 2019-10-06 stsp s->diff_context, 0, s->repo, f);
2585 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
2586 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2587 63035f9f 2019-10-06 stsp s->diff_context, 0, s->repo, f);
2589 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
2590 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
2591 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
2592 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
2594 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2597 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
2598 15a087fe 2019-02-21 stsp if (s->id1 == NULL)
2599 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs, s->repo, f);
2601 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
2602 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2603 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
2604 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs,
2605 8b473291 2019-02-21 stsp s->repo, f);
2610 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
2612 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
2613 63035f9f 2019-10-06 stsp s->diff_context, 0, s->repo, f);
2617 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2621 cbe7f848 2019-02-11 stsp if (f && fflush(f) != 0 && err == NULL)
2622 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
2623 48ae06ee 2018-10-18 stsp return err;
2626 f5215bb9 2019-02-22 stsp static void
2627 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
2629 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
2630 f5215bb9 2019-02-22 stsp update_panels();
2631 f5215bb9 2019-02-22 stsp doupdate();
2634 48ae06ee 2018-10-18 stsp static const struct got_error *
2635 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
2636 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
2637 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
2639 48ae06ee 2018-10-18 stsp const struct got_error *err;
2641 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
2642 15a94983 2018-12-23 stsp int type1, type2;
2643 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
2645 15a94983 2018-12-23 stsp return err;
2646 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
2648 15a94983 2018-12-23 stsp return err;
2650 15a94983 2018-12-23 stsp if (type1 != type2)
2651 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
2654 15a94983 2018-12-23 stsp if (id1) {
2655 15a94983 2018-12-23 stsp view->state.diff.id1 = got_object_id_dup(id1);
2656 15a94983 2018-12-23 stsp if (view->state.diff.id1 == NULL)
2657 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2659 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2661 15a94983 2018-12-23 stsp view->state.diff.id2 = got_object_id_dup(id2);
2662 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
2663 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2664 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2665 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2667 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
2668 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
2669 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
2670 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
2671 fb872ab2 2019-02-21 stsp view->state.diff.log_view = log_view;
2672 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
2673 8b473291 2019-02-21 stsp view->state.diff.refs = refs;
2675 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
2676 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
2677 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
2679 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
2680 48ae06ee 2018-10-18 stsp if (err) {
2681 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2682 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2683 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2684 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2685 48ae06ee 2018-10-18 stsp return err;
2688 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
2689 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
2690 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
2692 5dc9f4bc 2018-08-04 stsp return NULL;
2695 e5a0f69f 2018-08-18 stsp static const struct got_error *
2696 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
2698 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2700 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2701 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2702 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2703 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2704 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2705 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2706 e5a0f69f 2018-08-18 stsp return err;
2709 5dc9f4bc 2018-08-04 stsp static const struct got_error *
2710 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
2712 a3404814 2018-09-02 stsp const struct got_error *err;
2713 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
2714 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
2716 a3404814 2018-09-02 stsp if (s->id1) {
2717 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
2719 a3404814 2018-09-02 stsp return err;
2721 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
2723 a3404814 2018-09-02 stsp return err;
2725 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
2726 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2727 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2728 a3404814 2018-09-02 stsp free(id_str1);
2729 a3404814 2018-09-02 stsp free(id_str2);
2730 a3404814 2018-09-02 stsp return err;
2732 a3404814 2018-09-02 stsp free(id_str1);
2733 a3404814 2018-09-02 stsp free(id_str2);
2735 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
2736 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
2740 15a087fe 2019-02-21 stsp static const struct got_error *
2741 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
2742 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
2744 d7a04538 2019-02-21 stsp const struct got_error *err;
2745 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
2746 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
2747 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
2749 15a087fe 2019-02-21 stsp free(s->id2);
2750 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
2751 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
2752 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2754 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2756 d7a04538 2019-02-21 stsp return err;
2757 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
2758 15a087fe 2019-02-21 stsp free(s->id1);
2759 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
2760 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2761 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
2762 15a087fe 2019-02-21 stsp return NULL;
2765 0cf4efb1 2018-09-29 stsp static const struct got_error *
2766 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2767 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2769 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
2770 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
2771 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
2772 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
2775 e5a0f69f 2018-08-18 stsp switch (ch) {
2777 1e37a5c2 2019-05-12 jcs case KEY_UP:
2778 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
2779 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2781 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2782 a60a9dc4 2019-05-13 jcs case CTRL('b'):
2783 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
2786 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
2787 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
2788 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2791 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2792 1e37a5c2 2019-05-12 jcs if (!s->eof)
2793 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2795 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
2796 a60a9dc4 2019-05-13 jcs case CTRL('f'):
2798 00ba99a7 2019-05-12 jcs if (s->eof)
2801 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
2802 1e37a5c2 2019-05-12 jcs char *line;
2803 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
2804 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2805 1e37a5c2 2019-05-12 jcs if (line == NULL)
2810 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
2811 1e37a5c2 2019-05-12 jcs s->diff_context--;
2812 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2813 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2817 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2818 1e37a5c2 2019-05-12 jcs s->diff_context++;
2819 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2820 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2825 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2827 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2828 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
2829 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
2830 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2833 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2838 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2842 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2843 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2845 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2846 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2850 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2852 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2854 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2855 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
2857 1e37a5c2 2019-05-12 jcs /* Display "loading..." in log view. */
2858 1e37a5c2 2019-05-12 jcs show_log_view(s->log_view);
2859 1e37a5c2 2019-05-12 jcs update_panels();
2860 1e37a5c2 2019-05-12 jcs doupdate();
2862 1e37a5c2 2019-05-12 jcs err = trigger_log_thread(1 /* load_all */,
2863 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
2864 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
2865 1e37a5c2 2019-05-12 jcs &ls->thread_args.need_commits);
2869 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2874 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
2875 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2878 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2882 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2883 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2885 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2886 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2892 bcbd79e2 2018-08-19 stsp return err;
2895 4ed7e80c 2018-05-20 stsp static const struct got_error *
2896 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2898 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2899 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2900 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2901 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2902 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2903 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
2905 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2907 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2909 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2910 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2911 eb6600df 2019-01-04 stsp NULL) == -1)
2912 26ed57b2 2018-05-19 stsp err(1, "pledge");
2915 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2916 26ed57b2 2018-05-19 stsp switch (ch) {
2918 17020d27 2019-03-07 stsp usage_diff();
2919 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2923 26ed57b2 2018-05-19 stsp argc -= optind;
2924 26ed57b2 2018-05-19 stsp argv += optind;
2926 26ed57b2 2018-05-19 stsp if (argc == 0) {
2927 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2928 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2929 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2930 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2931 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2932 15a94983 2018-12-23 stsp id_str1 = argv[0];
2933 15a94983 2018-12-23 stsp id_str2 = argv[1];
2934 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2935 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2936 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2937 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2938 15a94983 2018-12-23 stsp id_str1 = argv[1];
2939 15a94983 2018-12-23 stsp id_str2 = argv[2];
2941 26ed57b2 2018-05-19 stsp usage_diff();
2943 a915003a 2019-02-05 stsp init_curses();
2945 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2946 eb6600df 2019-01-04 stsp if (error)
2947 eb6600df 2019-01-04 stsp goto done;
2949 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
2950 26ed57b2 2018-05-19 stsp if (error)
2951 26ed57b2 2018-05-19 stsp goto done;
2953 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
2954 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
2955 26ed57b2 2018-05-19 stsp if (error)
2956 26ed57b2 2018-05-19 stsp goto done;
2958 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
2959 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
2960 26ed57b2 2018-05-19 stsp if (error)
2961 26ed57b2 2018-05-19 stsp goto done;
2963 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2964 8b473291 2019-02-21 stsp if (error)
2965 8b473291 2019-02-21 stsp goto done;
2967 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2968 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
2969 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2970 ea5e7bb5 2018-08-01 stsp goto done;
2972 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2973 5dc9f4bc 2018-08-04 stsp if (error)
2974 5dc9f4bc 2018-08-04 stsp goto done;
2975 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2977 c02c541e 2019-03-29 stsp free(repo_path);
2979 921be706 2019-06-28 stsp got_repo_close(repo);
2980 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2981 26ed57b2 2018-05-19 stsp return error;
2984 4ed7e80c 2018-05-20 stsp __dead static void
2985 9f7d7167 2018-04-29 stsp usage_blame(void)
2988 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2989 9f7d7167 2018-04-29 stsp getprogname());
2993 84451b3e 2018-07-10 stsp struct tog_blame_line {
2994 84451b3e 2018-07-10 stsp int annotated;
2995 84451b3e 2018-07-10 stsp struct got_object_id *id;
2998 4ed7e80c 2018-05-20 stsp static const struct got_error *
2999 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3000 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
3001 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
3002 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
3004 84451b3e 2018-07-10 stsp const struct got_error *err;
3005 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3006 84451b3e 2018-07-10 stsp char *line;
3007 84451b3e 2018-07-10 stsp size_t len;
3008 84451b3e 2018-07-10 stsp wchar_t *wline;
3009 27a741e5 2019-09-11 stsp int width;
3010 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3011 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3012 ab089a2a 2018-07-12 stsp char *id_str;
3014 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
3016 ab089a2a 2018-07-12 stsp return err;
3018 84451b3e 2018-07-10 stsp rewind(f);
3019 f7d12f7e 2018-08-01 stsp werase(view->window);
3021 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3022 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3023 ab089a2a 2018-07-12 stsp free(id_str);
3024 ab089a2a 2018-07-12 stsp return err;
3027 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3028 ab089a2a 2018-07-12 stsp free(line);
3029 2550e4c3 2018-07-13 stsp line = NULL;
3031 1cae65b4 2019-09-22 stsp return err;
3032 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3033 a3404814 2018-09-02 stsp wstandout(view->window);
3034 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3035 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3036 a3404814 2018-09-02 stsp wstandend(view->window);
3037 2550e4c3 2018-07-13 stsp free(wline);
3038 2550e4c3 2018-07-13 stsp wline = NULL;
3039 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3040 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3042 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3043 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
3044 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
3045 ab089a2a 2018-07-12 stsp free(id_str);
3046 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3048 ab089a2a 2018-07-12 stsp free(id_str);
3049 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3050 3f60a8ef 2018-07-10 stsp free(line);
3051 2550e4c3 2018-07-13 stsp line = NULL;
3053 3f60a8ef 2018-07-10 stsp return err;
3054 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3055 2550e4c3 2018-07-13 stsp free(wline);
3056 2550e4c3 2018-07-13 stsp wline = NULL;
3057 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3058 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3061 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
3062 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
3063 84451b3e 2018-07-10 stsp if (line == NULL) {
3067 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
3068 84451b3e 2018-07-10 stsp free(line);
3072 27a741e5 2019-09-11 stsp if (view->ncols <= 9) {
3073 27a741e5 2019-09-11 stsp width = 9;
3074 27a741e5 2019-09-11 stsp wline = wcsdup(L"");
3075 27a741e5 2019-09-11 stsp if (wline == NULL)
3076 27a741e5 2019-09-11 stsp err = got_error_from_errno("wcsdup");
3078 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line,
3079 27a741e5 2019-09-11 stsp view->ncols - 9, 9);
3080 27a741e5 2019-09-11 stsp width += 9;
3082 84451b3e 2018-07-10 stsp if (err) {
3083 84451b3e 2018-07-10 stsp free(line);
3084 84451b3e 2018-07-10 stsp return err;
3087 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3088 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3090 8d0fe45a 2019-08-12 stsp if (nlines > 0) {
3091 8d0fe45a 2019-08-12 stsp blame_line = &lines[lineno - 1];
3092 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3093 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3094 27a741e5 2019-09-11 stsp !(view->focussed &&
3095 27a741e5 2019-09-11 stsp nprinted == selected_line - 1)) {
3096 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3097 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3098 8d0fe45a 2019-08-12 stsp char *id_str;
3099 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3100 8d0fe45a 2019-08-12 stsp if (err) {
3101 8d0fe45a 2019-08-12 stsp free(line);
3102 8d0fe45a 2019-08-12 stsp free(wline);
3103 8d0fe45a 2019-08-12 stsp return err;
3105 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3106 8d0fe45a 2019-08-12 stsp free(id_str);
3107 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3109 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3110 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3113 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3114 ee41ec32 2018-07-10 stsp prev_id = NULL;
3117 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3118 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3119 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3121 27a741e5 2019-09-11 stsp waddwstr(view->window, wline);
3122 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
3123 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
3124 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3125 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3126 84451b3e 2018-07-10 stsp free(line);
3127 2550e4c3 2018-07-13 stsp free(wline);
3128 2550e4c3 2018-07-13 stsp wline = NULL;
3130 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3132 1a57306a 2018-09-02 stsp view_vborder(view);
3134 84451b3e 2018-07-10 stsp return NULL;
3137 84451b3e 2018-07-10 stsp static const struct got_error *
3138 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3140 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3141 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3142 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3143 1a76625f 2018-10-22 stsp int errcode;
3145 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3146 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3147 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3149 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3150 1a76625f 2018-10-22 stsp if (errcode)
3151 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3153 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3154 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3155 d68a0a7d 2018-07-10 stsp goto done;
3158 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3159 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3161 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3162 d68a0a7d 2018-07-10 stsp if (line->annotated)
3163 d68a0a7d 2018-07-10 stsp goto done;
3165 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3166 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3167 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3168 84451b3e 2018-07-10 stsp goto done;
3170 84451b3e 2018-07-10 stsp line->annotated = 1;
3172 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3173 1a76625f 2018-10-22 stsp if (errcode)
3174 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3175 84451b3e 2018-07-10 stsp return err;
3178 84451b3e 2018-07-10 stsp static void *
3179 84451b3e 2018-07-10 stsp blame_thread(void *arg)
3181 18430de3 2018-07-10 stsp const struct got_error *err;
3182 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
3183 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
3184 1a76625f 2018-10-22 stsp int errcode;
3186 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
3187 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3188 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
3189 fc06ba56 2019-08-22 stsp err = NULL;
3191 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3192 1a76625f 2018-10-22 stsp if (errcode)
3193 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
3194 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3196 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
3197 c9beca56 2018-07-22 stsp ta->repo = NULL;
3198 c9beca56 2018-07-22 stsp *ta->complete = 1;
3200 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3201 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
3202 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3204 18430de3 2018-07-10 stsp return (void *)err;
3207 245d91c1 2018-07-12 stsp static struct got_object_id *
3208 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3209 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
3211 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
3213 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
3214 8d0fe45a 2019-08-12 stsp return NULL;
3216 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
3217 245d91c1 2018-07-12 stsp if (!line->annotated)
3218 245d91c1 2018-07-12 stsp return NULL;
3220 245d91c1 2018-07-12 stsp return line->id;
3223 b880a918 2018-07-10 stsp static const struct got_error *
3224 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
3226 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
3229 245d91c1 2018-07-12 stsp if (blame->thread) {
3230 1a76625f 2018-10-22 stsp int errcode;
3231 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3232 1a76625f 2018-10-22 stsp if (errcode)
3233 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3234 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
3235 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
3236 1a76625f 2018-10-22 stsp if (errcode)
3237 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
3238 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3239 1a76625f 2018-10-22 stsp if (errcode)
3240 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3241 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3242 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
3243 245d91c1 2018-07-12 stsp err = NULL;
3244 245d91c1 2018-07-12 stsp blame->thread = NULL;
3246 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
3247 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
3248 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
3250 245d91c1 2018-07-12 stsp if (blame->f) {
3251 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
3252 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3253 245d91c1 2018-07-12 stsp blame->f = NULL;
3255 57670559 2018-12-23 stsp if (blame->lines) {
3256 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
3257 57670559 2018-12-23 stsp free(blame->lines[i].id);
3258 57670559 2018-12-23 stsp free(blame->lines);
3259 57670559 2018-12-23 stsp blame->lines = NULL;
3261 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
3262 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
3264 245d91c1 2018-07-12 stsp return err;
3267 245d91c1 2018-07-12 stsp static const struct got_error *
3268 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
3270 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
3271 fc06ba56 2019-08-22 stsp int *done = arg;
3272 fc06ba56 2019-08-22 stsp int errcode;
3274 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3275 fc06ba56 2019-08-22 stsp if (errcode)
3276 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3277 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
3279 fc06ba56 2019-08-22 stsp if (*done)
3280 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
3282 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3283 fc06ba56 2019-08-22 stsp if (errcode)
3284 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3285 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
3287 fc06ba56 2019-08-22 stsp return err;
3290 fc06ba56 2019-08-22 stsp static const struct got_error *
3291 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3292 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
3293 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
3294 245d91c1 2018-07-12 stsp struct got_repository *repo)
3296 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
3297 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
3298 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
3299 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
3300 15a94983 2018-12-23 stsp int obj_type;
3302 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3304 15a94983 2018-12-23 stsp return err;
3305 15a94983 2018-12-23 stsp if (obj_id == NULL)
3306 15a94983 2018-12-23 stsp return got_error(GOT_ERR_NO_OBJ);
3308 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
3310 84451b3e 2018-07-10 stsp goto done;
3312 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
3313 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3314 84451b3e 2018-07-10 stsp goto done;
3317 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3319 a70480e0 2018-06-23 stsp goto done;
3320 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
3321 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
3322 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3323 84451b3e 2018-07-10 stsp goto done;
3325 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3326 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
3327 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
3328 84451b3e 2018-07-10 stsp goto done;
3330 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
3331 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
3332 b02560ec 2019-08-19 stsp blame->nlines--;
3334 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
3335 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
3336 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3337 84451b3e 2018-07-10 stsp goto done;
3340 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
3342 bd24772e 2018-07-11 stsp goto done;
3344 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
3345 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
3346 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
3347 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
3348 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
3349 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3350 245d91c1 2018-07-12 stsp goto done;
3352 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
3354 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
3355 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
3356 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
3357 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
3358 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
3359 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_arg = done;
3360 245d91c1 2018-07-12 stsp *blame_complete = 0;
3364 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
3365 27d434c2 2018-09-15 stsp free(obj_id);
3367 245d91c1 2018-07-12 stsp stop_blame(blame);
3368 245d91c1 2018-07-12 stsp return err;
3371 245d91c1 2018-07-12 stsp static const struct got_error *
3372 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
3373 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3374 8b473291 2019-02-21 stsp struct got_repository *repo)
3376 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
3377 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3379 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
3381 c4843652 2019-08-12 stsp s->path = strdup(path);
3382 c4843652 2019-08-12 stsp if (s->path == NULL)
3383 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
3385 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
3386 c4843652 2019-08-12 stsp if (err) {
3387 c4843652 2019-08-12 stsp free(s->path);
3388 7cbe629d 2018-08-04 stsp return err;
3391 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
3392 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
3393 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
3394 fb2756b9 2018-08-04 stsp s->selected_line = 1;
3395 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
3396 fb2756b9 2018-08-04 stsp s->repo = repo;
3397 8b473291 2019-02-21 stsp s->refs = refs;
3398 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
3399 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
3401 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
3402 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
3403 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
3404 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
3405 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
3407 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
3408 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
3409 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
3410 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
3413 e5a0f69f 2018-08-18 stsp static const struct got_error *
3414 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
3416 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3417 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3419 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
3420 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
3422 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
3423 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
3424 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
3425 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3426 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
3429 e5a0f69f 2018-08-18 stsp free(s->path);
3431 e5a0f69f 2018-08-18 stsp return err;
3434 7cbe629d 2018-08-04 stsp static const struct got_error *
3435 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
3437 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
3439 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
3440 6c4c42e0 2019-06-24 stsp return NULL;
3443 6c4c42e0 2019-06-24 stsp static int
3444 6c4c42e0 2019-06-24 stsp match_line(const char *line, regex_t *regex)
3446 6c4c42e0 2019-06-24 stsp regmatch_t regmatch;
3448 6c4c42e0 2019-06-24 stsp return regexec(regex, line, 1, ®match, 0) == 0;
3452 6c4c42e0 2019-06-24 stsp static const struct got_error *
3453 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
3455 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
3456 6c4c42e0 2019-06-24 stsp int lineno;
3458 6c4c42e0 2019-06-24 stsp if (!view->searching) {
3459 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3460 6c4c42e0 2019-06-24 stsp return NULL;
3463 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
3464 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3465 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
3467 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
3469 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3470 6c4c42e0 2019-06-24 stsp lineno = 1;
3472 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
3475 6c4c42e0 2019-06-24 stsp while (1) {
3476 6c4c42e0 2019-06-24 stsp char *line = NULL;
3477 6c4c42e0 2019-06-24 stsp off_t offset;
3478 6c4c42e0 2019-06-24 stsp size_t len;
3480 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
3481 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
3482 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3483 6c4c42e0 2019-06-24 stsp free(line);
3487 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3488 6c4c42e0 2019-06-24 stsp lineno = 1;
3490 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
3493 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
3494 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
3495 6c4c42e0 2019-06-24 stsp free(line);
3496 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
3498 6c4c42e0 2019-06-24 stsp free(line);
3499 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
3500 2246482e 2019-06-25 stsp if (line && match_line(line, &view->regex)) {
3501 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3502 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
3503 6c4c42e0 2019-06-24 stsp free(line);
3506 6c4c42e0 2019-06-24 stsp free(line);
3507 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3513 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
3514 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
3515 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
3518 6c4c42e0 2019-06-24 stsp return NULL;
3521 6c4c42e0 2019-06-24 stsp static const struct got_error *
3522 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
3524 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3525 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
3526 2b380cc8 2018-10-24 stsp int errcode;
3528 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
3529 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
3530 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
3531 2b380cc8 2018-10-24 stsp if (errcode)
3532 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
3534 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
3537 51fe7530 2019-08-19 stsp if (s->blame_complete)
3538 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
3540 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
3541 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
3542 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
3543 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
3545 669b5ffa 2018-10-07 stsp view_vborder(view);
3546 e5a0f69f 2018-08-18 stsp return err;
3549 e5a0f69f 2018-08-18 stsp static const struct got_error *
3550 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
3551 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3553 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
3554 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
3555 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3556 669b5ffa 2018-10-07 stsp int begin_x = 0;
3558 e5a0f69f 2018-08-18 stsp switch (ch) {
3560 1e37a5c2 2019-05-12 jcs s->done = 1;
3563 1e37a5c2 2019-05-12 jcs case KEY_UP:
3564 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
3565 1e37a5c2 2019-05-12 jcs s->selected_line--;
3566 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
3567 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3568 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3570 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3571 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
3572 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
3575 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
3576 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
3577 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
3579 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3582 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3583 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
3584 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
3585 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
3586 1e37a5c2 2019-05-12 jcs s->selected_line++;
3587 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
3588 1e37a5c2 2019-05-12 jcs s->blame.nlines)
3589 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3592 1e37a5c2 2019-05-12 jcs case 'p': {
3593 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3594 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
3595 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3596 1e37a5c2 2019-05-12 jcs if (id == NULL)
3598 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
3599 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
3600 15a94983 2018-12-23 stsp struct got_object_qid *pid;
3601 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
3602 1e37a5c2 2019-05-12 jcs int obj_type;
3603 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
3604 1e37a5c2 2019-05-12 jcs s->repo, id);
3607 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
3608 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
3609 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
3610 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3613 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
3614 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
3615 1e37a5c2 2019-05-12 jcs pid->id, s->path);
3616 e5a0f69f 2018-08-18 stsp if (err) {
3617 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
3618 1e37a5c2 2019-05-12 jcs err = NULL;
3619 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3622 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
3624 1e37a5c2 2019-05-12 jcs free(blob_id);
3625 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
3626 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
3627 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3630 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3632 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3634 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
3635 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
3637 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3642 1e37a5c2 2019-05-12 jcs s->done = 1;
3643 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3644 1e37a5c2 2019-05-12 jcs s->done = 0;
3645 1e37a5c2 2019-05-12 jcs if (thread_err)
3647 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3648 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
3649 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3650 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3651 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
3652 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
3657 1e37a5c2 2019-05-12 jcs case 'B': {
3658 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
3659 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
3660 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
3662 1e37a5c2 2019-05-12 jcs s->done = 1;
3663 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3664 1e37a5c2 2019-05-12 jcs s->done = 0;
3665 1e37a5c2 2019-05-12 jcs if (thread_err)
3667 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3668 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
3669 1e37a5c2 2019-05-12 jcs s->blamed_commit =
3670 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
3671 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3672 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3673 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
3674 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
3679 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
3680 1e37a5c2 2019-05-12 jcs case '\r': {
3681 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3682 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
3683 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
3684 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
3685 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3686 1e37a5c2 2019-05-12 jcs if (id == NULL)
3688 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
3691 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
3692 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
3693 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
3694 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
3695 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3696 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
3697 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3698 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
3701 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
3702 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
3703 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3705 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3708 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
3709 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
3712 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
3714 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3717 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
3718 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
3720 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
3725 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3727 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3728 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
3729 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
3732 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3733 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
3734 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3735 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3738 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
3739 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
3740 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
3741 1e37a5c2 2019-05-12 jcs view->nlines - 2;
3743 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
3744 1e37a5c2 2019-05-12 jcs s->blame.nlines -
3745 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
3747 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
3748 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
3749 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3750 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3756 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
3759 a70480e0 2018-06-23 stsp static const struct got_error *
3760 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
3762 a70480e0 2018-06-23 stsp const struct got_error *error;
3763 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
3764 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3765 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
3766 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3767 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3768 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
3770 e1cd8fed 2018-08-01 stsp struct tog_view *view;
3772 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3774 a70480e0 2018-06-23 stsp #ifndef PROFILE
3775 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3776 8e94dd5b 2019-01-04 stsp NULL) == -1)
3777 a70480e0 2018-06-23 stsp err(1, "pledge");
3780 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3781 a70480e0 2018-06-23 stsp switch (ch) {
3783 a70480e0 2018-06-23 stsp commit_id_str = optarg;
3786 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
3787 69069811 2018-08-02 stsp if (repo_path == NULL)
3788 69069811 2018-08-02 stsp err(1, "-r option");
3791 17020d27 2019-03-07 stsp usage_blame();
3792 a70480e0 2018-06-23 stsp /* NOTREACHED */
3796 a70480e0 2018-06-23 stsp argc -= optind;
3797 a70480e0 2018-06-23 stsp argv += optind;
3799 69069811 2018-08-02 stsp if (argc == 1)
3800 69069811 2018-08-02 stsp path = argv[0];
3802 a70480e0 2018-06-23 stsp usage_blame();
3804 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
3805 69069811 2018-08-02 stsp if (cwd == NULL) {
3806 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3807 69069811 2018-08-02 stsp goto done;
3809 69069811 2018-08-02 stsp if (repo_path == NULL) {
3810 eb41ed75 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3811 eb41ed75 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3812 69069811 2018-08-02 stsp goto done;
3814 eb41ed75 2019-02-05 stsp error = NULL;
3815 eb41ed75 2019-02-05 stsp if (worktree) {
3816 eb41ed75 2019-02-05 stsp repo_path =
3817 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3818 eb41ed75 2019-02-05 stsp if (repo_path == NULL)
3819 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3820 eb41ed75 2019-02-05 stsp if (error)
3821 eb41ed75 2019-02-05 stsp goto done;
3823 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
3824 eb41ed75 2019-02-05 stsp if (repo_path == NULL) {
3825 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3826 eb41ed75 2019-02-05 stsp goto done;
3831 a915003a 2019-02-05 stsp init_curses();
3833 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3834 c02c541e 2019-03-29 stsp if (error != NULL)
3835 8e94dd5b 2019-01-04 stsp goto done;
3837 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3838 c02c541e 2019-03-29 stsp if (error)
3839 92205607 2019-01-04 stsp goto done;
3841 eb41ed75 2019-02-05 stsp if (worktree) {
3842 eb41ed75 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3843 eb41ed75 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3844 eb41ed75 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3845 eb41ed75 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3846 eb41ed75 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3847 eb41ed75 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3848 eb41ed75 2019-02-05 stsp path) == -1) {
3849 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3850 eb41ed75 2019-02-05 stsp goto done;
3852 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3855 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3857 eb41ed75 2019-02-05 stsp if (error)
3858 69069811 2018-08-02 stsp goto done;
3860 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
3861 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
3862 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3863 a70480e0 2018-06-23 stsp if (error != NULL)
3864 66b4983c 2018-06-23 stsp goto done;
3865 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3866 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
3868 f2b6a97d 2019-07-15 stsp error = get_head_commit_id(&commit_id, commit_id_str, repo);
3869 f2b6a97d 2019-07-15 stsp if (error) {
3870 f2b6a97d 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
3871 f2b6a97d 2019-07-15 stsp goto done;
3872 f2b6a97d 2019-07-15 stsp error = got_repo_match_object_id_prefix(&commit_id,
3873 f2b6a97d 2019-07-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
3876 a19e88aa 2018-06-23 stsp if (error != NULL)
3877 8b473291 2019-02-21 stsp goto done;
3879 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3880 8b473291 2019-02-21 stsp if (error)
3881 a19e88aa 2018-06-23 stsp goto done;
3883 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3884 e1cd8fed 2018-08-01 stsp if (view == NULL) {
3885 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3886 e1cd8fed 2018-08-01 stsp goto done;
3888 8b473291 2019-02-21 stsp error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3889 7cbe629d 2018-08-04 stsp if (error)
3890 7cbe629d 2018-08-04 stsp goto done;
3891 12314ad4 2019-08-31 stsp if (worktree) {
3892 12314ad4 2019-08-31 stsp /* Release work tree lock. */
3893 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
3894 12314ad4 2019-08-31 stsp worktree = NULL;
3896 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3898 69069811 2018-08-02 stsp free(repo_path);
3899 69069811 2018-08-02 stsp free(cwd);
3900 a70480e0 2018-06-23 stsp free(commit_id);
3901 eb41ed75 2019-02-05 stsp if (worktree)
3902 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
3904 a70480e0 2018-06-23 stsp got_repo_close(repo);
3905 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3906 a70480e0 2018-06-23 stsp return error;
3909 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3910 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
3911 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
3912 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
3913 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
3914 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
3915 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
3917 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3918 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
3919 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
3920 ffd1d5e5 2018-06-23 stsp int width, n;
3922 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
3924 f7d12f7e 2018-08-01 stsp werase(view->window);
3926 ffd1d5e5 2018-06-23 stsp if (limit == 0)
3927 ffd1d5e5 2018-06-23 stsp return NULL;
3929 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, label, view->ncols, 0);
3931 ffd1d5e5 2018-06-23 stsp return err;
3932 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3933 a3404814 2018-09-02 stsp wstandout(view->window);
3934 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3935 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3936 a3404814 2018-09-02 stsp wstandend(view->window);
3937 2550e4c3 2018-07-13 stsp free(wline);
3938 2550e4c3 2018-07-13 stsp wline = NULL;
3939 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3940 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3941 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3942 ffd1d5e5 2018-06-23 stsp return NULL;
3943 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
3945 ce52c690 2018-06-23 stsp return err;
3946 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3947 2550e4c3 2018-07-13 stsp free(wline);
3948 2550e4c3 2018-07-13 stsp wline = NULL;
3949 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3950 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3951 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3952 ffd1d5e5 2018-06-23 stsp return NULL;
3953 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3954 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
3955 a1eca9bb 2018-06-23 stsp return NULL;
3957 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3958 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
3959 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
3960 0cf4efb1 2018-09-29 stsp if (view->focussed)
3961 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3962 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
3964 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
3965 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
3966 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3967 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3968 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3969 ffd1d5e5 2018-06-23 stsp return NULL;
3973 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
3974 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3977 ffd1d5e5 2018-06-23 stsp while (te) {
3978 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
3979 848d6979 2019-08-12 stsp const char *modestr = "";
3981 1d13200f 2018-07-12 stsp if (show_ids) {
3982 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
3984 638f9024 2019-05-13 stsp return got_error_from_errno(
3985 230a42bd 2019-05-11 jcs "got_object_id_str");
3987 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
3988 63c5ca5d 2019-08-24 stsp modestr = "$";
3989 63c5ca5d 2019-08-24 stsp else if (S_ISLNK(te->mode))
3990 848d6979 2019-08-12 stsp modestr = "@";
3991 848d6979 2019-08-12 stsp else if (S_ISDIR(te->mode))
3992 848d6979 2019-08-12 stsp modestr = "/";
3993 848d6979 2019-08-12 stsp else if (te->mode & S_IXUSR)
3994 848d6979 2019-08-12 stsp modestr = "*";
3995 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3996 848d6979 2019-08-12 stsp te->name, modestr) == -1) {
3997 1d13200f 2018-07-12 stsp free(id_str);
3998 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4000 1d13200f 2018-07-12 stsp free(id_str);
4001 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4002 ffd1d5e5 2018-06-23 stsp if (err) {
4003 ffd1d5e5 2018-06-23 stsp free(line);
4006 ffd1d5e5 2018-06-23 stsp if (n == selected) {
4007 0cf4efb1 2018-09-29 stsp if (view->focussed)
4008 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4009 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
4011 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4012 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4013 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4014 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
4015 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4016 ffd1d5e5 2018-06-23 stsp free(line);
4017 2550e4c3 2018-07-13 stsp free(wline);
4018 2550e4c3 2018-07-13 stsp wline = NULL;
4020 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4021 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
4022 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4024 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
4027 ffd1d5e5 2018-06-23 stsp return err;
4030 ffd1d5e5 2018-06-23 stsp static void
4031 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
4032 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
4033 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
4035 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
4038 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
4041 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
4042 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
4043 ffd1d5e5 2018-06-23 stsp if (!isroot)
4044 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4048 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
4049 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
4050 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
4051 ffd1d5e5 2018-06-23 stsp prev = te;
4052 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
4054 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
4055 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
4057 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
4058 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4061 768394f3 2019-01-24 stsp static int
4062 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4063 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
4064 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
4066 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4067 ffd1d5e5 2018-06-23 stsp int n = 0;
4069 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
4070 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
4072 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
4073 768394f3 2019-01-24 stsp last = last_displayed_entry;
4074 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4075 768394f3 2019-01-24 stsp last = SIMPLEQ_NEXT(last, entry);
4076 768394f3 2019-01-24 stsp if (last) {
4077 768394f3 2019-01-24 stsp *first_displayed_entry = next;
4078 768394f3 2019-01-24 stsp next = SIMPLEQ_NEXT(next, entry);
4084 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4085 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4086 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4088 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4089 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4090 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4092 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4093 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
4095 ce52c690 2018-06-23 stsp len += strlen(te->name);
4097 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4098 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4099 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4101 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4102 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4103 d9765a41 2018-06-23 stsp while (pt) {
4104 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
4105 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4106 cb2ebc8a 2018-06-23 stsp goto done;
4108 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4109 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4110 cb2ebc8a 2018-06-23 stsp goto done;
4112 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4115 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
4116 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4117 ce52c690 2018-06-23 stsp goto done;
4121 ce52c690 2018-06-23 stsp if (err) {
4122 ce52c690 2018-06-23 stsp free(*path);
4123 ce52c690 2018-06-23 stsp *path = NULL;
4125 ce52c690 2018-06-23 stsp return err;
4128 ce52c690 2018-06-23 stsp static const struct got_error *
4129 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4130 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4131 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4132 8b473291 2019-02-21 stsp struct got_repository *repo)
4134 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
4135 ce52c690 2018-06-23 stsp char *path;
4136 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
4138 a0de39f3 2019-08-09 stsp *new_view = NULL;
4140 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
4142 ce52c690 2018-06-23 stsp return err;
4144 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4145 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
4146 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
4147 83ce39e3 2019-08-12 stsp goto done;
4150 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
4151 e5a0f69f 2018-08-18 stsp if (err) {
4152 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
4153 fc06ba56 2019-08-22 stsp err = NULL;
4154 e5a0f69f 2018-08-18 stsp view_close(blame_view);
4156 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
4158 83ce39e3 2019-08-12 stsp free(path);
4159 69efd4c4 2018-07-18 stsp return err;
4162 69efd4c4 2018-07-18 stsp static const struct got_error *
4163 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
4164 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4165 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4166 8b473291 2019-02-21 stsp struct got_repository *repo)
4168 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
4169 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
4170 69efd4c4 2018-07-18 stsp char *path;
4172 a0de39f3 2019-08-09 stsp *new_view = NULL;
4174 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4175 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
4176 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
4178 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
4180 69efd4c4 2018-07-18 stsp return err;
4182 d01904d4 2019-06-25 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4184 e5a0f69f 2018-08-18 stsp view_close(log_view);
4186 e5a0f69f 2018-08-18 stsp *new_view = log_view;
4187 cb2ebc8a 2018-06-23 stsp free(path);
4188 cb2ebc8a 2018-06-23 stsp return err;
4191 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4192 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
4193 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4194 8b473291 2019-02-21 stsp struct got_repository *repo)
4196 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4197 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
4198 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4200 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
4202 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
4203 ffd1d5e5 2018-06-23 stsp if (err != NULL)
4204 ffd1d5e5 2018-06-23 stsp goto done;
4206 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4207 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4208 ffd1d5e5 2018-06-23 stsp goto done;
4211 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
4212 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
4213 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
4214 8d0fe45a 2019-08-12 stsp s->selected_entry = SIMPLEQ_FIRST(&s->entries->head);
4215 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
4216 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
4217 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4218 6484ec90 2018-09-29 stsp goto done;
4220 8b473291 2019-02-21 stsp s->refs = refs;
4221 fb2756b9 2018-08-04 stsp s->repo = repo;
4223 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
4224 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
4225 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
4226 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
4227 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
4229 ad80ab7b 2018-08-04 stsp free(commit_id_str);
4230 6484ec90 2018-09-29 stsp if (err) {
4231 fb2756b9 2018-08-04 stsp free(s->tree_label);
4232 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4234 ad80ab7b 2018-08-04 stsp return err;
4237 e5a0f69f 2018-08-18 stsp static const struct got_error *
4238 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
4240 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4242 fb2756b9 2018-08-04 stsp free(s->tree_label);
4243 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4244 6484ec90 2018-09-29 stsp free(s->commit_id);
4245 6484ec90 2018-09-29 stsp s->commit_id = NULL;
4246 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
4247 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
4248 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
4249 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
4250 ad80ab7b 2018-08-04 stsp free(parent);
4253 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
4254 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
4255 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
4257 7c32bd05 2019-06-22 stsp return NULL;
4260 7c32bd05 2019-06-22 stsp static const struct got_error *
4261 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
4263 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4265 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
4266 7c32bd05 2019-06-22 stsp return NULL;
4269 7c32bd05 2019-06-22 stsp static int
4270 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4272 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
4274 7c32bd05 2019-06-22 stsp return regexec(regex, te->name, 1, ®match, 0) == 0;
4277 7c32bd05 2019-06-22 stsp static const struct got_error *
4278 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
4280 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4281 a0de39f3 2019-08-09 stsp struct got_tree_entry *entry = NULL, *te;
4283 7c32bd05 2019-06-22 stsp if (!view->searching) {
4284 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4285 7c32bd05 2019-06-22 stsp return NULL;
4288 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4289 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
4290 7c32bd05 2019-06-22 stsp if (s->selected_entry)
4291 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_NEXT(s->selected_entry, entry);
4293 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4296 7c32bd05 2019-06-22 stsp if (s->selected_entry == NULL) {
4297 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4298 7c32bd05 2019-06-22 stsp entry = te;
4300 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4301 7c32bd05 2019-06-22 stsp entry = te;
4302 7c32bd05 2019-06-22 stsp if (SIMPLEQ_NEXT(te, entry) ==
4303 7c32bd05 2019-06-22 stsp s->selected_entry)
4309 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4310 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4312 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4313 7c32bd05 2019-06-22 stsp entry = te;
4317 7c32bd05 2019-06-22 stsp while (1) {
4318 7c32bd05 2019-06-22 stsp if (entry == NULL) {
4319 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
4320 ac66afb8 2019-06-24 stsp view->search_next_done = 1;
4321 ac66afb8 2019-06-24 stsp return NULL;
4323 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4324 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4326 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4327 7c32bd05 2019-06-22 stsp entry = te;
4331 7c32bd05 2019-06-22 stsp if (match_tree_entry(entry, &view->regex)) {
4332 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4333 7c32bd05 2019-06-22 stsp s->matched_entry = entry;
4337 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4338 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_NEXT(entry, entry);
4340 7c32bd05 2019-06-22 stsp if (SIMPLEQ_FIRST(&s->entries->head) == entry)
4341 7c32bd05 2019-06-22 stsp entry = NULL;
4343 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4344 7c32bd05 2019-06-22 stsp if (SIMPLEQ_NEXT(te, entry) == entry) {
4345 7c32bd05 2019-06-22 stsp entry = te;
4353 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4354 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
4355 7c32bd05 2019-06-22 stsp s->selected = 0;
4358 e5a0f69f 2018-08-18 stsp return NULL;
4361 ad80ab7b 2018-08-04 stsp static const struct got_error *
4362 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
4364 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
4365 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4366 e5a0f69f 2018-08-18 stsp char *parent_path;
4368 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
4370 e5a0f69f 2018-08-18 stsp return err;
4372 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
4373 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
4374 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
4375 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
4376 e5a0f69f 2018-08-18 stsp free(parent_path);
4378 669b5ffa 2018-10-07 stsp view_vborder(view);
4379 e5a0f69f 2018-08-18 stsp return err;
4382 e5a0f69f 2018-08-18 stsp static const struct got_error *
4383 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
4384 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4386 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4387 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
4388 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
4389 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
4391 e5a0f69f 2018-08-18 stsp switch (ch) {
4393 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
4396 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
4398 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4399 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4400 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
4401 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
4402 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
4403 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4404 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4406 1e37a5c2 2019-05-12 jcs return err;
4407 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
4409 1e37a5c2 2019-05-12 jcs view_close(log_view);
4412 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
4413 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4415 1e37a5c2 2019-05-12 jcs *new_view = log_view;
4418 1e37a5c2 2019-05-12 jcs case KEY_UP:
4419 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
4420 1e37a5c2 2019-05-12 jcs s->selected--;
4421 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
4424 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
4426 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
4427 1e37a5c2 2019-05-12 jcs s->entries, s->tree == s->root);
4429 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4430 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
4431 1e37a5c2 2019-05-12 jcs MAX(0, view->nlines - 4 - s->selected), s->entries,
4432 1e37a5c2 2019-05-12 jcs s->tree == s->root);
4433 1e37a5c2 2019-05-12 jcs s->selected = 0;
4434 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_FIRST(&s->entries->head) ==
4435 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
4436 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
4439 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4440 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
4441 1e37a5c2 2019-05-12 jcs s->selected++;
4444 00ba99a7 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry) == NULL)
4445 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
4447 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
4448 1e37a5c2 2019-05-12 jcs s->last_displayed_entry, s->entries);
4450 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4451 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
4453 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
4454 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
4455 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
4458 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
4459 1e37a5c2 2019-05-12 jcs view->nlines, s->last_displayed_entry, s->entries);
4460 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
4461 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
4462 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
4463 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
4465 1e37a5c2 2019-05-12 jcs ndisplayed++;
4466 1e37a5c2 2019-05-12 jcs te = SIMPLEQ_NEXT(te, entry);
4467 1e37a5c2 2019-05-12 jcs } while (te);
4468 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
4471 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4473 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
4474 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
4475 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
4476 1e37a5c2 2019-05-12 jcs /* user selected '..' */
4477 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
4479 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
4480 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
4482 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
4483 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
4484 1e37a5c2 2019-05-12 jcs s->entries =
4485 1e37a5c2 2019-05-12 jcs got_object_tree_get_entries(s->tree);
4486 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
4487 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
4488 1e37a5c2 2019-05-12 jcs s->selected_entry =
4489 1e37a5c2 2019-05-12 jcs parent->selected_entry;
4490 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
4491 1e37a5c2 2019-05-12 jcs free(parent);
4492 1e37a5c2 2019-05-12 jcs } else if (S_ISDIR(s->selected_entry->mode)) {
4493 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
4494 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&subtree,
4495 1e37a5c2 2019-05-12 jcs s->repo, s->selected_entry->id);
4498 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
4499 941e9f74 2019-05-21 stsp if (err) {
4500 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
4503 1e37a5c2 2019-05-12 jcs } else if (S_ISREG(s->selected_entry->mode)) {
4504 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
4505 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
4506 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
4508 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
4509 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
4510 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
4513 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
4514 669b5ffa 2018-10-07 stsp err = view_close_child(view);
4516 669b5ffa 2018-10-07 stsp return err;
4517 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
4518 669b5ffa 2018-10-07 stsp if (err) {
4519 1e37a5c2 2019-05-12 jcs view_close(blame_view);
4522 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
4523 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
4525 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
4528 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4529 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
4530 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
4536 ffd1d5e5 2018-06-23 stsp return err;
4539 ffd1d5e5 2018-06-23 stsp __dead static void
4540 ffd1d5e5 2018-06-23 stsp usage_tree(void)
4543 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
4544 ffd1d5e5 2018-06-23 stsp getprogname());
4548 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4549 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
4551 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
4552 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
4553 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4554 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
4555 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4556 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
4557 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
4558 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
4560 5221c383 2018-08-01 stsp struct tog_view *view;
4562 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4564 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
4565 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4566 d188b9a6 2019-01-04 stsp NULL) == -1)
4567 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
4570 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
4571 ffd1d5e5 2018-06-23 stsp switch (ch) {
4573 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
4576 17020d27 2019-03-07 stsp usage_tree();
4577 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
4581 ffd1d5e5 2018-06-23 stsp argc -= optind;
4582 ffd1d5e5 2018-06-23 stsp argv += optind;
4584 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
4585 52185f70 2019-02-05 stsp struct got_worktree *worktree;
4586 52185f70 2019-02-05 stsp char *cwd = getcwd(NULL, 0);
4587 52185f70 2019-02-05 stsp if (cwd == NULL)
4588 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
4589 52185f70 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4590 52185f70 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4591 52185f70 2019-02-05 stsp goto done;
4592 52185f70 2019-02-05 stsp if (worktree) {
4593 52185f70 2019-02-05 stsp free(cwd);
4594 52185f70 2019-02-05 stsp repo_path =
4595 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4596 52185f70 2019-02-05 stsp got_worktree_close(worktree);
4598 52185f70 2019-02-05 stsp repo_path = cwd;
4599 52185f70 2019-02-05 stsp if (repo_path == NULL) {
4600 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4601 52185f70 2019-02-05 stsp goto done;
4603 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
4604 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
4605 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
4606 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
4608 ffd1d5e5 2018-06-23 stsp usage_log();
4610 a915003a 2019-02-05 stsp init_curses();
4612 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4613 c02c541e 2019-03-29 stsp if (error != NULL)
4614 52185f70 2019-02-05 stsp goto done;
4616 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4617 c02c541e 2019-03-29 stsp if (error)
4618 52185f70 2019-02-05 stsp goto done;
4620 15a94983 2018-12-23 stsp if (commit_id_arg == NULL)
4621 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&commit_id, GOT_REF_HEAD, repo);
4623 f2b6a97d 2019-07-15 stsp error = get_head_commit_id(&commit_id, commit_id_arg, repo);
4624 f2b6a97d 2019-07-15 stsp if (error) {
4625 f2b6a97d 2019-07-15 stsp if (error->code != GOT_ERR_NOT_REF)
4626 f2b6a97d 2019-07-15 stsp goto done;
4627 f2b6a97d 2019-07-15 stsp error = got_repo_match_object_id_prefix(&commit_id,
4628 f2b6a97d 2019-07-15 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
4631 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4632 ffd1d5e5 2018-06-23 stsp goto done;
4634 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4635 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4636 ffd1d5e5 2018-06-23 stsp goto done;
4638 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
4639 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
4640 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4641 8b473291 2019-02-21 stsp goto done;
4643 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4644 8b473291 2019-02-21 stsp if (error)
4645 ffd1d5e5 2018-06-23 stsp goto done;
4647 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
4648 5221c383 2018-08-01 stsp if (view == NULL) {
4649 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4650 5221c383 2018-08-01 stsp goto done;
4652 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
4653 ad80ab7b 2018-08-04 stsp if (error)
4654 ad80ab7b 2018-08-04 stsp goto done;
4655 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4657 52185f70 2019-02-05 stsp free(repo_path);
4658 ffd1d5e5 2018-06-23 stsp free(commit_id);
4659 ffd1d5e5 2018-06-23 stsp if (commit)
4660 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
4662 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
4664 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
4665 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4666 ffd1d5e5 2018-06-23 stsp return error;
4669 ce5b7c56 2019-07-09 stsp static void
4670 ce5b7c56 2019-07-09 stsp list_commands(void)
4674 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
4675 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
4676 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
4677 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->name);
4679 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
4682 4ed7e80c 2018-05-20 stsp __dead static void
4683 ce5b7c56 2019-07-09 stsp usage(int hflag)
4685 53ccebc2 2019-07-30 stsp fprintf(stderr, "usage: %s [-h] [-V] [command] [arg ...]\n",
4686 53ccebc2 2019-07-30 stsp getprogname());
4687 ce5b7c56 2019-07-09 stsp if (hflag)
4688 ce5b7c56 2019-07-09 stsp list_commands();
4692 c2301be8 2018-04-30 stsp static char **
4693 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
4695 c2301be8 2018-04-30 stsp char **argv;
4696 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
4698 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
4699 c2301be8 2018-04-30 stsp if (argv == NULL)
4700 c2301be8 2018-04-30 stsp err(1, "calloc");
4701 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
4702 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
4703 e10c916e 2019-09-15 hiltjo err(1, "strdup");
4704 c2301be8 2018-04-30 stsp if (arg1) {
4705 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
4706 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
4707 e10c916e 2019-09-15 hiltjo err(1, "strdup");
4710 c2301be8 2018-04-30 stsp return argv;
4714 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
4716 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
4717 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
4718 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
4719 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
4721 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
4723 53ccebc2 2019-07-30 stsp while ((ch = getopt(argc, argv, "hV")) != -1) {
4724 9f7d7167 2018-04-29 stsp switch (ch) {
4726 9f7d7167 2018-04-29 stsp hflag = 1;
4729 53ccebc2 2019-07-30 stsp Vflag = 1;
4732 ce5b7c56 2019-07-09 stsp usage(hflag);
4733 9f7d7167 2018-04-29 stsp /* NOTREACHED */
4737 9f7d7167 2018-04-29 stsp argc -= optind;
4738 9f7d7167 2018-04-29 stsp argv += optind;
4739 9f7d7167 2018-04-29 stsp optind = 0;
4740 c2301be8 2018-04-30 stsp optreset = 1;
4742 53ccebc2 2019-07-30 stsp if (Vflag) {
4743 53ccebc2 2019-07-30 stsp got_version_print_str();
4747 c2301be8 2018-04-30 stsp if (argc == 0) {
4748 f29d3e89 2018-06-23 stsp if (hflag)
4749 ce5b7c56 2019-07-09 stsp usage(hflag);
4750 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
4751 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
4752 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
4757 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
4758 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
4759 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
4760 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
4761 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
4766 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
4767 d70c3147 2019-07-09 stsp fprintf(stderr, "%s: unknown command '%s'\n",
4768 3642c4c6 2019-07-09 stsp getprogname(), argv[0]);
4769 ce5b7c56 2019-07-09 stsp list_commands();
4774 3642c4c6 2019-07-09 stsp if (hflag)
4775 3642c4c6 2019-07-09 stsp cmd->cmd_usage();
4777 3642c4c6 2019-07-09 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4780 c2301be8 2018-04-30 stsp free(cmd_argv);
4781 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
4782 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
