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 9f7d7167 2018-04-29 stsp #include "got_error.h"
42 80ddbec8 2018-04-29 stsp #include "got_object.h"
43 80ddbec8 2018-04-29 stsp #include "got_reference.h"
44 80ddbec8 2018-04-29 stsp #include "got_repository.h"
45 80ddbec8 2018-04-29 stsp #include "got_diff.h"
46 511a516b 2018-05-19 stsp #include "got_opentemp.h"
47 9ba79e04 2018-06-11 stsp #include "got_commit_graph.h"
48 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
49 a70480e0 2018-06-23 stsp #include "got_blame.h"
50 c2db6724 2019-01-04 stsp #include "got_privsep.h"
51 1dd54920 2019-05-11 stsp #include "got_path.h"
52 b7165be3 2019-02-05 stsp #include "got_worktree.h"
55 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
59 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
62 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
64 9f7d7167 2018-04-29 stsp #ifndef nitems
65 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
68 9f7d7167 2018-04-29 stsp struct tog_cmd {
69 c2301be8 2018-04-30 stsp const char *name;
70 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
71 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
74 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
75 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
76 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
77 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
78 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
80 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
81 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
82 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
83 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
85 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
86 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
87 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
88 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
89 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
92 d6b05b5b 2018-08-04 stsp enum tog_view_type {
93 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
94 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
95 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
96 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
99 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
101 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
102 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
103 ba4f502b 2018-08-04 stsp struct got_object_id *id;
104 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
107 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
108 ba4f502b 2018-08-04 stsp struct commit_queue {
109 ba4f502b 2018-08-04 stsp int ncommits;
110 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
113 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
114 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
116 15a087fe 2019-02-21 stsp int first_displayed_line;
117 15a087fe 2019-02-21 stsp int last_displayed_line;
119 15a087fe 2019-02-21 stsp int diff_context;
120 15a087fe 2019-02-21 stsp struct got_repository *repo;
121 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
123 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
124 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
127 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
129 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
130 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
131 1a76625f 2018-10-22 stsp int commits_needed;
132 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
133 1a76625f 2018-10-22 stsp struct commit_queue *commits;
134 1a76625f 2018-10-22 stsp const char *in_repo_path;
135 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
136 1a76625f 2018-10-22 stsp struct got_repository *repo;
137 1a76625f 2018-10-22 stsp int log_complete;
138 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
139 1a76625f 2018-10-22 stsp struct tog_view *view;
140 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
141 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
144 1a76625f 2018-10-22 stsp struct tog_log_view_state {
145 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
146 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
147 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
148 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
149 b01e7d3b 2018-08-04 stsp int selected;
150 b01e7d3b 2018-08-04 stsp char *in_repo_path;
151 d01904d4 2019-06-25 stsp const char *head_ref_name;
152 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
153 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
154 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
155 1a76625f 2018-10-22 stsp sig_atomic_t quit;
156 1a76625f 2018-10-22 stsp pthread_t thread;
157 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
158 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
159 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
162 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
163 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
164 e9424729 2018-08-04 stsp int nlines;
166 e9424729 2018-08-04 stsp struct tog_view *view;
167 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
171 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
172 e9424729 2018-08-04 stsp const char *path;
173 e9424729 2018-08-04 stsp struct got_repository *repo;
174 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
175 e9424729 2018-08-04 stsp int *complete;
178 e9424729 2018-08-04 stsp struct tog_blame {
180 e9424729 2018-08-04 stsp size_t filesize;
181 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
182 6fcac457 2018-11-19 stsp int nlines;
183 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
184 e9424729 2018-08-04 stsp pthread_t thread;
185 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
186 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
187 e9424729 2018-08-04 stsp const char *path;
190 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
191 7cbe629d 2018-08-04 stsp int first_displayed_line;
192 7cbe629d 2018-08-04 stsp int last_displayed_line;
193 7cbe629d 2018-08-04 stsp int selected_line;
194 7cbe629d 2018-08-04 stsp int blame_complete;
197 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
198 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
199 e5a0f69f 2018-08-18 stsp char *path;
200 7cbe629d 2018-08-04 stsp struct got_repository *repo;
201 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
202 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
203 e9424729 2018-08-04 stsp struct tog_blame blame;
204 6c4c42e0 2019-06-24 stsp int matched_line;
207 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
208 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
209 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
210 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
211 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
212 ad80ab7b 2018-08-04 stsp int selected;
215 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
217 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
218 ad80ab7b 2018-08-04 stsp char *tree_label;
219 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
220 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
221 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
222 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
223 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
224 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
225 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
226 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
227 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
228 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
229 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
230 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
234 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
236 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
237 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
238 669b5ffa 2018-10-07 stsp * there is enough screen estate.
240 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
241 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
243 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
244 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
245 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
247 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
248 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
250 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
252 cc3c9aac 2018-08-01 stsp struct tog_view {
253 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
254 26ed57b2 2018-05-19 stsp WINDOW *window;
255 26ed57b2 2018-05-19 stsp PANEL *panel;
256 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
257 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
258 1004088d 2018-09-29 stsp int focussed;
259 669b5ffa 2018-10-07 stsp struct tog_view *parent;
260 669b5ffa 2018-10-07 stsp struct tog_view *child;
261 669b5ffa 2018-10-07 stsp int child_focussed;
263 5dc9f4bc 2018-08-04 stsp /* type-specific state */
264 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
266 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
267 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
268 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
269 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
272 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
273 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
274 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
275 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
277 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
278 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
279 60493ae3 2019-06-20 stsp int searching;
280 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
281 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
282 60493ae3 2019-06-20 stsp int search_next_done;
283 1803e47f 2019-06-22 stsp regex_t regex;
286 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
287 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
288 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
289 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
290 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
291 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
292 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
294 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
295 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
296 d01904d4 2019-06-25 stsp struct got_repository *, const char *, const char *, int);
297 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
298 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
299 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
300 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
301 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
302 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
304 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
305 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
306 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
307 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
308 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
309 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
310 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
311 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
313 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
314 8b473291 2019-02-21 stsp struct got_tree_object *, struct got_object_id *,
315 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
316 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
317 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
318 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
319 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
320 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
321 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
323 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
325 25791caa 2018-10-24 stsp static void
326 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
328 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
331 e5a0f69f 2018-08-18 stsp static const struct got_error *
332 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
334 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
336 669b5ffa 2018-10-07 stsp if (view->child) {
337 669b5ffa 2018-10-07 stsp view_close(view->child);
338 669b5ffa 2018-10-07 stsp view->child = NULL;
340 e5a0f69f 2018-08-18 stsp if (view->close)
341 e5a0f69f 2018-08-18 stsp err = view->close(view);
342 ea5e7bb5 2018-08-01 stsp if (view->panel)
343 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
344 ea5e7bb5 2018-08-01 stsp if (view->window)
345 ea5e7bb5 2018-08-01 stsp delwin(view->window);
346 ea5e7bb5 2018-08-01 stsp free(view);
347 e5a0f69f 2018-08-18 stsp return err;
350 ea5e7bb5 2018-08-01 stsp static struct tog_view *
351 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
352 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
354 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
356 ea5e7bb5 2018-08-01 stsp if (view == NULL)
357 ea5e7bb5 2018-08-01 stsp return NULL;
359 d6b05b5b 2018-08-04 stsp view->type = type;
360 f7d12f7e 2018-08-01 stsp view->lines = LINES;
361 f7d12f7e 2018-08-01 stsp view->cols = COLS;
362 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
363 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
364 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
365 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
366 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
367 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
368 96a765a8 2018-08-04 stsp view_close(view);
369 ea5e7bb5 2018-08-01 stsp return NULL;
371 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
372 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
373 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
374 96a765a8 2018-08-04 stsp view_close(view);
375 ea5e7bb5 2018-08-01 stsp return NULL;
378 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
379 ea5e7bb5 2018-08-01 stsp return view;
383 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
385 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
387 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
390 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
392 5c60c32a 2018-10-18 stsp static const struct got_error *
393 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
395 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
397 5c60c32a 2018-10-18 stsp view->begin_y = 0;
398 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
399 5c60c32a 2018-10-18 stsp view->nlines = LINES;
400 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
401 5c60c32a 2018-10-18 stsp view->lines = LINES;
402 5c60c32a 2018-10-18 stsp view->cols = COLS;
403 5c60c32a 2018-10-18 stsp err = view_resize(view);
405 5c60c32a 2018-10-18 stsp return err;
407 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
408 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
410 5c60c32a 2018-10-18 stsp return NULL;
413 5c60c32a 2018-10-18 stsp static const struct got_error *
414 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
416 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
418 5c60c32a 2018-10-18 stsp view->begin_x = 0;
419 5c60c32a 2018-10-18 stsp view->begin_y = 0;
420 5c60c32a 2018-10-18 stsp view->nlines = LINES;
421 5c60c32a 2018-10-18 stsp view->ncols = COLS;
422 5c60c32a 2018-10-18 stsp view->lines = LINES;
423 5c60c32a 2018-10-18 stsp view->cols = COLS;
424 5c60c32a 2018-10-18 stsp err = view_resize(view);
426 5c60c32a 2018-10-18 stsp return err;
428 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
429 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
431 5c60c32a 2018-10-18 stsp return NULL;
435 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
437 5c60c32a 2018-10-18 stsp return view->parent == NULL;
440 4d8c2215 2018-08-19 stsp static const struct got_error *
441 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
443 f7d12f7e 2018-08-01 stsp int nlines, ncols;
445 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
446 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
448 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
450 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
451 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
453 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
455 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
456 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
457 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
458 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
459 25791caa 2018-10-24 stsp wclear(view->window);
461 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
462 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
463 0cf4efb1 2018-09-29 stsp view->lines = LINES;
464 0cf4efb1 2018-09-29 stsp view->cols = COLS;
466 6e3e5d9c 2018-10-18 stsp if (view->child) {
467 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
468 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
469 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
470 5c60c32a 2018-10-18 stsp if (view->child->focussed)
471 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
473 5c60c32a 2018-10-18 stsp show_panel(view->panel);
475 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
476 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
480 5c60c32a 2018-10-18 stsp return NULL;
483 669b5ffa 2018-10-07 stsp static const struct got_error *
484 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
486 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
488 669b5ffa 2018-10-07 stsp if (view->child == NULL)
489 669b5ffa 2018-10-07 stsp return NULL;
491 669b5ffa 2018-10-07 stsp err = view_close(view->child);
492 669b5ffa 2018-10-07 stsp view->child = NULL;
493 669b5ffa 2018-10-07 stsp return err;
496 669b5ffa 2018-10-07 stsp static const struct got_error *
497 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
499 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
501 669b5ffa 2018-10-07 stsp view->child = child;
502 669b5ffa 2018-10-07 stsp child->parent = view;
503 669b5ffa 2018-10-07 stsp return err;
507 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
509 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
512 34bc9ec9 2019-02-22 stsp static void
513 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
515 25791caa 2018-10-24 stsp int cols, lines;
516 25791caa 2018-10-24 stsp struct winsize size;
518 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
519 25791caa 2018-10-24 stsp cols = 80; /* Default */
520 25791caa 2018-10-24 stsp lines = 24;
522 25791caa 2018-10-24 stsp cols = size.ws_col;
523 25791caa 2018-10-24 stsp lines = size.ws_row;
525 25791caa 2018-10-24 stsp resize_term(lines, cols);
528 2b49a8ae 2019-06-22 stsp static const struct got_error *
529 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
531 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
532 2b49a8ae 2019-06-22 stsp char pattern[1024];
535 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
536 2b49a8ae 2019-06-22 stsp return NULL;
538 2b49a8ae 2019-06-22 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1,
539 2b49a8ae 2019-06-22 stsp view->begin_x, "/");
540 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
542 2b49a8ae 2019-06-22 stsp nocbreak();
544 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
547 2b49a8ae 2019-06-22 stsp if (ret == ERR)
548 2b49a8ae 2019-06-22 stsp return NULL;
550 2b49a8ae 2019-06-22 stsp if (view->searching) {
551 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
552 2b49a8ae 2019-06-22 stsp view->searching = 0;
555 2b49a8ae 2019-06-22 stsp if (regcomp(&view->regex, pattern,
556 f5daf9b1 2019-06-24 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
557 7c32bd05 2019-06-22 stsp err = view->search_start(view);
559 7c32bd05 2019-06-22 stsp regfree(&view->regex);
560 7c32bd05 2019-06-22 stsp return err;
562 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
563 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
564 2b49a8ae 2019-06-22 stsp view->search_next(view);
567 2b49a8ae 2019-06-22 stsp return NULL;
570 0cf4efb1 2018-09-29 stsp static const struct got_error *
571 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
572 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
573 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
575 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
576 669b5ffa 2018-10-07 stsp struct tog_view *v;
577 1a76625f 2018-10-22 stsp int ch, errcode;
579 e5a0f69f 2018-08-18 stsp *new = NULL;
580 e5a0f69f 2018-08-18 stsp *dead = NULL;
581 0cf4efb1 2018-09-29 stsp *focus = NULL;
583 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
584 60493ae3 2019-06-20 stsp errcode = pthread_mutex_unlock(&tog_mutex);
585 60493ae3 2019-06-20 stsp if (errcode)
586 60493ae3 2019-06-20 stsp return got_error_set_errno(errcode,
587 60493ae3 2019-06-20 stsp "pthread_mutex_unlock");
588 60493ae3 2019-06-20 stsp pthread_yield();
589 60493ae3 2019-06-20 stsp errcode = pthread_mutex_lock(&tog_mutex);
590 60493ae3 2019-06-20 stsp if (errcode)
591 60493ae3 2019-06-20 stsp return got_error_set_errno(errcode,
592 60493ae3 2019-06-20 stsp "pthread_mutex_lock");
593 60493ae3 2019-06-20 stsp view->search_next(view);
594 60493ae3 2019-06-20 stsp return NULL;
597 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
598 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
599 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
600 1a76625f 2018-10-22 stsp if (errcode)
601 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
602 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
603 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
604 1a76625f 2018-10-22 stsp if (errcode)
605 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
606 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
608 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
609 25791caa 2018-10-24 stsp tog_resizeterm();
610 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
611 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
612 25791caa 2018-10-24 stsp err = view_resize(v);
614 25791caa 2018-10-24 stsp return err;
615 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
617 25791caa 2018-10-24 stsp return err;
621 e5a0f69f 2018-08-18 stsp switch (ch) {
625 1e37a5c2 2019-05-12 jcs if (view->child) {
626 1e37a5c2 2019-05-12 jcs *focus = view->child;
627 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
628 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
629 1e37a5c2 2019-05-12 jcs *focus = view->parent;
630 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
634 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
635 1e37a5c2 2019-05-12 jcs *dead = view;
641 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
642 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
644 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
645 669b5ffa 2018-10-07 stsp *focus = view->child;
646 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
647 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
649 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
652 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
653 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
655 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
656 1e37a5c2 2019-05-12 jcs *focus = view;
657 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
658 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
660 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
664 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
665 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
668 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
671 60493ae3 2019-06-20 stsp if (view->search_start)
672 2b49a8ae 2019-06-22 stsp view_search_start(view);
674 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
678 60493ae3 2019-06-20 stsp if (view->search_next && view->searching) {
679 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
680 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
681 60493ae3 2019-06-20 stsp view->search_next_done = 0;
682 60493ae3 2019-06-20 stsp view->search_next(view);
684 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
687 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
691 e5a0f69f 2018-08-18 stsp return err;
695 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
697 0cf4efb1 2018-09-29 stsp PANEL *panel;
698 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
700 669b5ffa 2018-10-07 stsp if (view->parent)
701 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
703 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
704 0cf4efb1 2018-09-29 stsp if (panel == NULL)
707 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
708 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
709 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
713 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
715 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
716 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
718 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
720 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
723 669b5ffa 2018-10-07 stsp return view->focussed;
726 bcbd79e2 2018-08-19 stsp static const struct got_error *
727 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
729 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
730 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
731 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
732 fd823528 2018-10-22 stsp int fast_refresh = 10;
733 1a76625f 2018-10-22 stsp int done = 0, errcode;
735 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
736 1a76625f 2018-10-22 stsp if (errcode)
737 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
739 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
740 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
742 a81bf10d 2018-09-29 stsp main_view = view;
743 1004088d 2018-09-29 stsp view->focussed = 1;
744 878940b7 2018-09-29 stsp err = view->show(view);
746 0cf4efb1 2018-09-29 stsp return err;
747 0cf4efb1 2018-09-29 stsp update_panels();
748 0cf4efb1 2018-09-29 stsp doupdate();
749 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
750 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
751 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
752 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
754 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
755 e4197bf9 2018-08-18 stsp view, &views);
758 e5a0f69f 2018-08-18 stsp if (dead_view) {
759 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
761 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
762 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
763 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
764 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
765 669b5ffa 2018-10-07 stsp prev = view->parent;
767 669b5ffa 2018-10-07 stsp if (dead_view->parent)
768 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
770 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
772 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
773 d01904d4 2019-06-25 stsp if (err || (dead_view == main_view && new_view == NULL))
776 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
777 0cf4efb1 2018-09-29 stsp if (focus_view)
778 0cf4efb1 2018-09-29 stsp view = focus_view;
779 669b5ffa 2018-10-07 stsp else if (prev)
780 669b5ffa 2018-10-07 stsp view = prev;
781 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
782 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
783 0cf4efb1 2018-09-29 stsp tog_view_list_head);
785 0cf4efb1 2018-09-29 stsp view = NULL;
786 669b5ffa 2018-10-07 stsp if (view) {
787 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
788 669b5ffa 2018-10-07 stsp focus_view = view->child;
790 669b5ffa 2018-10-07 stsp focus_view = view;
794 bcbd79e2 2018-08-19 stsp if (new_view) {
795 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
796 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
797 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
798 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
800 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
801 86c66b02 2018-10-18 stsp err = view_close(v);
806 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
807 fed7eaa8 2018-10-24 stsp view = new_view;
808 878940b7 2018-09-29 stsp if (focus_view == NULL)
809 878940b7 2018-09-29 stsp focus_view = new_view;
811 0cf4efb1 2018-09-29 stsp if (focus_view) {
812 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
814 0cf4efb1 2018-09-29 stsp view->focussed = 0;
815 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
816 0cf4efb1 2018-09-29 stsp view = focus_view;
817 878940b7 2018-09-29 stsp if (new_view)
818 878940b7 2018-09-29 stsp show_panel(new_view->panel);
819 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
820 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
822 669b5ffa 2018-10-07 stsp if (view) {
823 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
824 758194b5 2018-10-24 stsp view->focussed = 1;
825 758194b5 2018-10-24 stsp show_panel(view->panel);
826 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
827 758194b5 2018-10-24 stsp show_panel(view->child->panel);
828 1a76625f 2018-10-22 stsp focus_view = view;
830 669b5ffa 2018-10-07 stsp if (view->parent) {
831 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
835 669b5ffa 2018-10-07 stsp err = view->show(view);
838 669b5ffa 2018-10-07 stsp if (view->child) {
839 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
843 1a76625f 2018-10-22 stsp update_panels();
844 1a76625f 2018-10-22 stsp doupdate();
848 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
849 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
850 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
851 e5a0f69f 2018-08-18 stsp view_close(view);
854 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
855 1a76625f 2018-10-22 stsp if (errcode)
856 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
858 e5a0f69f 2018-08-18 stsp return err;
861 4ed7e80c 2018-05-20 stsp __dead static void
862 9f7d7167 2018-04-29 stsp usage_log(void)
865 c70c5802 2018-08-01 stsp fprintf(stderr,
866 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
867 9f7d7167 2018-04-29 stsp getprogname());
871 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
872 80ddbec8 2018-04-29 stsp static const struct got_error *
873 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
875 00dfcb92 2018-06-11 stsp char *vis = NULL;
876 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
878 963b370f 2018-05-20 stsp *ws = NULL;
879 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
880 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
881 00dfcb92 2018-06-11 stsp int vislen;
882 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
883 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
885 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
886 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
888 00dfcb92 2018-06-11 stsp return err;
889 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
890 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
891 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
896 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
897 a7f50699 2018-06-11 stsp if (*ws == NULL) {
898 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
902 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
903 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
908 963b370f 2018-05-20 stsp *ws = NULL;
911 963b370f 2018-05-20 stsp return err;
914 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
915 963b370f 2018-05-20 stsp static const struct got_error *
916 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
918 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
919 963b370f 2018-05-20 stsp int cols = 0;
920 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
921 963b370f 2018-05-20 stsp size_t wlen;
924 963b370f 2018-05-20 stsp *wlinep = NULL;
925 b700b5d6 2018-07-10 stsp *widthp = 0;
927 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
929 963b370f 2018-05-20 stsp return err;
932 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
933 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
934 963b370f 2018-05-20 stsp switch (width) {
940 3c1f04f1 2018-09-13 stsp if (cols + width <= wlimit)
941 b700b5d6 2018-07-10 stsp cols += width;
945 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
946 67ceb59d 2019-03-03 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
950 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
954 963b370f 2018-05-20 stsp wline[i] = L'\0';
955 b700b5d6 2018-07-10 stsp if (widthp)
956 b700b5d6 2018-07-10 stsp *widthp = cols;
959 963b370f 2018-05-20 stsp free(wline);
961 963b370f 2018-05-20 stsp *wlinep = wline;
962 963b370f 2018-05-20 stsp return err;
965 8b473291 2019-02-21 stsp static const struct got_error*
966 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
967 8b473291 2019-02-21 stsp struct got_object_id *id)
969 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
970 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
972 8b473291 2019-02-21 stsp const char *name;
974 8b473291 2019-02-21 stsp *refs_str = NULL;
976 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
977 8b473291 2019-02-21 stsp if (got_object_id_cmp(re->id, id) != 0)
979 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
980 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
982 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
984 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
986 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
988 8b473291 2019-02-21 stsp if (strncmp(name, "remotes/", 8) == 0)
990 8b473291 2019-02-21 stsp s = *refs_str;
991 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
992 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
993 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
995 8b473291 2019-02-21 stsp *refs_str = NULL;
1001 8b473291 2019-02-21 stsp return err;
1004 963b370f 2018-05-20 stsp static const struct got_error *
1005 5813d178 2019-03-09 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit)
1007 5813d178 2019-03-09 stsp char *smallerthan, *at;
1009 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1010 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1011 5813d178 2019-03-09 stsp author = smallerthan + 1;
1012 5813d178 2019-03-09 stsp at = strchr(author, '@');
1014 5813d178 2019-03-09 stsp *at = '\0';
1015 5813d178 2019-03-09 stsp return format_line(wauthor, author_width, author, limit);
1018 5813d178 2019-03-09 stsp static const struct got_error *
1019 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1020 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1021 5813d178 2019-03-09 stsp int author_display_cols)
1023 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1024 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
1025 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1026 5813d178 2019-03-09 stsp char *author = NULL;
1027 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1028 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1029 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1030 bb737323 2018-05-20 stsp int col, limit;
1031 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
1032 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1033 ccb26ccd 2018-11-05 stsp struct tm tm;
1034 45d799e2 2018-12-23 stsp time_t committer_time;
1036 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1037 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1038 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1039 ccb26ccd 2018-11-05 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
1040 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1041 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1043 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
1044 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1046 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1047 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1048 b39d25c7 2018-07-10 stsp col = limit + 1;
1049 b39d25c7 2018-07-10 stsp if (col > avail)
1050 b39d25c7 2018-07-10 stsp goto done;
1052 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1053 5813d178 2019-03-09 stsp if (author == NULL) {
1054 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1055 80ddbec8 2018-04-29 stsp goto done;
1057 5813d178 2019-03-09 stsp err = format_author(&wauthor, &author_width, author, avail - col);
1059 bb737323 2018-05-20 stsp goto done;
1060 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1061 bb737323 2018-05-20 stsp col += author_width;
1062 5813d178 2019-03-09 stsp while (col <= avail && author_width < author_display_cols + 2) {
1063 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1065 bb737323 2018-05-20 stsp author_width++;
1067 9c2eaf34 2018-05-20 stsp if (col > avail)
1068 9c2eaf34 2018-05-20 stsp goto done;
1070 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1071 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
1072 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1073 6d9fbc00 2018-04-29 stsp goto done;
1075 bb737323 2018-05-20 stsp logmsg = logmsg0;
1076 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1078 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1079 bb737323 2018-05-20 stsp if (newline)
1080 bb737323 2018-05-20 stsp *newline = '\0';
1081 bb737323 2018-05-20 stsp limit = avail - col;
1082 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
1084 bb737323 2018-05-20 stsp goto done;
1085 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1086 bb737323 2018-05-20 stsp col += logmsg_width;
1087 bb737323 2018-05-20 stsp while (col <= avail) {
1088 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1092 80ddbec8 2018-04-29 stsp free(logmsg0);
1093 bb737323 2018-05-20 stsp free(wlogmsg);
1094 5813d178 2019-03-09 stsp free(author);
1095 bb737323 2018-05-20 stsp free(wauthor);
1096 80ddbec8 2018-04-29 stsp free(line);
1097 80ddbec8 2018-04-29 stsp return err;
1100 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1101 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1102 899d86c2 2018-05-10 stsp struct got_object_id *id)
1104 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1106 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1107 80ddbec8 2018-04-29 stsp if (entry == NULL)
1108 899d86c2 2018-05-10 stsp return NULL;
1110 899d86c2 2018-05-10 stsp entry->id = id;
1111 99db9666 2018-05-07 stsp entry->commit = commit;
1112 899d86c2 2018-05-10 stsp return entry;
1115 99db9666 2018-05-07 stsp static void
1116 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1118 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1120 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1121 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1122 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1123 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1124 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1125 99db9666 2018-05-07 stsp free(entry);
1128 99db9666 2018-05-07 stsp static void
1129 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1131 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1132 99db9666 2018-05-07 stsp pop_commit(commits);
1135 c4972b91 2018-05-07 stsp static const struct got_error *
1136 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1137 1a76625f 2018-10-22 stsp int minqueue, struct got_repository *repo, const char *path)
1139 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1140 93e45b7c 2018-09-24 stsp int nqueued = 0;
1143 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1144 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1145 1a76625f 2018-10-22 stsp * while updating the display.
1147 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
1148 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1149 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1150 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1151 1a76625f 2018-10-22 stsp int errcode;
1153 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1154 9ba79e04 2018-06-11 stsp if (err) {
1155 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1157 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1158 93e45b7c 2018-09-24 stsp minqueue, repo);
1160 ecb28ae0 2018-07-16 stsp return err;
1164 ecb28ae0 2018-07-16 stsp if (id == NULL)
1167 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1170 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1171 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1172 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1176 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1177 1a76625f 2018-10-22 stsp if (errcode) {
1178 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_lock");
1182 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1183 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1184 ecb28ae0 2018-07-16 stsp nqueued++;
1185 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1187 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1188 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1189 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1190 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1193 9ba79e04 2018-06-11 stsp return err;
1196 99db9666 2018-05-07 stsp static const struct got_error *
1197 19e70ad6 2019-05-14 stsp get_head_commit_id(struct got_object_id **head_id, const char *branch_name,
1198 19e70ad6 2019-05-14 stsp struct got_repository *repo)
1200 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1201 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1203 9ba79e04 2018-06-11 stsp *head_id = NULL;
1205 19e70ad6 2019-05-14 stsp err = got_ref_open(&head_ref, repo, branch_name, 0);
1207 99db9666 2018-05-07 stsp return err;
1209 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1210 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1211 9ba79e04 2018-06-11 stsp if (err) {
1212 9ba79e04 2018-06-11 stsp *head_id = NULL;
1213 99db9666 2018-05-07 stsp return err;
1216 9ba79e04 2018-06-11 stsp return NULL;
1219 0553a4e3 2018-04-30 stsp static const struct got_error *
1220 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1221 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1222 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1223 8b473291 2019-02-21 stsp struct got_reflist_head *refs, const char *path, int commits_needed)
1225 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1226 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1227 60493ae3 2019-06-20 stsp int width;
1228 60493ae3 2019-06-20 stsp int ncommits, author_cols = 10;
1229 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1230 8b473291 2019-02-21 stsp char *refs_str = NULL;
1231 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1233 e0d42f60 2018-07-22 stsp entry = first;
1234 e0d42f60 2018-07-22 stsp ncommits = 0;
1235 e0d42f60 2018-07-22 stsp while (entry) {
1236 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1237 e0d42f60 2018-07-22 stsp *selected = entry;
1240 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1241 e0d42f60 2018-07-22 stsp ncommits++;
1244 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1245 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1247 ecb28ae0 2018-07-16 stsp return err;
1248 8b473291 2019-02-21 stsp if (refs) {
1249 8b473291 2019-02-21 stsp err = build_refs_str(&refs_str, refs, (*selected)->id);
1251 8b473291 2019-02-21 stsp goto done;
1255 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1256 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1258 8b473291 2019-02-21 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1259 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1260 60493ae3 2019-06-20 stsp commits_needed > 0 ?
1261 60493ae3 2019-06-20 stsp (view->searching && view->search_next_done == 0
1262 60493ae3 2019-06-20 stsp ? "searching..." : "loading... ") :
1263 8b473291 2019-02-21 stsp (refs_str ? refs_str : "")) == -1) {
1264 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1265 8b473291 2019-02-21 stsp goto done;
1268 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1269 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1270 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1271 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1272 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1273 1a76625f 2018-10-22 stsp header = NULL;
1274 1a76625f 2018-10-22 stsp goto done;
1276 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1277 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1278 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1279 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1280 1a76625f 2018-10-22 stsp header = NULL;
1281 1a76625f 2018-10-22 stsp goto done;
1283 1a76625f 2018-10-22 stsp err = format_line(&wline, &width, header, view->ncols);
1285 1a76625f 2018-10-22 stsp goto done;
1287 2814baeb 2018-08-01 stsp werase(view->window);
1289 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1290 a3404814 2018-09-02 stsp wstandout(view->window);
1291 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1292 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1293 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1296 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1297 a3404814 2018-09-02 stsp wstandend(view->window);
1298 ecb28ae0 2018-07-16 stsp free(wline);
1299 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1300 1a76625f 2018-10-22 stsp goto done;
1302 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1303 899d86c2 2018-05-10 stsp entry = first;
1304 5813d178 2019-03-09 stsp ncommits = 0;
1305 5813d178 2019-03-09 stsp while (entry) {
1306 5813d178 2019-03-09 stsp char *author;
1307 5813d178 2019-03-09 stsp wchar_t *wauthor;
1308 5813d178 2019-03-09 stsp int width;
1309 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1311 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1312 5813d178 2019-03-09 stsp if (author == NULL) {
1313 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1314 5813d178 2019-03-09 stsp goto done;
1316 5813d178 2019-03-09 stsp err = format_author(&wauthor, &width, author, COLS);
1317 5813d178 2019-03-09 stsp if (author_cols < width)
1318 5813d178 2019-03-09 stsp author_cols = width;
1319 5813d178 2019-03-09 stsp free(wauthor);
1320 5813d178 2019-03-09 stsp free(author);
1321 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1324 5813d178 2019-03-09 stsp entry = first;
1325 899d86c2 2018-05-10 stsp *last = first;
1326 867c6645 2018-07-10 stsp ncommits = 0;
1327 899d86c2 2018-05-10 stsp while (entry) {
1328 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1330 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1331 2814baeb 2018-08-01 stsp wstandout(view->window);
1332 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1333 5813d178 2019-03-09 stsp author_cols);
1334 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1335 2814baeb 2018-08-01 stsp wstandend(view->window);
1337 60493ae3 2019-06-20 stsp goto done;
1338 0553a4e3 2018-04-30 stsp ncommits++;
1339 899d86c2 2018-05-10 stsp *last = entry;
1340 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1343 1a57306a 2018-09-02 stsp view_vborder(view);
1345 1a76625f 2018-10-22 stsp free(id_str);
1346 8b473291 2019-02-21 stsp free(refs_str);
1347 1a76625f 2018-10-22 stsp free(ncommits_str);
1348 1a76625f 2018-10-22 stsp free(header);
1349 80ddbec8 2018-04-29 stsp return err;
1352 07b55e75 2018-05-10 stsp static void
1353 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1354 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1355 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1357 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1358 07b55e75 2018-05-10 stsp int nscrolled = 0;
1360 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1361 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1364 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1365 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1366 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1367 07b55e75 2018-05-10 stsp if (entry) {
1368 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1369 07b55e75 2018-05-10 stsp nscrolled++;
1374 aa075928 2018-05-10 stsp static const struct got_error *
1375 5e224a3e 2019-02-22 stsp trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1376 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1378 5e224a3e 2019-02-22 stsp int errcode;
1379 8a42fca8 2019-02-22 stsp int max_wait = 20;
1381 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1383 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1384 5e224a3e 2019-02-22 stsp if (*log_complete)
1387 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1388 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1389 7aafa0d1 2019-02-22 stsp if (errcode)
1390 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1391 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1392 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1393 7aafa0d1 2019-02-22 stsp if (errcode)
1394 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1395 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1396 7aafa0d1 2019-02-22 stsp pthread_yield();
1397 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1398 7aafa0d1 2019-02-22 stsp if (errcode)
1399 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1400 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1402 8a42fca8 2019-02-22 stsp if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1404 5e224a3e 2019-02-22 stsp * Thread is not done yet; lose a key press
1405 5e224a3e 2019-02-22 stsp * and let the user retry... this way the GUI
1406 5e224a3e 2019-02-22 stsp * remains interactive while logging deep paths
1407 5e224a3e 2019-02-22 stsp * with few commits in history.
1409 7aafa0d1 2019-02-22 stsp return NULL;
1413 5e224a3e 2019-02-22 stsp return NULL;
1416 5e224a3e 2019-02-22 stsp static const struct got_error *
1417 34bc9ec9 2019-02-22 stsp scroll_down(struct tog_view *view,
1418 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1419 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1420 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1421 5e224a3e 2019-02-22 stsp pthread_cond_t *need_commits)
1423 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1424 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1425 5e224a3e 2019-02-22 stsp int nscrolled = 0;
1427 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1428 5e224a3e 2019-02-22 stsp return NULL;
1430 5e224a3e 2019-02-22 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1431 5e224a3e 2019-02-22 stsp if (pentry == NULL && !*log_complete) {
1433 08ebd0a9 2019-02-22 stsp * Ask the log thread for required amount of commits
1434 08ebd0a9 2019-02-22 stsp * plus some amount of pre-fetching.
1436 08ebd0a9 2019-02-22 stsp (*commits_needed) += maxscroll + 20;
1437 5e224a3e 2019-02-22 stsp err = trigger_log_thread(0, commits_needed, log_complete,
1438 5e224a3e 2019-02-22 stsp need_commits);
1440 5e224a3e 2019-02-22 stsp return err;
1444 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1445 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1448 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1450 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1451 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1453 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1454 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1456 dd0a52c1 2018-05-20 stsp return err;
1459 cd0acaa7 2018-05-20 stsp static const struct got_error *
1460 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1461 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1462 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1463 8b473291 2019-02-21 stsp struct got_repository *repo)
1465 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1466 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1467 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1469 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1470 15a94983 2018-12-23 stsp if (diff_view == NULL)
1471 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1473 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1474 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1475 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1476 e5a0f69f 2018-08-18 stsp if (err == NULL)
1477 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1478 cd0acaa7 2018-05-20 stsp return err;
1481 80ddbec8 2018-04-29 stsp static const struct got_error *
1482 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1483 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1485 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1487 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1488 941e9f74 2019-05-21 stsp if (parent == NULL)
1489 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1491 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1492 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1493 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1494 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1495 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1496 941e9f74 2019-05-21 stsp s->tree = subtree;
1497 941e9f74 2019-05-21 stsp s->entries = got_object_tree_get_entries(s->tree);
1498 941e9f74 2019-05-21 stsp s->selected = 0;
1499 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1500 941e9f74 2019-05-21 stsp return NULL;
1504 941e9f74 2019-05-21 stsp static const struct got_error *
1505 941e9f74 2019-05-21 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1506 941e9f74 2019-05-21 stsp struct commit_queue_entry *entry, const char *path,
1507 941e9f74 2019-05-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
1509 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1510 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1511 941e9f74 2019-05-21 stsp struct got_tree_entry *te;
1512 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s;
1513 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1514 b03c880f 2019-05-21 stsp char *slash, *subpath = NULL;
1515 941e9f74 2019-05-21 stsp const char *p;
1517 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree, repo,
1518 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(entry->commit));
1520 9343a5fb 2018-06-23 stsp return err;
1522 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1523 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1524 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1526 8b473291 2019-02-21 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1527 941e9f74 2019-05-21 stsp if (err) {
1528 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1529 941e9f74 2019-05-21 stsp return err;
1531 941e9f74 2019-05-21 stsp s = &tree_view->state.tree;
1533 941e9f74 2019-05-21 stsp *new_view = tree_view;
1535 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1537 941e9f74 2019-05-21 stsp while (*p) {
1538 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1540 941e9f74 2019-05-21 stsp while (p[0] == '/')
1543 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1544 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1545 941e9f74 2019-05-21 stsp if (slash == NULL)
1546 941e9f74 2019-05-21 stsp slash = strchr(p, '\0');
1547 941e9f74 2019-05-21 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
1548 941e9f74 2019-05-21 stsp if (strncmp(p, te->name, slash - p) == 0) {
1549 941e9f74 2019-05-21 stsp s->selected_entry = te;
1552 b03c880f 2019-05-21 stsp s->selected++;
1554 941e9f74 2019-05-21 stsp if (s->selected_entry == NULL) {
1555 941e9f74 2019-05-21 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1558 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1559 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1561 67409a31 2019-05-24 stsp if (!S_ISDIR(s->selected_entry->mode)) {
1562 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1563 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1564 67409a31 2019-05-24 stsp s->selected = 0;
1568 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1569 941e9f74 2019-05-21 stsp if (slash)
1570 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1572 941e9f74 2019-05-21 stsp subpath = strdup(path);
1573 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1574 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1578 941e9f74 2019-05-21 stsp err = got_object_id_by_path(&tree_id, repo, entry->id,
1583 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1584 941e9f74 2019-05-21 stsp free(tree_id);
1588 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1589 941e9f74 2019-05-21 stsp if (err) {
1590 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1593 941e9f74 2019-05-21 stsp if (slash == NULL)
1595 941e9f74 2019-05-21 stsp free(subpath);
1596 941e9f74 2019-05-21 stsp subpath = NULL;
1597 941e9f74 2019-05-21 stsp p = slash;
1600 941e9f74 2019-05-21 stsp free(subpath);
1601 1a76625f 2018-10-22 stsp return err;
1604 1a76625f 2018-10-22 stsp static void *
1605 1a76625f 2018-10-22 stsp log_thread(void *arg)
1607 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1608 1a76625f 2018-10-22 stsp int errcode = 0;
1609 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1610 1a76625f 2018-10-22 stsp int done = 0;
1612 1a76625f 2018-10-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1614 1a76625f 2018-10-22 stsp return (void *)err;
1616 1a76625f 2018-10-22 stsp while (!done && !err) {
1617 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1618 1a76625f 2018-10-22 stsp a->in_repo_path);
1619 1a76625f 2018-10-22 stsp if (err) {
1620 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1621 1a76625f 2018-10-22 stsp return (void *)err;
1622 1a76625f 2018-10-22 stsp err = NULL;
1624 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1625 1a76625f 2018-10-22 stsp a->commits_needed--;
1627 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1628 3abe8080 2019-04-10 stsp if (errcode) {
1629 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1630 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1632 3abe8080 2019-04-10 stsp } else if (*a->quit)
1634 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1635 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1636 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1637 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1641 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1642 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1643 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1644 1a76625f 2018-10-22 stsp &tog_mutex);
1645 1a76625f 2018-10-22 stsp if (errcode)
1646 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1647 2af4a041 2019-05-11 jcs "pthread_cond_wait");
1650 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1651 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1652 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1653 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1655 3abe8080 2019-04-10 stsp a->log_complete = 1;
1656 1a76625f 2018-10-22 stsp return (void *)err;
1659 1a76625f 2018-10-22 stsp static const struct got_error *
1660 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1662 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1663 1a76625f 2018-10-22 stsp int errcode;
1665 1a76625f 2018-10-22 stsp if (s->thread) {
1666 1a76625f 2018-10-22 stsp s->quit = 1;
1667 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1668 1a76625f 2018-10-22 stsp if (errcode)
1669 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1670 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1671 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1672 1a76625f 2018-10-22 stsp if (errcode)
1673 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1674 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1675 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1676 1a76625f 2018-10-22 stsp if (errcode)
1677 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
1678 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1679 1a76625f 2018-10-22 stsp if (errcode)
1680 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1681 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1682 1a76625f 2018-10-22 stsp s->thread = NULL;
1685 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1686 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1687 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
1689 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1690 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1691 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1694 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1695 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1696 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1699 9343a5fb 2018-06-23 stsp return err;
1702 9343a5fb 2018-06-23 stsp static const struct got_error *
1703 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1705 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1706 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1708 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1709 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1710 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1711 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1712 1a76625f 2018-10-22 stsp free(s->start_id);
1713 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1714 1a76625f 2018-10-22 stsp return err;
1717 1a76625f 2018-10-22 stsp static const struct got_error *
1718 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
1720 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
1722 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
1723 96e2b566 2019-07-08 stsp s->search_entry = NULL;
1724 60493ae3 2019-06-20 stsp return NULL;
1727 60493ae3 2019-06-20 stsp static int
1728 df0b3d8a 2019-06-28 stsp match_commit(struct got_commit_object *commit, const char *id_str,
1729 df0b3d8a 2019-06-28 stsp regex_t *regex)
1731 60493ae3 2019-06-20 stsp regmatch_t regmatch;
1733 60493ae3 2019-06-20 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1734 60493ae3 2019-06-20 stsp ®match, 0) == 0 ||
1735 60493ae3 2019-06-20 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1736 60493ae3 2019-06-20 stsp ®match, 0) == 0 ||
1737 60493ae3 2019-06-20 stsp regexec(regex, got_object_commit_get_logmsg(commit), 1,
1738 df0b3d8a 2019-06-28 stsp ®match, 0) == 0 ||
1739 df0b3d8a 2019-06-28 stsp regexec(regex, id_str, 1, ®match, 0) == 0)
1745 60493ae3 2019-06-20 stsp static const struct got_error *
1746 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
1748 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
1749 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
1750 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
1752 60493ae3 2019-06-20 stsp if (!view->searching) {
1753 60493ae3 2019-06-20 stsp view->search_next_done = 1;
1754 60493ae3 2019-06-20 stsp return NULL;
1757 96e2b566 2019-07-08 stsp if (s->search_entry) {
1758 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
1759 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
1761 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
1762 96e2b566 2019-07-08 stsp commit_queue_head, entry);
1763 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
1764 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1765 b55df7bc 2019-06-21 stsp entry = TAILQ_NEXT(s->selected_entry, entry);
1767 b55df7bc 2019-06-21 stsp entry = TAILQ_PREV(s->selected_entry,
1768 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
1770 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1771 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
1773 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
1776 60493ae3 2019-06-20 stsp while (1) {
1777 df0b3d8a 2019-06-28 stsp char *id_str;
1778 60493ae3 2019-06-20 stsp if (entry == NULL) {
1779 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
1780 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
1781 f801134a 2019-06-25 stsp view->search_next_done = 1;
1782 f801134a 2019-06-25 stsp return NULL;
1785 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
1786 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
1787 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
1789 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
1790 57b33b64 2019-07-08 stsp return trigger_log_thread(1,
1791 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
1792 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
1793 f801134a 2019-06-25 stsp &s->thread_args.need_commits);
1796 df0b3d8a 2019-06-28 stsp err = got_object_id_str(&id_str, entry->id);
1798 df0b3d8a 2019-06-28 stsp return err;
1800 df0b3d8a 2019-06-28 stsp if (match_commit(entry->commit, id_str, &view->regex)) {
1801 60493ae3 2019-06-20 stsp view->search_next_done = 1;
1802 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
1803 df0b3d8a 2019-06-28 stsp free(id_str);
1806 df0b3d8a 2019-06-28 stsp free(id_str);
1807 96e2b566 2019-07-08 stsp s->search_entry = entry;
1808 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
1809 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
1811 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1814 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
1815 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
1816 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
1817 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
1819 60493ae3 2019-06-20 stsp return err;
1822 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
1823 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
1825 60493ae3 2019-06-20 stsp return err;
1830 96e2b566 2019-07-08 stsp s->search_entry = NULL;
1832 60493ae3 2019-06-20 stsp return NULL;
1835 60493ae3 2019-06-20 stsp static const struct got_error *
1836 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1837 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
1838 d01904d4 2019-06-25 stsp const char *head_ref_name, const char *path, int check_disk)
1840 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1841 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1842 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1843 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1844 1a76625f 2018-10-22 stsp int errcode;
1846 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1847 ecb28ae0 2018-07-16 stsp if (err != NULL)
1848 ecb28ae0 2018-07-16 stsp goto done;
1850 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1851 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1852 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1854 8b473291 2019-02-21 stsp s->refs = refs;
1855 fb2756b9 2018-08-04 stsp s->repo = repo;
1856 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
1857 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1858 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1859 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
1860 5036bf37 2018-09-24 stsp goto done;
1863 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1864 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1865 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1866 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
1867 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
1869 1a76625f 2018-10-22 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1871 1a76625f 2018-10-22 stsp goto done;
1872 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1873 1a76625f 2018-10-22 stsp 0, thread_repo);
1875 1a76625f 2018-10-22 stsp goto done;
1877 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1878 1a76625f 2018-10-22 stsp if (errcode) {
1879 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
1880 1a76625f 2018-10-22 stsp goto done;
1883 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1884 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1885 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1886 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1887 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1888 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1889 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1890 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1891 1a76625f 2018-10-22 stsp s->thread_args.view = view;
1892 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1893 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1896 1a76625f 2018-10-22 stsp close_log_view(view);
1897 ba4f502b 2018-08-04 stsp return err;
1900 e5a0f69f 2018-08-18 stsp static const struct got_error *
1901 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1903 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1905 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1906 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1907 2b380cc8 2018-10-24 stsp &s->thread_args);
1908 2b380cc8 2018-10-24 stsp if (errcode)
1909 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
1912 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1913 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1914 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
1915 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
1918 e5a0f69f 2018-08-18 stsp static const struct got_error *
1919 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1920 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1922 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1923 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1924 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
1925 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
1926 669b5ffa 2018-10-07 stsp int begin_x = 0;
1927 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
1929 e5a0f69f 2018-08-18 stsp switch (ch) {
1931 1e37a5c2 2019-05-12 jcs s->quit = 1;
1934 1e37a5c2 2019-05-12 jcs case KEY_UP:
1937 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1939 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
1940 1e37a5c2 2019-05-12 jcs s->selected--;
1942 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
1943 1144d21a 2019-06-21 stsp &s->commits);
1945 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
1946 a4292ac5 2019-05-12 jcs case CTRL('b'):
1947 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1949 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
1950 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
1951 1e37a5c2 2019-05-12 jcs s->selected = 0;
1954 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
1955 1e37a5c2 2019-05-12 jcs view->nlines, &s->commits);
1958 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
1961 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1963 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
1964 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
1965 1e37a5c2 2019-05-12 jcs s->selected++;
1968 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
1969 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
1970 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
1971 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
1972 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
1974 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
1975 a4292ac5 2019-05-12 jcs case CTRL('f'): {
1976 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
1977 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
1978 1e37a5c2 2019-05-12 jcs if (first == NULL)
1980 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
1981 1e37a5c2 2019-05-12 jcs view->nlines, &s->last_displayed_entry,
1982 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
1983 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
1984 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
1985 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
1986 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
1987 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
1988 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
1989 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
1990 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
1992 1e37a5c2 2019-05-12 jcs err = NULL;
1995 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
1996 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
1997 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
1998 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
1999 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2001 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2004 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2006 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2007 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2008 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2009 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2010 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2013 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2014 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2016 1e37a5c2 2019-05-12 jcs return err;
2017 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2019 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2022 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2023 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2025 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2028 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2030 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2031 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2032 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2033 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2036 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2037 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2039 1e37a5c2 2019-05-12 jcs return err;
2040 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2042 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2045 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2046 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2048 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2050 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2051 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
2053 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
2054 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
2055 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
2057 1e37a5c2 2019-05-12 jcs return err;
2058 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
2059 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
2060 1e37a5c2 2019-05-12 jcs if (lv == NULL)
2061 638f9024 2019-05-13 stsp return got_error_from_errno(
2062 1e37a5c2 2019-05-12 jcs "view_open");
2063 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
2064 d01904d4 2019-06-25 stsp s->repo, s->head_ref_name, parent_path, 0);
2066 1e37a5c2 2019-05-12 jcs return err;;
2067 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2068 1e37a5c2 2019-05-12 jcs *new_view = lv;
2070 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
2071 1e37a5c2 2019-05-12 jcs *focus_view = lv;
2073 1e37a5c2 2019-05-12 jcs return NULL;
2076 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2077 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2079 d01904d4 2019-06-25 stsp return err;
2080 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2081 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2082 d01904d4 2019-06-25 stsp if (lv == NULL)
2083 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2084 d01904d4 2019-06-25 stsp err = get_head_commit_id(&start_id, s->head_ref_name ?
2085 d01904d4 2019-06-25 stsp s->head_ref_name : GOT_REF_HEAD, s->repo);
2087 d01904d4 2019-06-25 stsp return err;
2088 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2089 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2090 d01904d4 2019-06-25 stsp free(start_id);
2091 d01904d4 2019-06-25 stsp return got_error_from_errno("strdup");
2093 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2094 d01904d4 2019-06-25 stsp s->head_ref_name, in_repo_path, 0);
2096 d01904d4 2019-06-25 stsp return err;;
2097 d01904d4 2019-06-25 stsp *dead_view = view;
2098 d01904d4 2019-06-25 stsp *new_view = lv;
2104 80ddbec8 2018-04-29 stsp return err;
2107 4ed7e80c 2018-05-20 stsp static const struct got_error *
2108 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2110 c2db6724 2019-01-04 stsp const struct got_error *error;
2112 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2113 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2115 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2116 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2118 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
2119 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
2121 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2122 c2db6724 2019-01-04 stsp if (error != NULL)
2123 c2db6724 2019-01-04 stsp return error;
2125 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2126 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2128 c2db6724 2019-01-04 stsp return NULL;
2131 a915003a 2019-02-05 stsp static void
2132 a915003a 2019-02-05 stsp init_curses(void)
2134 a915003a 2019-02-05 stsp initscr();
2136 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2139 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2140 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2141 a915003a 2019-02-05 stsp curs_set(0);
2142 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2145 c2db6724 2019-01-04 stsp static const struct got_error *
2146 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2148 80ddbec8 2018-04-29 stsp const struct got_error *error;
2149 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2150 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2151 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2152 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2153 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
2154 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
2156 04cc582a 2018-08-01 stsp struct tog_view *view;
2158 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2160 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2161 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2162 c2db6724 2019-01-04 stsp NULL) == -1)
2163 80ddbec8 2018-04-29 stsp err(1, "pledge");
2166 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2167 80ddbec8 2018-04-29 stsp switch (ch) {
2169 80ddbec8 2018-04-29 stsp start_commit = optarg;
2172 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2173 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2174 ecb28ae0 2018-07-16 stsp err(1, "-r option");
2177 17020d27 2019-03-07 stsp usage_log();
2178 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2182 80ddbec8 2018-04-29 stsp argc -= optind;
2183 80ddbec8 2018-04-29 stsp argv += optind;
2185 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2186 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
2187 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
2188 ecb28ae0 2018-07-16 stsp goto done;
2190 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2191 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2192 963f97a1 2019-03-18 stsp goto done;
2193 963f97a1 2019-03-18 stsp error = NULL;
2195 963f97a1 2019-03-18 stsp if (argc == 0) {
2196 963f97a1 2019-03-18 stsp path = strdup("");
2197 963f97a1 2019-03-18 stsp if (path == NULL) {
2198 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2199 ecb28ae0 2018-07-16 stsp goto done;
2201 963f97a1 2019-03-18 stsp } else if (argc == 1) {
2202 963f97a1 2019-03-18 stsp if (worktree) {
2203 963f97a1 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
2205 963f97a1 2019-03-18 stsp if (error)
2206 963f97a1 2019-03-18 stsp goto done;
2208 963f97a1 2019-03-18 stsp path = strdup(argv[0]);
2209 963f97a1 2019-03-18 stsp if (path == NULL) {
2210 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2211 963f97a1 2019-03-18 stsp goto done;
2215 963f97a1 2019-03-18 stsp usage_log();
2217 963f97a1 2019-03-18 stsp repo_path = worktree ?
2218 963f97a1 2019-03-18 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
2219 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2220 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2221 963f97a1 2019-03-18 stsp goto done;
2224 a915003a 2019-02-05 stsp init_curses();
2226 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
2227 80ddbec8 2018-04-29 stsp if (error != NULL)
2228 ecb28ae0 2018-07-16 stsp goto done;
2230 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2231 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2232 c02c541e 2019-03-29 stsp if (error)
2233 c02c541e 2019-03-29 stsp goto done;
2235 15a94983 2018-12-23 stsp if (start_commit == NULL)
2236 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&start_id, worktree ?
2237 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2240 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&start_id,
2241 dd88155e 2019-06-29 stsp start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2242 80ddbec8 2018-04-29 stsp if (error != NULL)
2243 8b473291 2019-02-21 stsp goto done;
2245 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
2246 8b473291 2019-02-21 stsp if (error)
2247 ecb28ae0 2018-07-16 stsp goto done;
2249 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2250 04cc582a 2018-08-01 stsp if (view == NULL) {
2251 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2252 04cc582a 2018-08-01 stsp goto done;
2254 d01904d4 2019-06-25 stsp error = open_log_view(view, start_id, &refs, repo, worktree ?
2255 d01904d4 2019-06-25 stsp got_worktree_get_head_ref_name(worktree) : NULL, path, 1);
2256 ba4f502b 2018-08-04 stsp if (error)
2257 ba4f502b 2018-08-04 stsp goto done;
2258 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2260 ecb28ae0 2018-07-16 stsp free(repo_path);
2261 ecb28ae0 2018-07-16 stsp free(cwd);
2262 ecb28ae0 2018-07-16 stsp free(path);
2263 899d86c2 2018-05-10 stsp free(start_id);
2265 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2266 ec142235 2019-03-07 stsp if (worktree)
2267 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2268 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2269 80ddbec8 2018-04-29 stsp return error;
2272 4ed7e80c 2018-05-20 stsp __dead static void
2273 9f7d7167 2018-04-29 stsp usage_diff(void)
2276 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
2277 9f7d7167 2018-04-29 stsp getprogname());
2281 b304db33 2018-05-20 stsp static char *
2282 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2284 b304db33 2018-05-20 stsp char *line;
2285 b304db33 2018-05-20 stsp size_t linelen;
2286 b304db33 2018-05-20 stsp size_t lineno;
2287 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2289 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2291 b304db33 2018-05-20 stsp *len = linelen;
2292 b304db33 2018-05-20 stsp return line;
2295 4ed7e80c 2018-05-20 stsp static const struct got_error *
2296 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
2297 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
2298 c3e9aa98 2019-05-13 jcs char *header)
2300 61e69b96 2018-05-20 stsp const struct got_error *err;
2301 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
2302 b304db33 2018-05-20 stsp char *line;
2303 b304db33 2018-05-20 stsp size_t len;
2304 61e69b96 2018-05-20 stsp wchar_t *wline;
2305 e0b650dd 2018-05-20 stsp int width;
2307 26ed57b2 2018-05-19 stsp rewind(f);
2308 f7d12f7e 2018-08-01 stsp werase(view->window);
2310 a3404814 2018-09-02 stsp if (header) {
2311 a3404814 2018-09-02 stsp err = format_line(&wline, &width, header, view->ncols);
2312 a3404814 2018-09-02 stsp if (err) {
2313 a3404814 2018-09-02 stsp return err;
2316 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2317 a3404814 2018-09-02 stsp wstandout(view->window);
2318 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2319 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2320 a3404814 2018-09-02 stsp wstandend(view->window);
2321 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2322 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2324 a3404814 2018-09-02 stsp if (max_lines <= 1)
2325 a3404814 2018-09-02 stsp return NULL;
2326 a3404814 2018-09-02 stsp max_lines--;
2330 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2331 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2332 26ed57b2 2018-05-19 stsp if (line == NULL) {
2336 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
2337 26ed57b2 2018-05-19 stsp free(line);
2341 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2342 61e69b96 2018-05-20 stsp if (err) {
2343 61e69b96 2018-05-20 stsp free(line);
2344 61e69b96 2018-05-20 stsp return err;
2346 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2347 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2348 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2349 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2350 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
2351 26ed57b2 2018-05-19 stsp free(line);
2352 2550e4c3 2018-07-13 stsp free(wline);
2353 2550e4c3 2018-07-13 stsp wline = NULL;
2355 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
2357 1a57306a 2018-09-02 stsp view_vborder(view);
2359 c3e9aa98 2019-05-13 jcs if (*eof) {
2360 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2361 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2362 c3e9aa98 2019-05-13 jcs nprinted++;
2365 c3e9aa98 2019-05-13 jcs err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols);
2367 c3e9aa98 2019-05-13 jcs return err;
2370 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2371 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2372 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2375 26ed57b2 2018-05-19 stsp return NULL;
2378 abd2672a 2018-12-23 stsp static char *
2379 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2381 abd2672a 2018-12-23 stsp char *p, *s = ctime_r(time, datebuf);
2382 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2384 abd2672a 2018-12-23 stsp *p = '\0';
2388 4ed7e80c 2018-05-20 stsp static const struct got_error *
2389 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2390 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2392 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2393 abd2672a 2018-12-23 stsp char datebuf[26];
2394 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2395 15a94983 2018-12-23 stsp char *id_str = NULL;
2396 45d799e2 2018-12-23 stsp time_t committer_time;
2397 45d799e2 2018-12-23 stsp const char *author, *committer;
2398 8b473291 2019-02-21 stsp char *refs_str = NULL;
2400 8b473291 2019-02-21 stsp if (refs) {
2401 8b473291 2019-02-21 stsp err = build_refs_str(&refs_str, refs, commit_id);
2403 8b473291 2019-02-21 stsp return err;
2406 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2408 abd2672a 2018-12-23 stsp return err;
2410 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2411 15a94983 2018-12-23 stsp if (err) {
2412 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2413 15a94983 2018-12-23 stsp goto done;
2416 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2417 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2418 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2419 abd2672a 2018-12-23 stsp goto done;
2421 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2422 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2423 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2424 abd2672a 2018-12-23 stsp goto done;
2426 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2427 abd2672a 2018-12-23 stsp if (fprintf(outfile, "date: %s UTC\n",
2428 45d799e2 2018-12-23 stsp get_datestr(&committer_time, datebuf)) < 0) {
2429 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2430 abd2672a 2018-12-23 stsp goto done;
2432 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2433 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2434 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2435 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2436 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2437 abd2672a 2018-12-23 stsp goto done;
2439 45d799e2 2018-12-23 stsp if (fprintf(outfile, "%s\n",
2440 45d799e2 2018-12-23 stsp got_object_commit_get_logmsg(commit)) < 0) {
2441 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2442 abd2672a 2018-12-23 stsp goto done;
2445 abd2672a 2018-12-23 stsp free(id_str);
2446 8b473291 2019-02-21 stsp free(refs_str);
2447 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2448 abd2672a 2018-12-23 stsp return err;
2451 abd2672a 2018-12-23 stsp static const struct got_error *
2452 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
2454 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
2455 48ae06ee 2018-10-18 stsp FILE *f = NULL;
2456 15a94983 2018-12-23 stsp int obj_type;
2458 511a516b 2018-05-19 stsp f = got_opentemp();
2459 48ae06ee 2018-10-18 stsp if (f == NULL) {
2460 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
2461 48ae06ee 2018-10-18 stsp goto done;
2463 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
2464 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2465 fb43ecf1 2019-02-11 stsp goto done;
2469 15a94983 2018-12-23 stsp if (s->id1)
2470 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
2472 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
2474 15a94983 2018-12-23 stsp goto done;
2476 15a94983 2018-12-23 stsp switch (obj_type) {
2477 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
2478 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2479 54156555 2018-12-24 stsp s->diff_context, s->repo, f);
2481 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
2482 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2483 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
2485 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
2486 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
2487 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
2488 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
2490 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2493 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
2494 15a087fe 2019-02-21 stsp if (s->id1 == NULL)
2495 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs, s->repo, f);
2497 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
2498 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2499 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
2500 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs,
2501 8b473291 2019-02-21 stsp s->repo, f);
2506 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
2508 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
2509 15a94983 2018-12-23 stsp s->diff_context, s->repo, f);
2513 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2517 cbe7f848 2019-02-11 stsp if (f && fflush(f) != 0 && err == NULL)
2518 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
2519 48ae06ee 2018-10-18 stsp return err;
2522 f5215bb9 2019-02-22 stsp static void
2523 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
2525 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
2526 f5215bb9 2019-02-22 stsp update_panels();
2527 f5215bb9 2019-02-22 stsp doupdate();
2530 48ae06ee 2018-10-18 stsp static const struct got_error *
2531 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
2532 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
2533 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
2535 48ae06ee 2018-10-18 stsp const struct got_error *err;
2537 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
2538 15a94983 2018-12-23 stsp int type1, type2;
2539 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
2541 15a94983 2018-12-23 stsp return err;
2542 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
2544 15a94983 2018-12-23 stsp return err;
2546 15a94983 2018-12-23 stsp if (type1 != type2)
2547 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
2550 15a94983 2018-12-23 stsp if (id1) {
2551 15a94983 2018-12-23 stsp view->state.diff.id1 = got_object_id_dup(id1);
2552 15a94983 2018-12-23 stsp if (view->state.diff.id1 == NULL)
2553 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2555 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2557 15a94983 2018-12-23 stsp view->state.diff.id2 = got_object_id_dup(id2);
2558 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
2559 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2560 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2561 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2563 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
2564 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
2565 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
2566 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
2567 fb872ab2 2019-02-21 stsp view->state.diff.log_view = log_view;
2568 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
2569 8b473291 2019-02-21 stsp view->state.diff.refs = refs;
2571 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
2572 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
2573 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
2575 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
2576 48ae06ee 2018-10-18 stsp if (err) {
2577 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2578 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2579 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2580 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2581 48ae06ee 2018-10-18 stsp return err;
2584 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
2585 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
2586 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
2588 5dc9f4bc 2018-08-04 stsp return NULL;
2591 e5a0f69f 2018-08-18 stsp static const struct got_error *
2592 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
2594 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2596 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2597 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2598 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2599 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2600 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2601 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2602 e5a0f69f 2018-08-18 stsp return err;
2605 5dc9f4bc 2018-08-04 stsp static const struct got_error *
2606 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
2608 a3404814 2018-09-02 stsp const struct got_error *err;
2609 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
2610 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
2612 a3404814 2018-09-02 stsp if (s->id1) {
2613 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
2615 a3404814 2018-09-02 stsp return err;
2617 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
2619 a3404814 2018-09-02 stsp return err;
2621 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
2622 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2623 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2624 a3404814 2018-09-02 stsp free(id_str1);
2625 a3404814 2018-09-02 stsp free(id_str2);
2626 a3404814 2018-09-02 stsp return err;
2628 a3404814 2018-09-02 stsp free(id_str1);
2629 a3404814 2018-09-02 stsp free(id_str2);
2631 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
2632 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
2636 15a087fe 2019-02-21 stsp static const struct got_error *
2637 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
2638 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
2640 d7a04538 2019-02-21 stsp const struct got_error *err;
2641 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
2642 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
2643 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
2645 15a087fe 2019-02-21 stsp free(s->id2);
2646 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
2647 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
2648 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2650 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2652 d7a04538 2019-02-21 stsp return err;
2653 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
2654 15a087fe 2019-02-21 stsp free(s->id1);
2655 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
2656 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2657 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
2658 15a087fe 2019-02-21 stsp return NULL;
2661 0cf4efb1 2018-09-29 stsp static const struct got_error *
2662 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2663 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2665 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
2666 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
2667 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
2668 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
2671 e5a0f69f 2018-08-18 stsp switch (ch) {
2673 1e37a5c2 2019-05-12 jcs case KEY_UP:
2674 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
2675 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2677 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2678 a60a9dc4 2019-05-13 jcs case CTRL('b'):
2679 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
2682 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
2683 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
2684 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2687 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2688 1e37a5c2 2019-05-12 jcs if (!s->eof)
2689 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2691 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
2692 a60a9dc4 2019-05-13 jcs case CTRL('f'):
2694 00ba99a7 2019-05-12 jcs if (s->eof)
2697 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
2698 1e37a5c2 2019-05-12 jcs char *line;
2699 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
2700 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2701 1e37a5c2 2019-05-12 jcs if (line == NULL)
2706 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
2707 1e37a5c2 2019-05-12 jcs s->diff_context--;
2708 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2709 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2713 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2714 1e37a5c2 2019-05-12 jcs s->diff_context++;
2715 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2716 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2721 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2723 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2724 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
2725 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
2726 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2729 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2734 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2738 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2739 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2741 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2742 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2746 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2748 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2750 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2751 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
2753 1e37a5c2 2019-05-12 jcs /* Display "loading..." in log view. */
2754 1e37a5c2 2019-05-12 jcs show_log_view(s->log_view);
2755 1e37a5c2 2019-05-12 jcs update_panels();
2756 1e37a5c2 2019-05-12 jcs doupdate();
2758 1e37a5c2 2019-05-12 jcs err = trigger_log_thread(1 /* load_all */,
2759 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
2760 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
2761 1e37a5c2 2019-05-12 jcs &ls->thread_args.need_commits);
2765 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2770 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
2771 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2774 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2778 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2779 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2781 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2782 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2788 bcbd79e2 2018-08-19 stsp return err;
2791 4ed7e80c 2018-05-20 stsp static const struct got_error *
2792 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2794 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2795 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2796 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2797 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2798 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2799 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
2801 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2803 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2805 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2806 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2807 eb6600df 2019-01-04 stsp NULL) == -1)
2808 26ed57b2 2018-05-19 stsp err(1, "pledge");
2811 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2812 26ed57b2 2018-05-19 stsp switch (ch) {
2814 17020d27 2019-03-07 stsp usage_diff();
2815 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2819 26ed57b2 2018-05-19 stsp argc -= optind;
2820 26ed57b2 2018-05-19 stsp argv += optind;
2822 26ed57b2 2018-05-19 stsp if (argc == 0) {
2823 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2824 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2825 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2826 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2827 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2828 15a94983 2018-12-23 stsp id_str1 = argv[0];
2829 15a94983 2018-12-23 stsp id_str2 = argv[1];
2830 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2831 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2832 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2833 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2834 15a94983 2018-12-23 stsp id_str1 = argv[1];
2835 15a94983 2018-12-23 stsp id_str2 = argv[2];
2837 26ed57b2 2018-05-19 stsp usage_diff();
2839 a915003a 2019-02-05 stsp init_curses();
2841 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2842 eb6600df 2019-01-04 stsp if (error)
2843 eb6600df 2019-01-04 stsp goto done;
2845 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
2846 26ed57b2 2018-05-19 stsp if (error)
2847 26ed57b2 2018-05-19 stsp goto done;
2849 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
2850 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
2851 26ed57b2 2018-05-19 stsp if (error)
2852 26ed57b2 2018-05-19 stsp goto done;
2854 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
2855 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
2856 26ed57b2 2018-05-19 stsp if (error)
2857 26ed57b2 2018-05-19 stsp goto done;
2859 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
2860 8b473291 2019-02-21 stsp if (error)
2861 8b473291 2019-02-21 stsp goto done;
2863 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2864 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
2865 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2866 ea5e7bb5 2018-08-01 stsp goto done;
2868 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2869 5dc9f4bc 2018-08-04 stsp if (error)
2870 5dc9f4bc 2018-08-04 stsp goto done;
2871 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2873 c02c541e 2019-03-29 stsp free(repo_path);
2875 921be706 2019-06-28 stsp got_repo_close(repo);
2876 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2877 26ed57b2 2018-05-19 stsp return error;
2880 4ed7e80c 2018-05-20 stsp __dead static void
2881 9f7d7167 2018-04-29 stsp usage_blame(void)
2884 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2885 9f7d7167 2018-04-29 stsp getprogname());
2889 84451b3e 2018-07-10 stsp struct tog_blame_line {
2890 84451b3e 2018-07-10 stsp int annotated;
2891 84451b3e 2018-07-10 stsp struct got_object_id *id;
2894 4ed7e80c 2018-05-20 stsp static const struct got_error *
2895 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2896 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
2897 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
2898 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
2900 84451b3e 2018-07-10 stsp const struct got_error *err;
2901 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
2902 84451b3e 2018-07-10 stsp char *line;
2903 84451b3e 2018-07-10 stsp size_t len;
2904 84451b3e 2018-07-10 stsp wchar_t *wline;
2905 b700b5d6 2018-07-10 stsp int width, wlimit;
2906 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
2907 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
2908 ab089a2a 2018-07-12 stsp char *id_str;
2910 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
2912 ab089a2a 2018-07-12 stsp return err;
2914 84451b3e 2018-07-10 stsp rewind(f);
2915 f7d12f7e 2018-08-01 stsp werase(view->window);
2917 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
2918 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2919 ab089a2a 2018-07-12 stsp free(id_str);
2920 ab089a2a 2018-07-12 stsp return err;
2923 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2924 ab089a2a 2018-07-12 stsp free(line);
2925 2550e4c3 2018-07-13 stsp line = NULL;
2926 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2927 a3404814 2018-09-02 stsp wstandout(view->window);
2928 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2929 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2930 a3404814 2018-09-02 stsp wstandend(view->window);
2931 2550e4c3 2018-07-13 stsp free(wline);
2932 2550e4c3 2018-07-13 stsp wline = NULL;
2933 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2934 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2936 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
2937 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
2938 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
2939 ab089a2a 2018-07-12 stsp free(id_str);
2940 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2942 ab089a2a 2018-07-12 stsp free(id_str);
2943 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2944 3f60a8ef 2018-07-10 stsp free(line);
2945 2550e4c3 2018-07-13 stsp line = NULL;
2947 3f60a8ef 2018-07-10 stsp return err;
2948 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2949 2550e4c3 2018-07-13 stsp free(wline);
2950 2550e4c3 2018-07-13 stsp wline = NULL;
2951 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2952 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2955 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
2956 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
2957 84451b3e 2018-07-10 stsp if (line == NULL) {
2961 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
2962 84451b3e 2018-07-10 stsp free(line);
2966 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2967 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
2968 84451b3e 2018-07-10 stsp if (err) {
2969 84451b3e 2018-07-10 stsp free(line);
2970 84451b3e 2018-07-10 stsp return err;
2973 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2974 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2976 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
2977 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
2978 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
2979 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
2980 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
2981 84451b3e 2018-07-10 stsp char *id_str;
2982 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
2983 84451b3e 2018-07-10 stsp if (err) {
2984 84451b3e 2018-07-10 stsp free(line);
2985 2550e4c3 2018-07-13 stsp free(wline);
2986 84451b3e 2018-07-10 stsp return err;
2988 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
2989 84451b3e 2018-07-10 stsp free(id_str);
2990 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
2992 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
2993 ee41ec32 2018-07-10 stsp prev_id = NULL;
2996 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2997 b700b5d6 2018-07-10 stsp while (width < wlimit) {
2998 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
3001 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3002 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3003 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3004 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3005 84451b3e 2018-07-10 stsp free(line);
3006 2550e4c3 2018-07-13 stsp free(wline);
3007 2550e4c3 2018-07-13 stsp wline = NULL;
3009 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3011 1a57306a 2018-09-02 stsp view_vborder(view);
3013 84451b3e 2018-07-10 stsp return NULL;
3016 84451b3e 2018-07-10 stsp static const struct got_error *
3017 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3019 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3020 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3021 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3022 1a76625f 2018-10-22 stsp int errcode;
3024 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3025 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3026 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3028 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3029 1a76625f 2018-10-22 stsp if (errcode)
3030 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3032 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3033 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3034 d68a0a7d 2018-07-10 stsp goto done;
3037 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3038 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3040 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3041 d68a0a7d 2018-07-10 stsp if (line->annotated)
3042 d68a0a7d 2018-07-10 stsp goto done;
3044 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3045 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3046 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3047 84451b3e 2018-07-10 stsp goto done;
3049 84451b3e 2018-07-10 stsp line->annotated = 1;
3051 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3052 1a76625f 2018-10-22 stsp if (errcode)
3053 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3054 84451b3e 2018-07-10 stsp return err;
3057 84451b3e 2018-07-10 stsp static void *
3058 84451b3e 2018-07-10 stsp blame_thread(void *arg)
3060 18430de3 2018-07-10 stsp const struct got_error *err;
3061 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
3062 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
3063 1a76625f 2018-10-22 stsp int errcode;
3065 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
3066 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
3068 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3069 1a76625f 2018-10-22 stsp if (errcode)
3070 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
3071 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3073 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
3074 c9beca56 2018-07-22 stsp ta->repo = NULL;
3075 c9beca56 2018-07-22 stsp *ta->complete = 1;
3077 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3078 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
3079 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3081 18430de3 2018-07-10 stsp return (void *)err;
3084 245d91c1 2018-07-12 stsp static struct got_object_id *
3085 15a94983 2018-12-23 stsp get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
3086 15a94983 2018-12-23 stsp int selected_line)
3088 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
3090 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
3091 245d91c1 2018-07-12 stsp if (!line->annotated)
3092 245d91c1 2018-07-12 stsp return NULL;
3094 245d91c1 2018-07-12 stsp return line->id;
3097 b880a918 2018-07-10 stsp static const struct got_error *
3098 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
3100 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
3103 245d91c1 2018-07-12 stsp if (blame->thread) {
3104 1a76625f 2018-10-22 stsp int errcode;
3105 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3106 1a76625f 2018-10-22 stsp if (errcode)
3107 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3108 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
3109 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
3110 1a76625f 2018-10-22 stsp if (errcode)
3111 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
3112 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3113 1a76625f 2018-10-22 stsp if (errcode)
3114 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3115 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3116 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
3117 245d91c1 2018-07-12 stsp err = NULL;
3118 245d91c1 2018-07-12 stsp blame->thread = NULL;
3120 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
3121 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
3122 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
3124 245d91c1 2018-07-12 stsp if (blame->f) {
3125 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
3126 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3127 245d91c1 2018-07-12 stsp blame->f = NULL;
3129 57670559 2018-12-23 stsp if (blame->lines) {
3130 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
3131 57670559 2018-12-23 stsp free(blame->lines[i].id);
3132 57670559 2018-12-23 stsp free(blame->lines);
3133 57670559 2018-12-23 stsp blame->lines = NULL;
3135 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
3136 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
3138 245d91c1 2018-07-12 stsp return err;
3141 245d91c1 2018-07-12 stsp static const struct got_error *
3142 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3143 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
3144 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
3145 245d91c1 2018-07-12 stsp struct got_repository *repo)
3147 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
3148 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
3149 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
3150 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
3151 15a94983 2018-12-23 stsp int obj_type;
3153 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3155 15a94983 2018-12-23 stsp return err;
3156 15a94983 2018-12-23 stsp if (obj_id == NULL)
3157 15a94983 2018-12-23 stsp return got_error(GOT_ERR_NO_OBJ);
3159 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
3161 84451b3e 2018-07-10 stsp goto done;
3163 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
3164 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3165 84451b3e 2018-07-10 stsp goto done;
3168 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3170 a70480e0 2018-06-23 stsp goto done;
3171 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
3172 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
3173 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3174 84451b3e 2018-07-10 stsp goto done;
3176 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3177 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
3179 84451b3e 2018-07-10 stsp goto done;
3181 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
3182 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
3183 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3184 84451b3e 2018-07-10 stsp goto done;
3187 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
3189 bd24772e 2018-07-11 stsp goto done;
3191 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
3192 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
3193 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
3194 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
3195 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
3196 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3197 245d91c1 2018-07-12 stsp goto done;
3199 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
3201 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
3202 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
3203 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
3204 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
3205 245d91c1 2018-07-12 stsp *blame_complete = 0;
3209 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
3210 27d434c2 2018-09-15 stsp free(obj_id);
3212 245d91c1 2018-07-12 stsp stop_blame(blame);
3213 245d91c1 2018-07-12 stsp return err;
3216 245d91c1 2018-07-12 stsp static const struct got_error *
3217 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
3218 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3219 8b473291 2019-02-21 stsp struct got_repository *repo)
3221 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
3222 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3224 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
3226 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
3228 7cbe629d 2018-08-04 stsp return err;
3230 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
3231 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
3232 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
3233 fb2756b9 2018-08-04 stsp s->selected_line = 1;
3234 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
3235 fb2756b9 2018-08-04 stsp s->path = path;
3236 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
3237 638f9024 2019-05-13 stsp return got_error_from_errno("open_blame_view");
3238 fb2756b9 2018-08-04 stsp s->repo = repo;
3239 8b473291 2019-02-21 stsp s->refs = refs;
3240 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
3241 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
3243 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
3244 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
3245 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
3246 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
3247 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
3249 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
3250 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
3251 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
3252 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
3255 e5a0f69f 2018-08-18 stsp static const struct got_error *
3256 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
3258 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3259 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3261 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
3262 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
3264 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
3265 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
3266 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
3267 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3268 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
3271 e5a0f69f 2018-08-18 stsp free(s->path);
3273 e5a0f69f 2018-08-18 stsp return err;
3276 7cbe629d 2018-08-04 stsp static const struct got_error *
3277 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
3279 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
3281 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
3282 6c4c42e0 2019-06-24 stsp return NULL;
3285 6c4c42e0 2019-06-24 stsp static int
3286 6c4c42e0 2019-06-24 stsp match_line(const char *line, regex_t *regex)
3288 6c4c42e0 2019-06-24 stsp regmatch_t regmatch;
3290 6c4c42e0 2019-06-24 stsp return regexec(regex, line, 1, ®match, 0) == 0;
3294 6c4c42e0 2019-06-24 stsp static const struct got_error *
3295 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
3297 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
3298 6c4c42e0 2019-06-24 stsp int lineno;
3300 6c4c42e0 2019-06-24 stsp if (!view->searching) {
3301 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3302 6c4c42e0 2019-06-24 stsp return NULL;
3305 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
3306 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3307 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
3309 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
3311 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3312 6c4c42e0 2019-06-24 stsp lineno = 1;
3314 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
3317 6c4c42e0 2019-06-24 stsp while (1) {
3318 6c4c42e0 2019-06-24 stsp char *line = NULL;
3319 6c4c42e0 2019-06-24 stsp off_t offset;
3320 6c4c42e0 2019-06-24 stsp size_t len;
3322 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
3323 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
3324 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3325 6c4c42e0 2019-06-24 stsp free(line);
3329 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3330 6c4c42e0 2019-06-24 stsp lineno = 1;
3332 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
3335 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
3336 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
3337 6c4c42e0 2019-06-24 stsp free(line);
3338 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
3340 6c4c42e0 2019-06-24 stsp free(line);
3341 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
3342 2246482e 2019-06-25 stsp if (line && match_line(line, &view->regex)) {
3343 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
3344 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
3345 6c4c42e0 2019-06-24 stsp free(line);
3348 6c4c42e0 2019-06-24 stsp free(line);
3349 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
3355 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
3356 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
3357 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
3360 6c4c42e0 2019-06-24 stsp return NULL;
3363 6c4c42e0 2019-06-24 stsp static const struct got_error *
3364 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
3366 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3367 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
3368 2b380cc8 2018-10-24 stsp int errcode;
3370 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
3371 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
3372 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
3373 2b380cc8 2018-10-24 stsp if (errcode)
3374 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
3377 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
3378 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
3379 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
3380 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
3382 669b5ffa 2018-10-07 stsp view_vborder(view);
3383 e5a0f69f 2018-08-18 stsp return err;
3386 e5a0f69f 2018-08-18 stsp static const struct got_error *
3387 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
3388 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3390 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
3391 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
3392 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3393 669b5ffa 2018-10-07 stsp int begin_x = 0;
3395 e5a0f69f 2018-08-18 stsp switch (ch) {
3397 1e37a5c2 2019-05-12 jcs s->done = 1;
3400 1e37a5c2 2019-05-12 jcs case KEY_UP:
3401 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
3402 1e37a5c2 2019-05-12 jcs s->selected_line--;
3403 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
3404 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3405 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3407 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3408 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
3409 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
3412 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
3413 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
3414 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
3416 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3419 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3420 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
3421 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
3422 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
3423 1e37a5c2 2019-05-12 jcs s->selected_line++;
3424 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
3425 1e37a5c2 2019-05-12 jcs s->blame.nlines)
3426 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3429 1e37a5c2 2019-05-12 jcs case 'p': {
3430 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3431 1e37a5c2 2019-05-12 jcs id = get_selected_commit_id(s->blame.lines,
3432 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3433 1e37a5c2 2019-05-12 jcs if (id == NULL)
3435 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
3436 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
3437 15a94983 2018-12-23 stsp struct got_object_qid *pid;
3438 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
3439 1e37a5c2 2019-05-12 jcs int obj_type;
3440 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
3441 1e37a5c2 2019-05-12 jcs s->repo, id);
3444 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
3445 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
3446 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
3447 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3450 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
3451 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
3452 1e37a5c2 2019-05-12 jcs pid->id, s->path);
3453 e5a0f69f 2018-08-18 stsp if (err) {
3454 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
3455 1e37a5c2 2019-05-12 jcs err = NULL;
3456 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3459 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
3461 1e37a5c2 2019-05-12 jcs free(blob_id);
3462 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
3463 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
3464 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3467 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3469 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3471 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
3472 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
3474 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3479 1e37a5c2 2019-05-12 jcs s->done = 1;
3480 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3481 1e37a5c2 2019-05-12 jcs s->done = 0;
3482 1e37a5c2 2019-05-12 jcs if (thread_err)
3484 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3485 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
3486 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3487 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3488 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
3489 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
3494 1e37a5c2 2019-05-12 jcs case 'B': {
3495 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
3496 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
3497 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
3499 1e37a5c2 2019-05-12 jcs s->done = 1;
3500 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3501 1e37a5c2 2019-05-12 jcs s->done = 0;
3502 1e37a5c2 2019-05-12 jcs if (thread_err)
3504 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3505 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
3506 1e37a5c2 2019-05-12 jcs s->blamed_commit =
3507 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
3508 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3509 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3510 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
3511 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
3516 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
3517 1e37a5c2 2019-05-12 jcs case '\r': {
3518 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3519 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
3520 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
3521 1e37a5c2 2019-05-12 jcs id = get_selected_commit_id(s->blame.lines,
3522 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3523 1e37a5c2 2019-05-12 jcs if (id == NULL)
3525 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
3528 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
3529 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
3530 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
3531 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
3532 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3533 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
3534 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3535 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
3538 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
3539 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
3540 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3542 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3545 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
3546 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
3549 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
3551 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3554 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
3555 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
3557 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
3562 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3564 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3565 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
3566 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
3569 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3570 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
3571 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3572 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3575 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
3576 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
3577 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
3578 1e37a5c2 2019-05-12 jcs view->nlines - 2;
3580 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
3581 1e37a5c2 2019-05-12 jcs s->blame.nlines -
3582 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
3584 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
3585 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
3586 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3587 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3593 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
3596 a70480e0 2018-06-23 stsp static const struct got_error *
3597 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
3599 a70480e0 2018-06-23 stsp const struct got_error *error;
3600 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
3601 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3602 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
3603 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3604 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3605 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
3607 e1cd8fed 2018-08-01 stsp struct tog_view *view;
3609 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3611 a70480e0 2018-06-23 stsp #ifndef PROFILE
3612 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3613 8e94dd5b 2019-01-04 stsp NULL) == -1)
3614 a70480e0 2018-06-23 stsp err(1, "pledge");
3617 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3618 a70480e0 2018-06-23 stsp switch (ch) {
3620 a70480e0 2018-06-23 stsp commit_id_str = optarg;
3623 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
3624 69069811 2018-08-02 stsp if (repo_path == NULL)
3625 69069811 2018-08-02 stsp err(1, "-r option");
3628 17020d27 2019-03-07 stsp usage_blame();
3629 a70480e0 2018-06-23 stsp /* NOTREACHED */
3633 a70480e0 2018-06-23 stsp argc -= optind;
3634 a70480e0 2018-06-23 stsp argv += optind;
3636 69069811 2018-08-02 stsp if (argc == 1)
3637 69069811 2018-08-02 stsp path = argv[0];
3639 a70480e0 2018-06-23 stsp usage_blame();
3641 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
3642 69069811 2018-08-02 stsp if (cwd == NULL) {
3643 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3644 69069811 2018-08-02 stsp goto done;
3646 69069811 2018-08-02 stsp if (repo_path == NULL) {
3647 eb41ed75 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3648 eb41ed75 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3649 69069811 2018-08-02 stsp goto done;
3651 eb41ed75 2019-02-05 stsp error = NULL;
3652 eb41ed75 2019-02-05 stsp if (worktree) {
3653 eb41ed75 2019-02-05 stsp repo_path =
3654 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3655 eb41ed75 2019-02-05 stsp if (repo_path == NULL)
3656 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3657 eb41ed75 2019-02-05 stsp if (error)
3658 eb41ed75 2019-02-05 stsp goto done;
3660 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
3661 eb41ed75 2019-02-05 stsp if (repo_path == NULL) {
3662 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3663 eb41ed75 2019-02-05 stsp goto done;
3668 a915003a 2019-02-05 stsp init_curses();
3670 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
3671 c02c541e 2019-03-29 stsp if (error != NULL)
3672 8e94dd5b 2019-01-04 stsp goto done;
3674 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3675 c02c541e 2019-03-29 stsp if (error)
3676 92205607 2019-01-04 stsp goto done;
3678 eb41ed75 2019-02-05 stsp if (worktree) {
3679 eb41ed75 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3680 eb41ed75 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3681 eb41ed75 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3682 eb41ed75 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3683 eb41ed75 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3684 eb41ed75 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3685 eb41ed75 2019-02-05 stsp path) == -1) {
3686 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3687 eb41ed75 2019-02-05 stsp goto done;
3689 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3692 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3694 eb41ed75 2019-02-05 stsp if (error)
3695 69069811 2018-08-02 stsp goto done;
3697 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
3698 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
3699 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3700 a70480e0 2018-06-23 stsp if (error != NULL)
3701 66b4983c 2018-06-23 stsp goto done;
3702 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3703 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
3705 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
3706 dd88155e 2019-06-29 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
3708 a19e88aa 2018-06-23 stsp if (error != NULL)
3709 8b473291 2019-02-21 stsp goto done;
3711 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
3712 8b473291 2019-02-21 stsp if (error)
3713 a19e88aa 2018-06-23 stsp goto done;
3715 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3716 e1cd8fed 2018-08-01 stsp if (view == NULL) {
3717 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3718 e1cd8fed 2018-08-01 stsp goto done;
3720 8b473291 2019-02-21 stsp error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3721 7cbe629d 2018-08-04 stsp if (error)
3722 7cbe629d 2018-08-04 stsp goto done;
3723 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3725 69069811 2018-08-02 stsp free(repo_path);
3726 69069811 2018-08-02 stsp free(cwd);
3727 a70480e0 2018-06-23 stsp free(commit_id);
3728 eb41ed75 2019-02-05 stsp if (worktree)
3729 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
3731 a70480e0 2018-06-23 stsp got_repo_close(repo);
3732 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3733 a70480e0 2018-06-23 stsp return error;
3736 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3737 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
3738 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
3739 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
3740 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
3741 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
3742 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
3744 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3745 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
3746 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
3747 ffd1d5e5 2018-06-23 stsp int width, n;
3749 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
3751 f7d12f7e 2018-08-01 stsp werase(view->window);
3753 ffd1d5e5 2018-06-23 stsp if (limit == 0)
3754 ffd1d5e5 2018-06-23 stsp return NULL;
3756 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
3758 ffd1d5e5 2018-06-23 stsp return err;
3759 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3760 a3404814 2018-09-02 stsp wstandout(view->window);
3761 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3762 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3763 a3404814 2018-09-02 stsp wstandend(view->window);
3764 2550e4c3 2018-07-13 stsp free(wline);
3765 2550e4c3 2018-07-13 stsp wline = NULL;
3766 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3767 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3768 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3769 ffd1d5e5 2018-06-23 stsp return NULL;
3770 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
3772 ce52c690 2018-06-23 stsp return err;
3773 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3774 2550e4c3 2018-07-13 stsp free(wline);
3775 2550e4c3 2018-07-13 stsp wline = NULL;
3776 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3777 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3778 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3779 ffd1d5e5 2018-06-23 stsp return NULL;
3780 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3781 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
3782 a1eca9bb 2018-06-23 stsp return NULL;
3784 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3785 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
3786 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
3787 0cf4efb1 2018-09-29 stsp if (view->focussed)
3788 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3789 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
3791 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
3792 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
3793 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3794 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3795 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3796 ffd1d5e5 2018-06-23 stsp return NULL;
3800 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
3801 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3804 ffd1d5e5 2018-06-23 stsp while (te) {
3805 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
3807 1d13200f 2018-07-12 stsp if (show_ids) {
3808 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
3810 638f9024 2019-05-13 stsp return got_error_from_errno(
3811 230a42bd 2019-05-11 jcs "got_object_id_str");
3813 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3814 d8355ef1 2019-02-10 stsp te->name, S_ISDIR(te->mode) ? "/" :
3815 d8355ef1 2019-02-10 stsp ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3816 1d13200f 2018-07-12 stsp free(id_str);
3817 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3819 1d13200f 2018-07-12 stsp free(id_str);
3820 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
3821 ffd1d5e5 2018-06-23 stsp if (err) {
3822 ffd1d5e5 2018-06-23 stsp free(line);
3825 ffd1d5e5 2018-06-23 stsp if (n == selected) {
3826 0cf4efb1 2018-09-29 stsp if (view->focussed)
3827 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3828 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
3830 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3831 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3832 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3833 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
3834 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3835 ffd1d5e5 2018-06-23 stsp free(line);
3836 2550e4c3 2018-07-13 stsp free(wline);
3837 2550e4c3 2018-07-13 stsp wline = NULL;
3839 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3840 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
3841 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3843 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3846 ffd1d5e5 2018-06-23 stsp return err;
3849 ffd1d5e5 2018-06-23 stsp static void
3850 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
3851 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
3852 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
3854 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
3857 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
3860 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3861 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
3862 ffd1d5e5 2018-06-23 stsp if (!isroot)
3863 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3867 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
3868 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
3869 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
3870 ffd1d5e5 2018-06-23 stsp prev = te;
3871 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3873 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
3874 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3876 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3877 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3880 768394f3 2019-01-24 stsp static int
3881 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3882 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
3883 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
3885 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
3886 ffd1d5e5 2018-06-23 stsp int n = 0;
3888 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
3889 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3891 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
3892 768394f3 2019-01-24 stsp last = last_displayed_entry;
3893 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
3894 768394f3 2019-01-24 stsp last = SIMPLEQ_NEXT(last, entry);
3895 768394f3 2019-01-24 stsp if (last) {
3896 768394f3 2019-01-24 stsp *first_displayed_entry = next;
3897 768394f3 2019-01-24 stsp next = SIMPLEQ_NEXT(next, entry);
3903 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3904 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
3905 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
3907 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
3908 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
3909 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
3911 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
3912 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
3914 ce52c690 2018-06-23 stsp len += strlen(te->name);
3916 ce52c690 2018-06-23 stsp *path = calloc(1, len);
3917 ffd1d5e5 2018-06-23 stsp if (path == NULL)
3918 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3920 ce52c690 2018-06-23 stsp (*path)[0] = '/';
3921 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
3922 d9765a41 2018-06-23 stsp while (pt) {
3923 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3924 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3925 cb2ebc8a 2018-06-23 stsp goto done;
3927 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
3928 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3929 cb2ebc8a 2018-06-23 stsp goto done;
3931 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3934 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
3935 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3936 ce52c690 2018-06-23 stsp goto done;
3940 ce52c690 2018-06-23 stsp if (err) {
3941 ce52c690 2018-06-23 stsp free(*path);
3942 ce52c690 2018-06-23 stsp *path = NULL;
3944 ce52c690 2018-06-23 stsp return err;
3947 ce52c690 2018-06-23 stsp static const struct got_error *
3948 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
3949 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3950 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3951 8b473291 2019-02-21 stsp struct got_repository *repo)
3953 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
3954 ce52c690 2018-06-23 stsp char *path;
3955 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
3957 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
3959 ce52c690 2018-06-23 stsp return err;
3961 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3962 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
3963 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
3965 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
3966 e5a0f69f 2018-08-18 stsp if (err) {
3967 e5a0f69f 2018-08-18 stsp view_close(blame_view);
3968 e5a0f69f 2018-08-18 stsp free(path);
3970 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
3971 69efd4c4 2018-07-18 stsp return err;
3974 69efd4c4 2018-07-18 stsp static const struct got_error *
3975 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
3976 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3977 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3978 8b473291 2019-02-21 stsp struct got_repository *repo)
3980 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
3981 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
3982 69efd4c4 2018-07-18 stsp char *path;
3984 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3985 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
3986 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
3988 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
3990 69efd4c4 2018-07-18 stsp return err;
3992 d01904d4 2019-06-25 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
3994 e5a0f69f 2018-08-18 stsp view_close(log_view);
3996 e5a0f69f 2018-08-18 stsp *new_view = log_view;
3997 cb2ebc8a 2018-06-23 stsp free(path);
3998 cb2ebc8a 2018-06-23 stsp return err;
4001 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4002 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
4003 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4004 8b473291 2019-02-21 stsp struct got_repository *repo)
4006 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4007 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
4008 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4010 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
4012 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
4013 ffd1d5e5 2018-06-23 stsp if (err != NULL)
4014 ffd1d5e5 2018-06-23 stsp goto done;
4016 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4017 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4018 ffd1d5e5 2018-06-23 stsp goto done;
4021 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
4022 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
4023 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
4024 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
4025 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
4026 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4027 6484ec90 2018-09-29 stsp goto done;
4029 8b473291 2019-02-21 stsp s->refs = refs;
4030 fb2756b9 2018-08-04 stsp s->repo = repo;
4032 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
4033 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
4034 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
4035 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
4036 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
4038 ad80ab7b 2018-08-04 stsp free(commit_id_str);
4039 6484ec90 2018-09-29 stsp if (err) {
4040 fb2756b9 2018-08-04 stsp free(s->tree_label);
4041 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4043 ad80ab7b 2018-08-04 stsp return err;
4046 e5a0f69f 2018-08-18 stsp static const struct got_error *
4047 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
4049 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4051 fb2756b9 2018-08-04 stsp free(s->tree_label);
4052 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4053 6484ec90 2018-09-29 stsp free(s->commit_id);
4054 6484ec90 2018-09-29 stsp s->commit_id = NULL;
4055 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
4056 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
4057 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
4058 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
4059 ad80ab7b 2018-08-04 stsp free(parent);
4062 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
4063 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
4064 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
4066 7c32bd05 2019-06-22 stsp return NULL;
4069 7c32bd05 2019-06-22 stsp static const struct got_error *
4070 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
4072 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4074 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
4075 7c32bd05 2019-06-22 stsp return NULL;
4078 7c32bd05 2019-06-22 stsp static int
4079 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4081 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
4083 7c32bd05 2019-06-22 stsp return regexec(regex, te->name, 1, ®match, 0) == 0;
4086 7c32bd05 2019-06-22 stsp static const struct got_error *
4087 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
4089 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4090 7c32bd05 2019-06-22 stsp struct got_tree_entry *entry, *te;
4092 7c32bd05 2019-06-22 stsp if (!view->searching) {
4093 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4094 7c32bd05 2019-06-22 stsp return NULL;
4097 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4098 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
4099 7c32bd05 2019-06-22 stsp if (s->selected_entry)
4100 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_NEXT(s->selected_entry, entry);
4102 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4105 7c32bd05 2019-06-22 stsp if (s->selected_entry == NULL) {
4106 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4107 7c32bd05 2019-06-22 stsp entry = te;
4109 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4110 7c32bd05 2019-06-22 stsp entry = te;
4111 7c32bd05 2019-06-22 stsp if (SIMPLEQ_NEXT(te, entry) ==
4112 7c32bd05 2019-06-22 stsp s->selected_entry)
4118 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4119 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4121 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4122 7c32bd05 2019-06-22 stsp entry = te;
4126 7c32bd05 2019-06-22 stsp while (1) {
4127 7c32bd05 2019-06-22 stsp if (entry == NULL) {
4128 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
4129 ac66afb8 2019-06-24 stsp view->search_next_done = 1;
4130 ac66afb8 2019-06-24 stsp return NULL;
4132 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4133 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_FIRST(&s->entries->head);
4135 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4136 7c32bd05 2019-06-22 stsp entry = te;
4140 7c32bd05 2019-06-22 stsp if (match_tree_entry(entry, &view->regex)) {
4141 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4142 7c32bd05 2019-06-22 stsp s->matched_entry = entry;
4146 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4147 7c32bd05 2019-06-22 stsp entry = SIMPLEQ_NEXT(entry, entry);
4149 7c32bd05 2019-06-22 stsp if (SIMPLEQ_FIRST(&s->entries->head) == entry)
4150 7c32bd05 2019-06-22 stsp entry = NULL;
4152 7c32bd05 2019-06-22 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4153 7c32bd05 2019-06-22 stsp if (SIMPLEQ_NEXT(te, entry) == entry) {
4154 7c32bd05 2019-06-22 stsp entry = te;
4162 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4163 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
4164 7c32bd05 2019-06-22 stsp s->selected = 0;
4167 e5a0f69f 2018-08-18 stsp return NULL;
4170 ad80ab7b 2018-08-04 stsp static const struct got_error *
4171 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
4173 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
4174 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4175 e5a0f69f 2018-08-18 stsp char *parent_path;
4177 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
4179 e5a0f69f 2018-08-18 stsp return err;
4181 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
4182 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
4183 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
4184 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
4185 e5a0f69f 2018-08-18 stsp free(parent_path);
4187 669b5ffa 2018-10-07 stsp view_vborder(view);
4188 e5a0f69f 2018-08-18 stsp return err;
4191 e5a0f69f 2018-08-18 stsp static const struct got_error *
4192 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
4193 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4195 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4196 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
4197 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
4198 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
4200 e5a0f69f 2018-08-18 stsp switch (ch) {
4202 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
4205 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
4207 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4208 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4209 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
4210 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
4211 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
4212 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4213 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4215 1e37a5c2 2019-05-12 jcs return err;
4216 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
4218 1e37a5c2 2019-05-12 jcs view_close(log_view);
4221 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
4222 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4224 1e37a5c2 2019-05-12 jcs *new_view = log_view;
4227 1e37a5c2 2019-05-12 jcs case KEY_UP:
4228 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
4229 1e37a5c2 2019-05-12 jcs s->selected--;
4230 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
4233 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
4235 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
4236 1e37a5c2 2019-05-12 jcs s->entries, s->tree == s->root);
4238 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4239 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
4240 1e37a5c2 2019-05-12 jcs MAX(0, view->nlines - 4 - s->selected), s->entries,
4241 1e37a5c2 2019-05-12 jcs s->tree == s->root);
4242 1e37a5c2 2019-05-12 jcs s->selected = 0;
4243 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_FIRST(&s->entries->head) ==
4244 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
4245 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
4248 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4249 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
4250 1e37a5c2 2019-05-12 jcs s->selected++;
4253 00ba99a7 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry) == NULL)
4254 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
4256 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
4257 1e37a5c2 2019-05-12 jcs s->last_displayed_entry, s->entries);
4259 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4260 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
4262 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
4263 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
4264 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
4267 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
4268 1e37a5c2 2019-05-12 jcs view->nlines, s->last_displayed_entry, s->entries);
4269 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
4270 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
4271 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
4272 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
4274 1e37a5c2 2019-05-12 jcs ndisplayed++;
4275 1e37a5c2 2019-05-12 jcs te = SIMPLEQ_NEXT(te, entry);
4276 1e37a5c2 2019-05-12 jcs } while (te);
4277 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
4280 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4282 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
4283 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
4284 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
4285 1e37a5c2 2019-05-12 jcs /* user selected '..' */
4286 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
4288 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
4289 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
4291 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
4292 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
4293 1e37a5c2 2019-05-12 jcs s->entries =
4294 1e37a5c2 2019-05-12 jcs got_object_tree_get_entries(s->tree);
4295 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
4296 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
4297 1e37a5c2 2019-05-12 jcs s->selected_entry =
4298 1e37a5c2 2019-05-12 jcs parent->selected_entry;
4299 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
4300 1e37a5c2 2019-05-12 jcs free(parent);
4301 1e37a5c2 2019-05-12 jcs } else if (S_ISDIR(s->selected_entry->mode)) {
4302 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
4303 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&subtree,
4304 1e37a5c2 2019-05-12 jcs s->repo, s->selected_entry->id);
4307 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
4308 941e9f74 2019-05-21 stsp if (err) {
4309 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
4312 1e37a5c2 2019-05-12 jcs } else if (S_ISREG(s->selected_entry->mode)) {
4313 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
4314 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
4315 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
4317 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
4318 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
4319 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
4322 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
4323 669b5ffa 2018-10-07 stsp err = view_close_child(view);
4325 669b5ffa 2018-10-07 stsp return err;
4326 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
4327 669b5ffa 2018-10-07 stsp if (err) {
4328 1e37a5c2 2019-05-12 jcs view_close(blame_view);
4331 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
4332 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
4334 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
4337 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4338 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
4339 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
4345 ffd1d5e5 2018-06-23 stsp return err;
4348 ffd1d5e5 2018-06-23 stsp __dead static void
4349 ffd1d5e5 2018-06-23 stsp usage_tree(void)
4352 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
4353 ffd1d5e5 2018-06-23 stsp getprogname());
4357 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4358 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
4360 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
4361 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
4362 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4363 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
4364 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4365 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
4366 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
4367 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
4369 5221c383 2018-08-01 stsp struct tog_view *view;
4371 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4373 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
4374 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4375 d188b9a6 2019-01-04 stsp NULL) == -1)
4376 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
4379 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
4380 ffd1d5e5 2018-06-23 stsp switch (ch) {
4382 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
4385 17020d27 2019-03-07 stsp usage_tree();
4386 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
4390 ffd1d5e5 2018-06-23 stsp argc -= optind;
4391 ffd1d5e5 2018-06-23 stsp argv += optind;
4393 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
4394 52185f70 2019-02-05 stsp struct got_worktree *worktree;
4395 52185f70 2019-02-05 stsp char *cwd = getcwd(NULL, 0);
4396 52185f70 2019-02-05 stsp if (cwd == NULL)
4397 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
4398 52185f70 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
4399 52185f70 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4400 52185f70 2019-02-05 stsp goto done;
4401 52185f70 2019-02-05 stsp if (worktree) {
4402 52185f70 2019-02-05 stsp free(cwd);
4403 52185f70 2019-02-05 stsp repo_path =
4404 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4405 52185f70 2019-02-05 stsp got_worktree_close(worktree);
4407 52185f70 2019-02-05 stsp repo_path = cwd;
4408 52185f70 2019-02-05 stsp if (repo_path == NULL) {
4409 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
4410 52185f70 2019-02-05 stsp goto done;
4412 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
4413 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
4414 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
4415 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
4417 ffd1d5e5 2018-06-23 stsp usage_log();
4419 a915003a 2019-02-05 stsp init_curses();
4421 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
4422 c02c541e 2019-03-29 stsp if (error != NULL)
4423 52185f70 2019-02-05 stsp goto done;
4425 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4426 c02c541e 2019-03-29 stsp if (error)
4427 52185f70 2019-02-05 stsp goto done;
4429 15a94983 2018-12-23 stsp if (commit_id_arg == NULL)
4430 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&commit_id, GOT_REF_HEAD, repo);
4432 e09a504c 2019-06-28 stsp error = got_repo_match_object_id_prefix(&commit_id,
4433 dd88155e 2019-06-29 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
4434 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4435 ffd1d5e5 2018-06-23 stsp goto done;
4437 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4438 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4439 ffd1d5e5 2018-06-23 stsp goto done;
4441 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
4442 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
4443 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4444 8b473291 2019-02-21 stsp goto done;
4446 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
4447 8b473291 2019-02-21 stsp if (error)
4448 ffd1d5e5 2018-06-23 stsp goto done;
4450 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
4451 5221c383 2018-08-01 stsp if (view == NULL) {
4452 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4453 5221c383 2018-08-01 stsp goto done;
4455 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
4456 ad80ab7b 2018-08-04 stsp if (error)
4457 ad80ab7b 2018-08-04 stsp goto done;
4458 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4460 52185f70 2019-02-05 stsp free(repo_path);
4461 ffd1d5e5 2018-06-23 stsp free(commit_id);
4462 ffd1d5e5 2018-06-23 stsp if (commit)
4463 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
4465 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
4467 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
4468 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4469 ffd1d5e5 2018-06-23 stsp return error;
4472 ce5b7c56 2019-07-09 stsp static void
4473 ce5b7c56 2019-07-09 stsp list_commands(void)
4477 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
4478 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
4479 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
4480 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->name);
4482 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
4485 4ed7e80c 2018-05-20 stsp __dead static void
4486 ce5b7c56 2019-07-09 stsp usage(int hflag)
4488 5e070240 2019-06-22 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n", getprogname());
4489 ce5b7c56 2019-07-09 stsp if (hflag)
4490 ce5b7c56 2019-07-09 stsp list_commands();
4494 c2301be8 2018-04-30 stsp static char **
4495 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
4497 c2301be8 2018-04-30 stsp char **argv;
4498 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
4500 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
4501 c2301be8 2018-04-30 stsp if (argv == NULL)
4502 c2301be8 2018-04-30 stsp err(1, "calloc");
4503 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
4504 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
4505 c2301be8 2018-04-30 stsp err(1, "calloc");
4506 c2301be8 2018-04-30 stsp if (arg1) {
4507 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
4508 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
4509 c2301be8 2018-04-30 stsp err(1, "calloc");
4512 c2301be8 2018-04-30 stsp return argv;
4516 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
4518 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
4519 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
4520 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
4521 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
4523 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
4525 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
4526 9f7d7167 2018-04-29 stsp switch (ch) {
4528 9f7d7167 2018-04-29 stsp hflag = 1;
4531 ce5b7c56 2019-07-09 stsp usage(hflag);
4532 9f7d7167 2018-04-29 stsp /* NOTREACHED */
4536 9f7d7167 2018-04-29 stsp argc -= optind;
4537 9f7d7167 2018-04-29 stsp argv += optind;
4538 9f7d7167 2018-04-29 stsp optind = 0;
4539 c2301be8 2018-04-30 stsp optreset = 1;
4541 c2301be8 2018-04-30 stsp if (argc == 0) {
4542 f29d3e89 2018-06-23 stsp if (hflag)
4543 ce5b7c56 2019-07-09 stsp usage(hflag);
4544 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
4545 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
4546 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
4551 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
4552 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
4553 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
4554 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
4555 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
4560 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
4561 d70c3147 2019-07-09 stsp fprintf(stderr, "%s: unknown command '%s'\n",
4562 3642c4c6 2019-07-09 stsp getprogname(), argv[0]);
4563 ce5b7c56 2019-07-09 stsp list_commands();
4568 3642c4c6 2019-07-09 stsp if (hflag)
4569 3642c4c6 2019-07-09 stsp cmd->cmd_usage();
4571 3642c4c6 2019-07-09 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4574 c2301be8 2018-04-30 stsp free(cmd_argv);
4575 9f7d7167 2018-04-29 stsp if (error)
4576 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
