2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 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 61266923 2020-01-14 stsp #include <signal.h>
28 9f7d7167 2018-04-29 stsp #include <stdlib.h>
29 ee85c5e8 2020-02-29 stsp #include <stdarg.h>
30 26ed57b2 2018-05-19 stsp #include <stdio.h>
31 9f7d7167 2018-04-29 stsp #include <getopt.h>
32 9f7d7167 2018-04-29 stsp #include <string.h>
33 9f7d7167 2018-04-29 stsp #include <err.h>
34 80ddbec8 2018-04-29 stsp #include <unistd.h>
35 26ed57b2 2018-05-19 stsp #include <util.h>
36 26ed57b2 2018-05-19 stsp #include <limits.h>
37 61e69b96 2018-05-20 stsp #include <wchar.h>
38 788c352e 2018-06-16 stsp #include <time.h>
39 84451b3e 2018-07-10 stsp #include <pthread.h>
40 5036bf37 2018-09-24 stsp #include <libgen.h>
41 60493ae3 2019-06-20 stsp #include <regex.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 9f7d7167 2018-04-29 stsp #include "got_error.h"
45 80ddbec8 2018-04-29 stsp #include "got_object.h"
46 80ddbec8 2018-04-29 stsp #include "got_reference.h"
47 80ddbec8 2018-04-29 stsp #include "got_repository.h"
48 80ddbec8 2018-04-29 stsp #include "got_diff.h"
49 511a516b 2018-05-19 stsp #include "got_opentemp.h"
50 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
51 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
52 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
53 a70480e0 2018-06-23 stsp #include "got_blame.h"
54 c2db6724 2019-01-04 stsp #include "got_privsep.h"
55 1dd54920 2019-05-11 stsp #include "got_path.h"
56 b7165be3 2019-02-05 stsp #include "got_worktree.h"
59 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
66 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
68 9f7d7167 2018-04-29 stsp #ifndef nitems
69 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
72 9f7d7167 2018-04-29 stsp struct tog_cmd {
73 c2301be8 2018-04-30 stsp const char *name;
74 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
75 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
78 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
79 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
82 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
84 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
85 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
86 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
87 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
89 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
90 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
91 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
92 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
93 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
96 d6b05b5b 2018-08-04 stsp enum tog_view_type {
97 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
98 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
99 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
100 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
103 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
105 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
106 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
107 ba4f502b 2018-08-04 stsp struct got_object_id *id;
108 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
111 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
112 ba4f502b 2018-08-04 stsp struct commit_queue {
113 ba4f502b 2018-08-04 stsp int ncommits;
114 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
117 f26dddb7 2019-11-08 stsp struct tog_color {
118 f26dddb7 2019-11-08 stsp SIMPLEQ_ENTRY(tog_color) entry;
119 6d17833f 2019-11-08 stsp regex_t regex;
120 6d17833f 2019-11-08 stsp short colorpair;
122 f26dddb7 2019-11-08 stsp SIMPLEQ_HEAD(tog_colors, tog_color);
124 11b20872 2019-11-08 stsp static const struct got_error *
125 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
126 11b20872 2019-11-08 stsp int idx, short color)
128 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
129 11b20872 2019-11-08 stsp struct tog_color *tc;
130 11b20872 2019-11-08 stsp int regerr = 0;
132 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
133 11b20872 2019-11-08 stsp return NULL;
135 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
137 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
138 11b20872 2019-11-08 stsp if (tc == NULL)
139 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
140 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
141 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
142 11b20872 2019-11-08 stsp if (regerr) {
143 11b20872 2019-11-08 stsp static char regerr_msg[512];
144 11b20872 2019-11-08 stsp static char err_msg[512];
145 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
146 11b20872 2019-11-08 stsp sizeof(regerr_msg));
147 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
148 11b20872 2019-11-08 stsp regerr_msg);
149 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
151 11b20872 2019-11-08 stsp return err;
153 11b20872 2019-11-08 stsp tc->colorpair = idx;
154 11b20872 2019-11-08 stsp SIMPLEQ_INSERT_HEAD(colors, tc, entry);
155 11b20872 2019-11-08 stsp return NULL;
158 11b20872 2019-11-08 stsp static void
159 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
161 11b20872 2019-11-08 stsp struct tog_color *tc;
163 11b20872 2019-11-08 stsp while (!SIMPLEQ_EMPTY(colors)) {
164 11b20872 2019-11-08 stsp tc = SIMPLEQ_FIRST(colors);
165 11b20872 2019-11-08 stsp SIMPLEQ_REMOVE_HEAD(colors, entry);
166 11b20872 2019-11-08 stsp regfree(&tc->regex);
171 11b20872 2019-11-08 stsp struct tog_color *
172 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
174 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
176 11b20872 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
177 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
181 11b20872 2019-11-08 stsp return NULL;
185 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
187 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
188 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
189 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
190 11b20872 2019-11-08 stsp return COLOR_CYAN;
191 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
192 11b20872 2019-11-08 stsp return COLOR_YELLOW;
193 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
194 11b20872 2019-11-08 stsp return COLOR_GREEN;
195 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
196 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
197 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
198 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
199 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
200 91b8c405 2020-01-25 stsp return COLOR_CYAN;
201 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
202 11b20872 2019-11-08 stsp return COLOR_GREEN;
203 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
204 11b20872 2019-11-08 stsp return COLOR_GREEN;
205 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
206 11b20872 2019-11-08 stsp return COLOR_CYAN;
207 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
208 11b20872 2019-11-08 stsp return COLOR_YELLOW;
214 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
216 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
218 11b20872 2019-11-08 stsp if (val == NULL)
219 11b20872 2019-11-08 stsp return default_color_value(envvar);
221 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
222 11b20872 2019-11-08 stsp return COLOR_BLACK;
223 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
224 11b20872 2019-11-08 stsp return COLOR_RED;
225 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
226 11b20872 2019-11-08 stsp return COLOR_GREEN;
227 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
228 11b20872 2019-11-08 stsp return COLOR_YELLOW;
229 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
230 11b20872 2019-11-08 stsp return COLOR_BLUE;
231 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
232 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
233 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
234 11b20872 2019-11-08 stsp return COLOR_CYAN;
235 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
236 11b20872 2019-11-08 stsp return COLOR_WHITE;
237 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
240 11b20872 2019-11-08 stsp return default_color_value(envvar);
244 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
245 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
247 15a087fe 2019-02-21 stsp int first_displayed_line;
248 15a087fe 2019-02-21 stsp int last_displayed_line;
250 15a087fe 2019-02-21 stsp int diff_context;
251 15a087fe 2019-02-21 stsp struct got_repository *repo;
252 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
253 bddb1296 2019-11-08 stsp struct tog_colors colors;
254 f44b1f58 2020-02-02 tracey int nlines;
255 f44b1f58 2020-02-02 tracey off_t *line_offsets;
256 f44b1f58 2020-02-02 tracey int matched_line;
257 f44b1f58 2020-02-02 tracey int selected_line;
258 f44b1f58 2020-02-02 tracey size_t filesize;
260 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
261 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
264 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
266 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
267 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
268 7c1452c1 2020-03-26 stsp pthread_cond_t commit_loaded;
269 1a76625f 2018-10-22 stsp int commits_needed;
270 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
271 1a76625f 2018-10-22 stsp struct commit_queue *commits;
272 1a76625f 2018-10-22 stsp const char *in_repo_path;
273 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
274 1a76625f 2018-10-22 stsp struct got_repository *repo;
275 1a76625f 2018-10-22 stsp int log_complete;
276 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
277 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
278 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
279 13add988 2019-10-15 stsp int *searching;
280 13add988 2019-10-15 stsp int *search_next_done;
281 13add988 2019-10-15 stsp regex_t *regex;
284 1a76625f 2018-10-22 stsp struct tog_log_view_state {
285 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
286 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
287 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
288 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
289 b01e7d3b 2018-08-04 stsp int selected;
290 b01e7d3b 2018-08-04 stsp char *in_repo_path;
291 d01904d4 2019-06-25 stsp const char *head_ref_name;
292 b672a97a 2020-01-27 stsp int log_branches;
293 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
294 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
295 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
296 1a76625f 2018-10-22 stsp sig_atomic_t quit;
297 1a76625f 2018-10-22 stsp pthread_t thread;
298 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
299 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
300 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
301 11b20872 2019-11-08 stsp struct tog_colors colors;
304 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
305 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
306 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
307 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
308 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
309 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
310 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
311 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
312 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
313 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
314 11b20872 2019-11-08 stsp #define TOG_COLOR_DATE 11
316 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
317 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
318 e9424729 2018-08-04 stsp int nlines;
320 e9424729 2018-08-04 stsp struct tog_view *view;
321 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
325 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
326 e9424729 2018-08-04 stsp const char *path;
327 e9424729 2018-08-04 stsp struct got_repository *repo;
328 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
329 e9424729 2018-08-04 stsp int *complete;
330 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
331 fc06ba56 2019-08-22 stsp void *cancel_arg;
334 e9424729 2018-08-04 stsp struct tog_blame {
336 e9424729 2018-08-04 stsp size_t filesize;
337 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
338 6fcac457 2018-11-19 stsp int nlines;
339 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
340 e9424729 2018-08-04 stsp pthread_t thread;
341 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
342 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
343 e9424729 2018-08-04 stsp const char *path;
346 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
347 7cbe629d 2018-08-04 stsp int first_displayed_line;
348 7cbe629d 2018-08-04 stsp int last_displayed_line;
349 7cbe629d 2018-08-04 stsp int selected_line;
350 7cbe629d 2018-08-04 stsp int blame_complete;
353 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
354 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
355 e5a0f69f 2018-08-18 stsp char *path;
356 7cbe629d 2018-08-04 stsp struct got_repository *repo;
357 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
358 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
359 e9424729 2018-08-04 stsp struct tog_blame blame;
360 6c4c42e0 2019-06-24 stsp int matched_line;
361 11b20872 2019-11-08 stsp struct tog_colors colors;
364 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
365 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
366 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
367 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
368 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
369 ad80ab7b 2018-08-04 stsp int selected;
372 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
374 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
375 ad80ab7b 2018-08-04 stsp char *tree_label;
376 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
377 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
378 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
379 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
380 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
381 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
382 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
383 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
384 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
385 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
386 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
387 bddb1296 2019-11-08 stsp struct tog_colors colors;
391 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
393 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
394 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
395 669b5ffa 2018-10-07 stsp * there is enough screen estate.
397 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
398 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
400 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
401 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
402 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
404 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
405 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
407 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
409 cc3c9aac 2018-08-01 stsp struct tog_view {
410 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
411 26ed57b2 2018-05-19 stsp WINDOW *window;
412 26ed57b2 2018-05-19 stsp PANEL *panel;
413 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
414 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
415 1004088d 2018-09-29 stsp int focussed;
416 669b5ffa 2018-10-07 stsp struct tog_view *parent;
417 669b5ffa 2018-10-07 stsp struct tog_view *child;
418 669b5ffa 2018-10-07 stsp int child_focussed;
420 5dc9f4bc 2018-08-04 stsp /* type-specific state */
421 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
423 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
424 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
425 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
426 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
429 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
430 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
431 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
432 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
434 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
435 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
436 60493ae3 2019-06-20 stsp int searching;
437 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
438 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
439 60493ae3 2019-06-20 stsp int search_next_done;
440 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_HAVE_MORE 1
441 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_NO_MORE 2
442 f9967bca 2020-03-27 stsp #define TOG_SEARCH_HAVE_NONE 3
443 1803e47f 2019-06-22 stsp regex_t regex;
446 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
447 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
448 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
449 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
450 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
451 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
452 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
453 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
454 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
456 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
457 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
458 f135c941 2020-02-20 stsp struct got_repository *, const char *, const char *, int);
459 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
460 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
461 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
462 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
463 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
464 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
466 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
467 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
468 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
469 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
470 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
471 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
472 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
473 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
475 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
476 55cccc34 2020-02-20 stsp struct got_tree_object *, struct got_object_id *, struct got_reflist_head *,
477 55cccc34 2020-02-20 stsp struct got_repository *);
478 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
479 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
480 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
481 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
482 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
483 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
485 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
486 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
487 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
489 25791caa 2018-10-24 stsp static void
490 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
492 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
495 83baff54 2019-08-12 stsp static void
496 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
498 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
501 61266923 2020-01-14 stsp static void
502 61266923 2020-01-14 stsp tog_sigcont(int signo)
504 61266923 2020-01-14 stsp tog_sigcont_received = 1;
507 e5a0f69f 2018-08-18 stsp static const struct got_error *
508 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
510 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
512 669b5ffa 2018-10-07 stsp if (view->child) {
513 669b5ffa 2018-10-07 stsp view_close(view->child);
514 669b5ffa 2018-10-07 stsp view->child = NULL;
516 e5a0f69f 2018-08-18 stsp if (view->close)
517 e5a0f69f 2018-08-18 stsp err = view->close(view);
518 ea5e7bb5 2018-08-01 stsp if (view->panel)
519 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
520 ea5e7bb5 2018-08-01 stsp if (view->window)
521 ea5e7bb5 2018-08-01 stsp delwin(view->window);
522 ea5e7bb5 2018-08-01 stsp free(view);
523 e5a0f69f 2018-08-18 stsp return err;
526 ea5e7bb5 2018-08-01 stsp static struct tog_view *
527 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
528 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
530 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
532 ea5e7bb5 2018-08-01 stsp if (view == NULL)
533 ea5e7bb5 2018-08-01 stsp return NULL;
535 d6b05b5b 2018-08-04 stsp view->type = type;
536 f7d12f7e 2018-08-01 stsp view->lines = LINES;
537 f7d12f7e 2018-08-01 stsp view->cols = COLS;
538 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
539 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
540 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
541 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
542 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
543 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
544 96a765a8 2018-08-04 stsp view_close(view);
545 ea5e7bb5 2018-08-01 stsp return NULL;
547 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
548 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
549 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
550 96a765a8 2018-08-04 stsp view_close(view);
551 ea5e7bb5 2018-08-01 stsp return NULL;
554 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
555 ea5e7bb5 2018-08-01 stsp return view;
559 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
561 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
563 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
566 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
568 5c60c32a 2018-10-18 stsp static const struct got_error *
569 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
571 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
573 5c60c32a 2018-10-18 stsp view->begin_y = 0;
574 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
575 5c60c32a 2018-10-18 stsp view->nlines = LINES;
576 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
577 5c60c32a 2018-10-18 stsp view->lines = LINES;
578 5c60c32a 2018-10-18 stsp view->cols = COLS;
579 5c60c32a 2018-10-18 stsp err = view_resize(view);
581 5c60c32a 2018-10-18 stsp return err;
583 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
584 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
586 5c60c32a 2018-10-18 stsp return NULL;
589 5c60c32a 2018-10-18 stsp static const struct got_error *
590 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
592 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
594 5c60c32a 2018-10-18 stsp view->begin_x = 0;
595 5c60c32a 2018-10-18 stsp view->begin_y = 0;
596 5c60c32a 2018-10-18 stsp view->nlines = LINES;
597 5c60c32a 2018-10-18 stsp view->ncols = COLS;
598 5c60c32a 2018-10-18 stsp view->lines = LINES;
599 5c60c32a 2018-10-18 stsp view->cols = COLS;
600 5c60c32a 2018-10-18 stsp err = view_resize(view);
602 5c60c32a 2018-10-18 stsp return err;
604 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
605 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
607 5c60c32a 2018-10-18 stsp return NULL;
611 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
613 5c60c32a 2018-10-18 stsp return view->parent == NULL;
616 4d8c2215 2018-08-19 stsp static const struct got_error *
617 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
619 f7d12f7e 2018-08-01 stsp int nlines, ncols;
621 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
622 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
624 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
626 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
627 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
629 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
631 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
632 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
633 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
634 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
635 25791caa 2018-10-24 stsp wclear(view->window);
637 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
638 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
639 0cf4efb1 2018-09-29 stsp view->lines = LINES;
640 0cf4efb1 2018-09-29 stsp view->cols = COLS;
642 6e3e5d9c 2018-10-18 stsp if (view->child) {
643 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
644 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
645 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
646 5c60c32a 2018-10-18 stsp if (view->child->focussed)
647 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
649 5c60c32a 2018-10-18 stsp show_panel(view->panel);
651 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
652 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
656 5c60c32a 2018-10-18 stsp return NULL;
659 669b5ffa 2018-10-07 stsp static const struct got_error *
660 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
662 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
664 669b5ffa 2018-10-07 stsp if (view->child == NULL)
665 669b5ffa 2018-10-07 stsp return NULL;
667 669b5ffa 2018-10-07 stsp err = view_close(view->child);
668 669b5ffa 2018-10-07 stsp view->child = NULL;
669 669b5ffa 2018-10-07 stsp return err;
672 669b5ffa 2018-10-07 stsp static const struct got_error *
673 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
675 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
677 669b5ffa 2018-10-07 stsp view->child = child;
678 669b5ffa 2018-10-07 stsp child->parent = view;
679 669b5ffa 2018-10-07 stsp return err;
683 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
685 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
688 34bc9ec9 2019-02-22 stsp static void
689 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
691 25791caa 2018-10-24 stsp int cols, lines;
692 25791caa 2018-10-24 stsp struct winsize size;
694 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
695 25791caa 2018-10-24 stsp cols = 80; /* Default */
696 25791caa 2018-10-24 stsp lines = 24;
698 25791caa 2018-10-24 stsp cols = size.ws_col;
699 25791caa 2018-10-24 stsp lines = size.ws_row;
701 25791caa 2018-10-24 stsp resize_term(lines, cols);
704 2b49a8ae 2019-06-22 stsp static const struct got_error *
705 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
707 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
708 2b49a8ae 2019-06-22 stsp char pattern[1024];
711 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
712 2b49a8ae 2019-06-22 stsp return NULL;
714 cb1159f8 2020-02-19 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
715 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
717 2b49a8ae 2019-06-22 stsp nocbreak();
719 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
722 2b49a8ae 2019-06-22 stsp if (ret == ERR)
723 2b49a8ae 2019-06-22 stsp return NULL;
725 2b49a8ae 2019-06-22 stsp if (view->searching) {
726 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
727 2b49a8ae 2019-06-22 stsp view->searching = 0;
730 2b49a8ae 2019-06-22 stsp if (regcomp(&view->regex, pattern,
731 f5daf9b1 2019-06-24 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
732 7c32bd05 2019-06-22 stsp err = view->search_start(view);
734 7c32bd05 2019-06-22 stsp regfree(&view->regex);
735 7c32bd05 2019-06-22 stsp return err;
737 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
738 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
739 2b49a8ae 2019-06-22 stsp view->search_next(view);
742 2b49a8ae 2019-06-22 stsp return NULL;
745 0cf4efb1 2018-09-29 stsp static const struct got_error *
746 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
747 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
748 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
750 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
751 669b5ffa 2018-10-07 stsp struct tog_view *v;
752 1a76625f 2018-10-22 stsp int ch, errcode;
754 e5a0f69f 2018-08-18 stsp *new = NULL;
755 e5a0f69f 2018-08-18 stsp *dead = NULL;
756 0cf4efb1 2018-09-29 stsp *focus = NULL;
758 f9967bca 2020-03-27 stsp /* Clear "no matches" indicator. */
759 f9967bca 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE ||
760 f9967bca 2020-03-27 stsp view->search_next_done == TOG_SEARCH_HAVE_NONE)
761 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
763 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
764 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
765 82954512 2020-02-03 stsp if (errcode)
766 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
767 82954512 2020-02-03 stsp "pthread_mutex_unlock");
768 82954512 2020-02-03 stsp pthread_yield();
769 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
770 82954512 2020-02-03 stsp if (errcode)
771 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
772 82954512 2020-02-03 stsp "pthread_mutex_lock");
773 60493ae3 2019-06-20 stsp view->search_next(view);
774 60493ae3 2019-06-20 stsp return NULL;
777 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
778 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
779 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
780 1a76625f 2018-10-22 stsp if (errcode)
781 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
782 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
783 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
784 1a76625f 2018-10-22 stsp if (errcode)
785 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
786 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
788 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
789 25791caa 2018-10-24 stsp tog_resizeterm();
790 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
791 61266923 2020-01-14 stsp tog_sigcont_received = 0;
792 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
793 25791caa 2018-10-24 stsp err = view_resize(v);
795 25791caa 2018-10-24 stsp return err;
796 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
798 25791caa 2018-10-24 stsp return err;
802 e5a0f69f 2018-08-18 stsp switch (ch) {
806 1e37a5c2 2019-05-12 jcs if (view->child) {
807 1e37a5c2 2019-05-12 jcs *focus = view->child;
808 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
809 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
810 1e37a5c2 2019-05-12 jcs *focus = view->parent;
811 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
815 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
816 1e37a5c2 2019-05-12 jcs *dead = view;
822 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
823 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
825 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
826 669b5ffa 2018-10-07 stsp *focus = view->child;
827 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
828 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
830 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
833 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
834 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
836 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
837 1e37a5c2 2019-05-12 jcs *focus = view;
838 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
839 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
841 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
845 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
846 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
849 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
852 60493ae3 2019-06-20 stsp if (view->search_start)
853 2b49a8ae 2019-06-22 stsp view_search_start(view);
855 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
859 8f4ed634 2020-03-26 stsp if (view->search_next) {
860 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
861 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
862 60493ae3 2019-06-20 stsp view->search_next_done = 0;
863 60493ae3 2019-06-20 stsp view->search_next(view);
865 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
868 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
872 e5a0f69f 2018-08-18 stsp return err;
876 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
878 0cf4efb1 2018-09-29 stsp PANEL *panel;
879 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
881 669b5ffa 2018-10-07 stsp if (view->parent)
882 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
884 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
885 0cf4efb1 2018-09-29 stsp if (panel == NULL)
888 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
889 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
890 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
894 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
896 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
897 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
899 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
901 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
904 669b5ffa 2018-10-07 stsp return view->focussed;
907 bcbd79e2 2018-08-19 stsp static const struct got_error *
908 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
910 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
911 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
912 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
913 fd823528 2018-10-22 stsp int fast_refresh = 10;
914 1a76625f 2018-10-22 stsp int done = 0, errcode;
916 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
917 1a76625f 2018-10-22 stsp if (errcode)
918 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
920 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
921 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
923 a81bf10d 2018-09-29 stsp main_view = view;
924 1004088d 2018-09-29 stsp view->focussed = 1;
925 878940b7 2018-09-29 stsp err = view->show(view);
927 0cf4efb1 2018-09-29 stsp return err;
928 0cf4efb1 2018-09-29 stsp update_panels();
929 0cf4efb1 2018-09-29 stsp doupdate();
930 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
931 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
932 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
933 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
935 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
936 e4197bf9 2018-08-18 stsp view, &views);
939 e5a0f69f 2018-08-18 stsp if (dead_view) {
940 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
942 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
943 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
944 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
945 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
946 669b5ffa 2018-10-07 stsp prev = view->parent;
948 669b5ffa 2018-10-07 stsp if (dead_view->parent)
949 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
951 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
953 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
954 d01904d4 2019-06-25 stsp if (err || (dead_view == main_view && new_view == NULL))
957 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
958 0cf4efb1 2018-09-29 stsp if (focus_view)
959 0cf4efb1 2018-09-29 stsp view = focus_view;
960 669b5ffa 2018-10-07 stsp else if (prev)
961 669b5ffa 2018-10-07 stsp view = prev;
962 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
963 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
964 0cf4efb1 2018-09-29 stsp tog_view_list_head);
966 0cf4efb1 2018-09-29 stsp view = NULL;
967 669b5ffa 2018-10-07 stsp if (view) {
968 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
969 669b5ffa 2018-10-07 stsp focus_view = view->child;
971 669b5ffa 2018-10-07 stsp focus_view = view;
975 bcbd79e2 2018-08-19 stsp if (new_view) {
976 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
977 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
978 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
979 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
981 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
982 86c66b02 2018-10-18 stsp err = view_close(v);
987 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
988 fed7eaa8 2018-10-24 stsp view = new_view;
989 878940b7 2018-09-29 stsp if (focus_view == NULL)
990 878940b7 2018-09-29 stsp focus_view = new_view;
992 0cf4efb1 2018-09-29 stsp if (focus_view) {
993 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
995 0cf4efb1 2018-09-29 stsp view->focussed = 0;
996 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
997 0cf4efb1 2018-09-29 stsp view = focus_view;
998 878940b7 2018-09-29 stsp if (new_view)
999 878940b7 2018-09-29 stsp show_panel(new_view->panel);
1000 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
1001 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
1003 669b5ffa 2018-10-07 stsp if (view) {
1004 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
1005 758194b5 2018-10-24 stsp view->focussed = 1;
1006 758194b5 2018-10-24 stsp show_panel(view->panel);
1007 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
1008 758194b5 2018-10-24 stsp show_panel(view->child->panel);
1009 1a76625f 2018-10-22 stsp focus_view = view;
1011 669b5ffa 2018-10-07 stsp if (view->parent) {
1012 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1014 1a76625f 2018-10-22 stsp goto done;
1016 669b5ffa 2018-10-07 stsp err = view->show(view);
1018 1a76625f 2018-10-22 stsp goto done;
1019 669b5ffa 2018-10-07 stsp if (view->child) {
1020 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1022 1a76625f 2018-10-22 stsp goto done;
1024 1a76625f 2018-10-22 stsp update_panels();
1025 1a76625f 2018-10-22 stsp doupdate();
1029 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1030 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1031 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1032 e5a0f69f 2018-08-18 stsp view_close(view);
1035 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1036 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1037 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1039 e5a0f69f 2018-08-18 stsp return err;
1042 4ed7e80c 2018-05-20 stsp __dead static void
1043 9f7d7167 2018-04-29 stsp usage_log(void)
1046 c70c5802 2018-08-01 stsp fprintf(stderr,
1047 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1048 9f7d7167 2018-04-29 stsp getprogname());
1052 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1053 80ddbec8 2018-04-29 stsp static const struct got_error *
1054 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1056 00dfcb92 2018-06-11 stsp char *vis = NULL;
1057 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1059 963b370f 2018-05-20 stsp *ws = NULL;
1060 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1061 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1062 00dfcb92 2018-06-11 stsp int vislen;
1063 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1064 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1066 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1067 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1069 00dfcb92 2018-06-11 stsp return err;
1070 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1071 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1072 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1073 a7f50699 2018-06-11 stsp goto done;
1077 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1078 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1079 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1080 a7f50699 2018-06-11 stsp goto done;
1083 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1084 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1086 00dfcb92 2018-06-11 stsp free(vis);
1087 963b370f 2018-05-20 stsp if (err) {
1088 963b370f 2018-05-20 stsp free(*ws);
1089 963b370f 2018-05-20 stsp *ws = NULL;
1090 963b370f 2018-05-20 stsp *wlen = 0;
1092 963b370f 2018-05-20 stsp return err;
1095 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
1096 963b370f 2018-05-20 stsp static const struct got_error *
1097 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1098 27a741e5 2019-09-11 stsp int col_tab_align)
1100 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1101 963b370f 2018-05-20 stsp int cols = 0;
1102 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1103 963b370f 2018-05-20 stsp size_t wlen;
1106 963b370f 2018-05-20 stsp *wlinep = NULL;
1107 b700b5d6 2018-07-10 stsp *widthp = 0;
1109 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
1111 963b370f 2018-05-20 stsp return err;
1114 27a741e5 2019-09-11 stsp while (i < wlen) {
1115 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
1117 27a741e5 2019-09-11 stsp if (width == 0) {
1122 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
1123 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1125 27a741e5 2019-09-11 stsp cols += width;
1127 27a741e5 2019-09-11 stsp } else if (width == -1) {
1128 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
1129 27a741e5 2019-09-11 stsp width = TABSIZE -
1130 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
1131 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1133 27a741e5 2019-09-11 stsp cols += width;
1137 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
1138 963b370f 2018-05-20 stsp goto done;
1141 963b370f 2018-05-20 stsp wline[i] = L'\0';
1142 b700b5d6 2018-07-10 stsp if (widthp)
1143 b700b5d6 2018-07-10 stsp *widthp = cols;
1146 963b370f 2018-05-20 stsp free(wline);
1148 963b370f 2018-05-20 stsp *wlinep = wline;
1149 963b370f 2018-05-20 stsp return err;
1152 8b473291 2019-02-21 stsp static const struct got_error*
1153 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1154 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1156 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1157 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1159 8b473291 2019-02-21 stsp const char *name;
1161 8b473291 2019-02-21 stsp *refs_str = NULL;
1163 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1164 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1167 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1168 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1170 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1171 8b473291 2019-02-21 stsp name += 5;
1172 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1174 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1175 8b473291 2019-02-21 stsp name += 6;
1176 8b473291 2019-02-21 stsp if (strncmp(name, "remotes/", 8) == 0)
1177 8b473291 2019-02-21 stsp name += 8;
1178 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1179 52b5abe1 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1180 5d844a1e 2019-08-13 stsp if (err) {
1181 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1183 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1184 5d844a1e 2019-08-13 stsp err = NULL;
1185 5d844a1e 2019-08-13 stsp tag = NULL;
1188 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1189 52b5abe1 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1191 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1192 52b5abe1 2019-08-13 stsp if (cmp != 0)
1194 8b473291 2019-02-21 stsp s = *refs_str;
1195 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1196 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1197 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1199 8b473291 2019-02-21 stsp *refs_str = NULL;
1205 8b473291 2019-02-21 stsp return err;
1208 963b370f 2018-05-20 stsp static const struct got_error *
1209 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1210 27a741e5 2019-09-11 stsp int col_tab_align)
1212 5813d178 2019-03-09 stsp char *smallerthan, *at;
1214 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1215 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1216 5813d178 2019-03-09 stsp author = smallerthan + 1;
1217 5813d178 2019-03-09 stsp at = strchr(author, '@');
1219 5813d178 2019-03-09 stsp *at = '\0';
1220 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1223 5813d178 2019-03-09 stsp static const struct got_error *
1224 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1225 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1226 11b20872 2019-11-08 stsp const size_t date_display_cols, int author_display_cols,
1227 11b20872 2019-11-08 stsp struct tog_colors *colors)
1229 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1230 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1231 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1232 5813d178 2019-03-09 stsp char *author = NULL;
1233 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1234 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1235 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1236 bb737323 2018-05-20 stsp int col, limit;
1237 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1238 ccb26ccd 2018-11-05 stsp struct tm tm;
1239 45d799e2 2018-12-23 stsp time_t committer_time;
1240 11b20872 2019-11-08 stsp struct tog_color *tc;
1242 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1243 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1244 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1245 6db9f7f6 2019-12-10 stsp if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1246 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1247 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1249 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1250 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1252 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1253 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_DATE);
1255 11b20872 2019-11-08 stsp wattr_on(view->window,
1256 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1257 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1259 11b20872 2019-11-08 stsp wattr_off(view->window,
1260 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1261 27a741e5 2019-09-11 stsp col = limit;
1262 b39d25c7 2018-07-10 stsp if (col > avail)
1263 b39d25c7 2018-07-10 stsp goto done;
1265 6570a66d 2019-11-08 stsp if (avail >= 120) {
1266 6570a66d 2019-11-08 stsp char *id_str;
1267 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1269 6570a66d 2019-11-08 stsp goto done;
1270 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1272 11b20872 2019-11-08 stsp wattr_on(view->window,
1273 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1274 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1276 11b20872 2019-11-08 stsp wattr_off(view->window,
1277 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1278 6570a66d 2019-11-08 stsp free(id_str);
1280 6570a66d 2019-11-08 stsp if (col > avail)
1281 6570a66d 2019-11-08 stsp goto done;
1284 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1285 5813d178 2019-03-09 stsp if (author == NULL) {
1286 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1287 80ddbec8 2018-04-29 stsp goto done;
1289 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1291 bb737323 2018-05-20 stsp goto done;
1292 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_AUTHOR);
1294 11b20872 2019-11-08 stsp wattr_on(view->window,
1295 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1296 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1298 11b20872 2019-11-08 stsp wattr_off(view->window,
1299 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1300 bb737323 2018-05-20 stsp col += author_width;
1301 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1302 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1304 bb737323 2018-05-20 stsp author_width++;
1306 9c2eaf34 2018-05-20 stsp if (col > avail)
1307 9c2eaf34 2018-05-20 stsp goto done;
1309 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1311 6d9fbc00 2018-04-29 stsp goto done;
1312 bb737323 2018-05-20 stsp logmsg = logmsg0;
1313 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1315 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1316 bb737323 2018-05-20 stsp if (newline)
1317 bb737323 2018-05-20 stsp *newline = '\0';
1318 bb737323 2018-05-20 stsp limit = avail - col;
1319 dee2c213 2019-11-13 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1321 bb737323 2018-05-20 stsp goto done;
1322 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1323 bb737323 2018-05-20 stsp col += logmsg_width;
1324 27a741e5 2019-09-11 stsp while (col < avail) {
1325 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1329 80ddbec8 2018-04-29 stsp free(logmsg0);
1330 bb737323 2018-05-20 stsp free(wlogmsg);
1331 5813d178 2019-03-09 stsp free(author);
1332 bb737323 2018-05-20 stsp free(wauthor);
1333 80ddbec8 2018-04-29 stsp free(line);
1334 80ddbec8 2018-04-29 stsp return err;
1337 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1338 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1339 899d86c2 2018-05-10 stsp struct got_object_id *id)
1341 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1343 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1344 80ddbec8 2018-04-29 stsp if (entry == NULL)
1345 899d86c2 2018-05-10 stsp return NULL;
1347 899d86c2 2018-05-10 stsp entry->id = id;
1348 99db9666 2018-05-07 stsp entry->commit = commit;
1349 899d86c2 2018-05-10 stsp return entry;
1352 99db9666 2018-05-07 stsp static void
1353 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1355 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1357 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1358 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1359 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1360 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1361 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1362 99db9666 2018-05-07 stsp free(entry);
1365 99db9666 2018-05-07 stsp static void
1366 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1368 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1369 99db9666 2018-05-07 stsp pop_commit(commits);
1372 c4972b91 2018-05-07 stsp static const struct got_error *
1373 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1374 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1376 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1377 13add988 2019-10-15 stsp regmatch_t regmatch;
1378 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1380 13add988 2019-10-15 stsp *have_match = 0;
1382 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1384 13add988 2019-10-15 stsp return err;
1386 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1388 13add988 2019-10-15 stsp goto done;
1390 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1391 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1392 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1393 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1394 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1395 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1396 13add988 2019-10-15 stsp *have_match = 1;
1398 13add988 2019-10-15 stsp free(id_str);
1399 13add988 2019-10-15 stsp free(logmsg);
1400 13add988 2019-10-15 stsp return err;
1403 13add988 2019-10-15 stsp static const struct got_error *
1404 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1405 13add988 2019-10-15 stsp int minqueue, struct got_repository *repo, const char *path,
1406 13add988 2019-10-15 stsp int *searching, int *search_next_done, regex_t *regex)
1408 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1409 7c1452c1 2020-03-26 stsp int nqueued = 0;
1412 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1413 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1414 1a76625f 2018-10-22 stsp * while updating the display.
1416 13add988 2019-10-15 stsp while (nqueued < minqueue ||
1417 13add988 2019-10-15 stsp (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1418 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1419 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1420 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1421 1a76625f 2018-10-22 stsp int errcode;
1423 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1424 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1427 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1430 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1431 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1432 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1436 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1437 1a76625f 2018-10-22 stsp if (errcode) {
1438 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1439 13add988 2019-10-15 stsp "pthread_mutex_lock");
1443 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1444 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1445 ecb28ae0 2018-07-16 stsp nqueued++;
1446 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1448 13add988 2019-10-15 stsp if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1449 7c1452c1 2020-03-26 stsp int have_match;
1450 13add988 2019-10-15 stsp err = match_commit(&have_match, id, commit, regex);
1453 7c1452c1 2020-03-26 stsp if (have_match)
1454 8f4ed634 2020-03-26 stsp *search_next_done = TOG_SEARCH_HAVE_MORE;
1457 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1458 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1459 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1460 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1465 9ba79e04 2018-06-11 stsp return err;
1468 0553a4e3 2018-04-30 stsp static const struct got_error *
1469 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1470 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1471 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1472 11b20872 2019-11-08 stsp struct got_reflist_head *refs, const char *path, int commits_needed,
1473 11b20872 2019-11-08 stsp struct tog_colors *colors)
1475 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1476 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1477 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1478 60493ae3 2019-06-20 stsp int width;
1479 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1480 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1481 8b473291 2019-02-21 stsp char *refs_str = NULL;
1482 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1483 11b20872 2019-11-08 stsp struct tog_color *tc;
1484 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1486 e0d42f60 2018-07-22 stsp entry = first;
1487 e0d42f60 2018-07-22 stsp ncommits = 0;
1488 e0d42f60 2018-07-22 stsp while (entry) {
1489 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1490 e0d42f60 2018-07-22 stsp *selected = entry;
1493 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1494 e0d42f60 2018-07-22 stsp ncommits++;
1497 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1498 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1500 ecb28ae0 2018-07-16 stsp return err;
1501 8b473291 2019-02-21 stsp if (refs) {
1502 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, (*selected)->id,
1505 8b473291 2019-02-21 stsp goto done;
1509 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1510 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1512 8f4ed634 2020-03-26 stsp if (commits_needed > 0) {
1513 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1514 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1515 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
1516 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
1517 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1518 8f4ed634 2020-03-26 stsp goto done;
1521 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
1523 f9686aa5 2020-03-27 stsp if (view->searching) {
1524 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
1525 f9686aa5 2020-03-27 stsp search_str = "no more matches";
1526 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1527 f9686aa5 2020-03-27 stsp search_str = "no matches found";
1528 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
1529 f9686aa5 2020-03-27 stsp search_str = "searching...";
1532 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1533 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1534 f9686aa5 2020-03-27 stsp search_str ? search_str :
1535 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
1536 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1537 8f4ed634 2020-03-26 stsp goto done;
1541 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1542 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1543 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1544 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1545 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1546 1a76625f 2018-10-22 stsp header = NULL;
1547 1a76625f 2018-10-22 stsp goto done;
1549 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1550 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1551 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1552 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1553 1a76625f 2018-10-22 stsp header = NULL;
1554 1a76625f 2018-10-22 stsp goto done;
1556 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1558 1a76625f 2018-10-22 stsp goto done;
1560 2814baeb 2018-08-01 stsp werase(view->window);
1562 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1563 a3404814 2018-09-02 stsp wstandout(view->window);
1564 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1566 11b20872 2019-11-08 stsp wattr_on(view->window,
1567 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1568 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1570 11b20872 2019-11-08 stsp wattr_off(view->window,
1571 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1572 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1573 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1576 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1577 a3404814 2018-09-02 stsp wstandend(view->window);
1578 ecb28ae0 2018-07-16 stsp free(wline);
1579 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1580 1a76625f 2018-10-22 stsp goto done;
1582 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1583 899d86c2 2018-05-10 stsp entry = first;
1584 5813d178 2019-03-09 stsp ncommits = 0;
1585 5813d178 2019-03-09 stsp while (entry) {
1586 5813d178 2019-03-09 stsp char *author;
1587 5813d178 2019-03-09 stsp wchar_t *wauthor;
1588 5813d178 2019-03-09 stsp int width;
1589 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1591 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1592 5813d178 2019-03-09 stsp if (author == NULL) {
1593 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1594 5813d178 2019-03-09 stsp goto done;
1596 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1597 27a741e5 2019-09-11 stsp date_display_cols);
1598 5813d178 2019-03-09 stsp if (author_cols < width)
1599 5813d178 2019-03-09 stsp author_cols = width;
1600 5813d178 2019-03-09 stsp free(wauthor);
1601 5813d178 2019-03-09 stsp free(author);
1602 7ca04879 2019-10-19 stsp ncommits++;
1603 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1606 5813d178 2019-03-09 stsp entry = first;
1607 899d86c2 2018-05-10 stsp *last = first;
1608 867c6645 2018-07-10 stsp ncommits = 0;
1609 899d86c2 2018-05-10 stsp while (entry) {
1610 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1612 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1613 2814baeb 2018-08-01 stsp wstandout(view->window);
1614 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1615 11b20872 2019-11-08 stsp date_display_cols, author_cols, colors);
1616 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1617 2814baeb 2018-08-01 stsp wstandend(view->window);
1619 60493ae3 2019-06-20 stsp goto done;
1620 0553a4e3 2018-04-30 stsp ncommits++;
1621 899d86c2 2018-05-10 stsp *last = entry;
1622 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1625 1a57306a 2018-09-02 stsp view_vborder(view);
1627 1a76625f 2018-10-22 stsp free(id_str);
1628 8b473291 2019-02-21 stsp free(refs_str);
1629 1a76625f 2018-10-22 stsp free(ncommits_str);
1630 1a76625f 2018-10-22 stsp free(header);
1631 80ddbec8 2018-04-29 stsp return err;
1634 07b55e75 2018-05-10 stsp static void
1635 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1636 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1637 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1639 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1640 07b55e75 2018-05-10 stsp int nscrolled = 0;
1642 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1643 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1646 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1647 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1648 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1649 07b55e75 2018-05-10 stsp if (entry) {
1650 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1651 07b55e75 2018-05-10 stsp nscrolled++;
1656 aa075928 2018-05-10 stsp static const struct got_error *
1657 7c1452c1 2020-03-26 stsp trigger_log_thread(struct tog_view *log_view, int wait,
1658 7c1452c1 2020-03-26 stsp int *commits_needed, int *log_complete,
1659 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1661 5e224a3e 2019-02-22 stsp int errcode;
1663 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1665 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1666 5e224a3e 2019-02-22 stsp if (*log_complete)
1669 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1670 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1671 7aafa0d1 2019-02-22 stsp if (errcode)
1672 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1673 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1676 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
1677 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
1679 7c1452c1 2020-03-26 stsp if (!wait)
1682 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1683 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1684 7c1452c1 2020-03-26 stsp update_panels();
1685 7c1452c1 2020-03-26 stsp doupdate();
1687 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
1688 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(commit_loaded, &tog_mutex);
1689 82954512 2020-02-03 stsp if (errcode)
1690 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1691 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1693 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1694 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1695 7c1452c1 2020-03-26 stsp update_panels();
1696 7c1452c1 2020-03-26 stsp doupdate();
1699 5e224a3e 2019-02-22 stsp return NULL;
1702 5e224a3e 2019-02-22 stsp static const struct got_error *
1703 7c1452c1 2020-03-26 stsp scroll_down(struct tog_view *log_view,
1704 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1705 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1706 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1707 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1709 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1710 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1711 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
1713 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1714 5e224a3e 2019-02-22 stsp return NULL;
1716 7c1452c1 2020-03-26 stsp ncommits_needed = (*last_displayed_entry)->idx + 1 + maxscroll;
1717 7c1452c1 2020-03-26 stsp if (commits->ncommits < ncommits_needed && !*log_complete) {
1719 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
1721 7c1452c1 2020-03-26 stsp (*commits_needed) += maxscroll;
1722 7c1452c1 2020-03-26 stsp err = trigger_log_thread(log_view, 1, commits_needed,
1723 7c1452c1 2020-03-26 stsp log_complete, need_commits, commit_loaded);
1725 5e224a3e 2019-02-22 stsp return err;
1729 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1730 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1733 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1735 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1736 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1738 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1739 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1741 dd0a52c1 2018-05-20 stsp return err;
1744 cd0acaa7 2018-05-20 stsp static const struct got_error *
1745 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1746 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1747 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1748 8b473291 2019-02-21 stsp struct got_repository *repo)
1750 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1751 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1752 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1754 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1755 15a94983 2018-12-23 stsp if (diff_view == NULL)
1756 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1758 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1759 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1760 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1761 e5a0f69f 2018-08-18 stsp if (err == NULL)
1762 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1763 cd0acaa7 2018-05-20 stsp return err;
1766 80ddbec8 2018-04-29 stsp static const struct got_error *
1767 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1768 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1770 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1772 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1773 941e9f74 2019-05-21 stsp if (parent == NULL)
1774 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1776 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1777 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1778 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1779 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1780 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1781 941e9f74 2019-05-21 stsp s->tree = subtree;
1782 941e9f74 2019-05-21 stsp s->selected = 0;
1783 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1784 941e9f74 2019-05-21 stsp return NULL;
1787 941e9f74 2019-05-21 stsp static const struct got_error *
1788 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
1789 55cccc34 2020-02-20 stsp struct got_object_id *commit_id,
1790 55cccc34 2020-02-20 stsp const char *path, struct got_repository *repo)
1792 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1793 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
1794 941e9f74 2019-05-21 stsp const char *p;
1795 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
1797 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1799 941e9f74 2019-05-21 stsp while (*p) {
1800 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
1801 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1802 56e0773d 2019-11-28 stsp char *te_name;
1804 33cbf02b 2020-01-12 stsp while (p[0] == '/')
1807 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1808 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1809 941e9f74 2019-05-21 stsp if (slash == NULL)
1810 33cbf02b 2020-01-12 stsp te_name = strdup(p);
1812 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
1813 56e0773d 2019-11-28 stsp if (te_name == NULL) {
1814 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
1817 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
1818 56e0773d 2019-11-28 stsp if (te == NULL) {
1819 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1820 56e0773d 2019-11-28 stsp free(te_name);
1823 56e0773d 2019-11-28 stsp free(te_name);
1824 56e0773d 2019-11-28 stsp s->selected_entry = te;
1825 56e0773d 2019-11-28 stsp s->selected = got_tree_entry_get_index(te);
1826 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1827 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1829 56e0773d 2019-11-28 stsp if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry))) {
1830 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1831 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1832 67409a31 2019-05-24 stsp s->selected = 0;
1836 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1837 941e9f74 2019-05-21 stsp if (slash)
1838 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1840 941e9f74 2019-05-21 stsp subpath = strdup(path);
1841 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1842 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1846 55cccc34 2020-02-20 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
1851 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1852 941e9f74 2019-05-21 stsp free(tree_id);
1856 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1857 941e9f74 2019-05-21 stsp if (err) {
1858 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1861 941e9f74 2019-05-21 stsp if (slash == NULL)
1863 941e9f74 2019-05-21 stsp free(subpath);
1864 941e9f74 2019-05-21 stsp subpath = NULL;
1865 941e9f74 2019-05-21 stsp p = slash;
1868 941e9f74 2019-05-21 stsp free(subpath);
1869 1a76625f 2018-10-22 stsp return err;
1872 61266923 2020-01-14 stsp static const struct got_error *
1873 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1874 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
1875 55cccc34 2020-02-20 stsp struct got_reflist_head *refs, struct got_repository *repo)
1877 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
1878 55cccc34 2020-02-20 stsp struct got_tree_object *tree;
1879 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
1880 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
1882 55cccc34 2020-02-20 stsp err = got_object_open_as_tree(&tree, repo,
1883 55cccc34 2020-02-20 stsp got_object_commit_get_tree_id(entry->commit));
1885 55cccc34 2020-02-20 stsp return err;
1887 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1888 55cccc34 2020-02-20 stsp if (tree_view == NULL)
1889 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
1891 55cccc34 2020-02-20 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1892 55cccc34 2020-02-20 stsp if (err) {
1893 55cccc34 2020-02-20 stsp got_object_tree_close(tree);
1894 55cccc34 2020-02-20 stsp return err;
1896 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
1898 55cccc34 2020-02-20 stsp *new_view = tree_view;
1900 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
1901 55cccc34 2020-02-20 stsp return NULL;
1903 55cccc34 2020-02-20 stsp return tree_view_walk_path(s, entry->id, path, repo);
1906 55cccc34 2020-02-20 stsp static const struct got_error *
1907 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
1909 61266923 2020-01-14 stsp sigset_t sigset;
1910 61266923 2020-01-14 stsp int errcode;
1912 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
1913 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
1915 61266923 2020-01-14 stsp /* tog handles SIGWINCH and SIGCONT */
1916 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
1917 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1918 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
1919 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1921 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
1922 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
1923 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1925 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1926 61266923 2020-01-14 stsp if (errcode)
1927 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
1929 61266923 2020-01-14 stsp return NULL;
1932 1a76625f 2018-10-22 stsp static void *
1933 1a76625f 2018-10-22 stsp log_thread(void *arg)
1935 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1936 1a76625f 2018-10-22 stsp int errcode = 0;
1937 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1938 1a76625f 2018-10-22 stsp int done = 0;
1940 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
1942 61266923 2020-01-14 stsp return (void *)err;
1944 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1945 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1946 13add988 2019-10-15 stsp a->in_repo_path, a->searching, a->search_next_done,
1947 13add988 2019-10-15 stsp a->regex);
1948 1a76625f 2018-10-22 stsp if (err) {
1949 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1950 1a76625f 2018-10-22 stsp return (void *)err;
1951 1a76625f 2018-10-22 stsp err = NULL;
1953 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1954 1a76625f 2018-10-22 stsp a->commits_needed--;
1956 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1957 3abe8080 2019-04-10 stsp if (errcode) {
1958 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1959 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1961 3abe8080 2019-04-10 stsp } else if (*a->quit)
1963 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1964 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1965 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1966 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1969 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
1970 7c1452c1 2020-03-26 stsp if (errcode) {
1971 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1972 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
1973 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
1978 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1980 7c1452c1 2020-03-26 stsp if (a->commits_needed == 0) {
1981 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
1982 7c1452c1 2020-03-26 stsp &tog_mutex);
1983 7c1452c1 2020-03-26 stsp if (errcode)
1984 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1985 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1989 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1990 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1991 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1992 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1994 3abe8080 2019-04-10 stsp a->log_complete = 1;
1995 1a76625f 2018-10-22 stsp return (void *)err;
1998 1a76625f 2018-10-22 stsp static const struct got_error *
1999 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2001 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2002 1a76625f 2018-10-22 stsp int errcode;
2004 1a76625f 2018-10-22 stsp if (s->thread) {
2005 1a76625f 2018-10-22 stsp s->quit = 1;
2006 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2007 1a76625f 2018-10-22 stsp if (errcode)
2008 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2009 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2010 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2011 1a76625f 2018-10-22 stsp if (errcode)
2012 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2013 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2014 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
2015 1a76625f 2018-10-22 stsp if (errcode)
2016 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2017 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2018 1a76625f 2018-10-22 stsp if (errcode)
2019 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2020 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2021 1a76625f 2018-10-22 stsp s->thread = NULL;
2024 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2025 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2026 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
2028 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2029 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
2030 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2033 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2034 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2035 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2038 9343a5fb 2018-06-23 stsp return err;
2041 9343a5fb 2018-06-23 stsp static const struct got_error *
2042 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2044 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2045 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2047 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2048 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2049 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2050 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2051 1a76625f 2018-10-22 stsp free(s->start_id);
2052 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2053 1a76625f 2018-10-22 stsp return err;
2056 1a76625f 2018-10-22 stsp static const struct got_error *
2057 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2059 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2061 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2062 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2063 60493ae3 2019-06-20 stsp return NULL;
2066 60493ae3 2019-06-20 stsp static const struct got_error *
2067 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2069 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2070 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2071 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2073 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2074 f9686aa5 2020-03-27 stsp show_log_view(view);
2075 f9686aa5 2020-03-27 stsp update_panels();
2076 f9686aa5 2020-03-27 stsp doupdate();
2078 96e2b566 2019-07-08 stsp if (s->search_entry) {
2079 13add988 2019-10-15 stsp int errcode, ch;
2080 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2081 13add988 2019-10-15 stsp if (errcode)
2082 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2083 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2084 13add988 2019-10-15 stsp ch = wgetch(view->window);
2085 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2086 13add988 2019-10-15 stsp if (errcode)
2087 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2088 13add988 2019-10-15 stsp "pthread_mutex_lock");
2089 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2090 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2091 678cbce5 2019-07-28 stsp return NULL;
2093 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2094 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2096 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2097 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2098 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2099 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2100 8f4ed634 2020-03-26 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2102 8f4ed634 2020-03-26 stsp entry = TAILQ_PREV(s->matched_entry,
2103 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2105 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2106 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
2108 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2111 60493ae3 2019-06-20 stsp while (1) {
2112 13add988 2019-10-15 stsp int have_match = 0;
2114 60493ae3 2019-06-20 stsp if (entry == NULL) {
2115 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2116 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2117 f9967bca 2020-03-27 stsp view->search_next_done =
2118 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2119 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2120 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2121 f801134a 2019-06-25 stsp return NULL;
2124 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2125 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2126 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2128 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2129 7c1452c1 2020-03-26 stsp return trigger_log_thread(view, 0,
2130 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
2131 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
2132 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2133 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2136 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2137 13add988 2019-10-15 stsp &view->regex);
2140 13add988 2019-10-15 stsp if (have_match) {
2141 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2142 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2146 96e2b566 2019-07-08 stsp s->search_entry = entry;
2147 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2148 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2150 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2153 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2154 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2155 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2156 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2158 60493ae3 2019-06-20 stsp return err;
2161 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2162 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2164 60493ae3 2019-06-20 stsp return err;
2169 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2171 60493ae3 2019-06-20 stsp return NULL;
2174 60493ae3 2019-06-20 stsp static const struct got_error *
2175 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2176 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
2177 f135c941 2020-02-20 stsp const char *head_ref_name, const char *in_repo_path,
2178 b672a97a 2020-01-27 stsp int log_branches)
2180 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2181 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2182 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2183 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2184 1a76625f 2018-10-22 stsp int errcode;
2186 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2187 f135c941 2020-02-20 stsp free(s->in_repo_path);
2188 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2189 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2190 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2193 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2194 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2195 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2197 8b473291 2019-02-21 stsp s->refs = refs;
2198 fb2756b9 2018-08-04 stsp s->repo = repo;
2199 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
2200 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2201 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2202 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2203 5036bf37 2018-09-24 stsp goto done;
2205 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2207 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
2208 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2209 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2210 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2212 11b20872 2019-11-08 stsp goto done;
2213 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2214 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2215 11b20872 2019-11-08 stsp if (err) {
2216 11b20872 2019-11-08 stsp free_colors(&s->colors);
2217 11b20872 2019-11-08 stsp goto done;
2219 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2220 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2221 11b20872 2019-11-08 stsp if (err) {
2222 11b20872 2019-11-08 stsp free_colors(&s->colors);
2223 11b20872 2019-11-08 stsp goto done;
2227 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2228 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2229 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2230 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2231 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2233 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2235 1a76625f 2018-10-22 stsp goto done;
2236 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2237 b672a97a 2020-01-27 stsp !s->log_branches);
2239 1a76625f 2018-10-22 stsp goto done;
2240 c5b78334 2020-01-12 stsp err = got_commit_graph_iter_start(thread_graph,
2241 c5b78334 2020-01-12 stsp s->start_id, s->repo, NULL, NULL);
2243 c5b78334 2020-01-12 stsp goto done;
2245 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2246 1a76625f 2018-10-22 stsp if (errcode) {
2247 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2248 1a76625f 2018-10-22 stsp goto done;
2250 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2251 7c1452c1 2020-03-26 stsp if (errcode) {
2252 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
2253 7c1452c1 2020-03-26 stsp goto done;
2256 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2257 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2258 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2259 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2260 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2261 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2262 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2263 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2264 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2265 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2266 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2267 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2268 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2271 1a76625f 2018-10-22 stsp close_log_view(view);
2272 ba4f502b 2018-08-04 stsp return err;
2275 e5a0f69f 2018-08-18 stsp static const struct got_error *
2276 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2278 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2280 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2281 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2282 2b380cc8 2018-10-24 stsp &s->thread_args);
2283 2b380cc8 2018-10-24 stsp if (errcode)
2284 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2287 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
2288 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
2289 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
2290 11b20872 2019-11-08 stsp s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2293 e5a0f69f 2018-08-18 stsp static const struct got_error *
2294 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2295 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2297 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2298 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2299 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
2300 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2301 669b5ffa 2018-10-07 stsp int begin_x = 0;
2302 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
2304 e5a0f69f 2018-08-18 stsp switch (ch) {
2306 1e37a5c2 2019-05-12 jcs s->quit = 1;
2309 1e37a5c2 2019-05-12 jcs case KEY_UP:
2312 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2314 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2315 1e37a5c2 2019-05-12 jcs s->selected--;
2317 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
2318 1144d21a 2019-06-21 stsp &s->commits);
2320 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2321 a4292ac5 2019-05-12 jcs case CTRL('b'):
2322 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2324 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
2325 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
2326 1e37a5c2 2019-05-12 jcs s->selected = 0;
2329 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
2330 1831ac02 2020-03-23 naddy view->nlines - 1, &s->commits);
2333 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2336 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2338 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2339 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2340 1e37a5c2 2019-05-12 jcs s->selected++;
2343 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
2344 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
2345 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
2346 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2347 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2348 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2350 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2351 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2352 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2353 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2354 1e37a5c2 2019-05-12 jcs if (first == NULL)
2356 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
2357 1831ac02 2020-03-23 naddy view->nlines - 1, &s->last_displayed_entry,
2358 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
2359 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2360 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2361 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2364 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2365 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2366 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2367 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2368 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2369 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2371 1e37a5c2 2019-05-12 jcs err = NULL;
2374 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2375 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2376 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2377 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2378 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2380 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2383 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2385 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2386 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2387 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2388 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2389 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2392 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2393 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2395 1e37a5c2 2019-05-12 jcs return err;
2396 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2398 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2401 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2402 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2404 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2407 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2409 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2410 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2411 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2412 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2415 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2416 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2418 1e37a5c2 2019-05-12 jcs return err;
2419 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2421 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2424 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2425 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2427 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2429 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2430 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
2432 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
2433 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
2434 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
2436 1e37a5c2 2019-05-12 jcs return err;
2437 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
2438 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
2439 1e37a5c2 2019-05-12 jcs if (lv == NULL)
2440 638f9024 2019-05-13 stsp return got_error_from_errno(
2441 1e37a5c2 2019-05-12 jcs "view_open");
2442 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
2443 f135c941 2020-02-20 stsp s->repo, s->head_ref_name, parent_path,
2444 b672a97a 2020-01-27 stsp s->log_branches);
2446 1e37a5c2 2019-05-12 jcs return err;;
2447 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2448 1e37a5c2 2019-05-12 jcs *new_view = lv;
2450 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
2451 1e37a5c2 2019-05-12 jcs *focus_view = lv;
2453 1e37a5c2 2019-05-12 jcs return NULL;
2456 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2457 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2459 d01904d4 2019-06-25 stsp return err;
2460 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2461 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2462 d01904d4 2019-06-25 stsp if (lv == NULL)
2463 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2464 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&start_id, NULL,
2465 71a27632 2020-01-15 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2466 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2467 ef129c5e 2019-08-03 stsp if (err) {
2468 ef129c5e 2019-08-03 stsp view_close(lv);
2469 d01904d4 2019-06-25 stsp return err;
2471 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2472 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2473 e6b23735 2019-10-04 stsp free(start_id);
2474 e6b23735 2019-10-04 stsp view_close(lv);
2475 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2477 e6b23735 2019-10-04 stsp got_ref_list_free(s->refs);
2478 e6b23735 2019-10-04 stsp err = got_ref_list(s->refs, s->repo, NULL,
2479 e6b23735 2019-10-04 stsp got_ref_cmp_by_name, NULL);
2480 e6b23735 2019-10-04 stsp if (err) {
2481 d01904d4 2019-06-25 stsp free(start_id);
2482 ef129c5e 2019-08-03 stsp view_close(lv);
2483 50284065 2019-10-04 stsp return err;
2485 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2486 f135c941 2020-02-20 stsp s->head_ref_name, in_repo_path, s->log_branches);
2487 ef129c5e 2019-08-03 stsp if (err) {
2488 ef129c5e 2019-08-03 stsp free(start_id);
2489 b672a97a 2020-01-27 stsp view_close(lv);
2490 b672a97a 2020-01-27 stsp return err;;
2492 b672a97a 2020-01-27 stsp *dead_view = view;
2493 b672a97a 2020-01-27 stsp *new_view = lv;
2496 b672a97a 2020-01-27 stsp s->log_branches = !s->log_branches;
2497 b672a97a 2020-01-27 stsp err = stop_log_thread(s);
2499 b672a97a 2020-01-27 stsp return err;
2500 b672a97a 2020-01-27 stsp lv = view_open(view->nlines, view->ncols,
2501 b672a97a 2020-01-27 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2502 b672a97a 2020-01-27 stsp if (lv == NULL)
2503 b672a97a 2020-01-27 stsp return got_error_from_errno("view_open");
2504 b672a97a 2020-01-27 stsp err = open_log_view(lv, s->start_id, s->refs, s->repo,
2505 f135c941 2020-02-20 stsp s->head_ref_name, s->in_repo_path, s->log_branches);
2506 b672a97a 2020-01-27 stsp if (err) {
2507 ef129c5e 2019-08-03 stsp view_close(lv);
2508 d01904d4 2019-06-25 stsp return err;;
2510 d01904d4 2019-06-25 stsp *dead_view = view;
2511 d01904d4 2019-06-25 stsp *new_view = lv;
2517 80ddbec8 2018-04-29 stsp return err;
2520 4ed7e80c 2018-05-20 stsp static const struct got_error *
2521 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2523 c2db6724 2019-01-04 stsp const struct got_error *error;
2525 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2526 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2527 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2529 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2530 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2532 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2533 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2535 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2536 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2538 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2539 c2db6724 2019-01-04 stsp if (error != NULL)
2540 c2db6724 2019-01-04 stsp return error;
2542 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2543 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2545 c2db6724 2019-01-04 stsp return NULL;
2548 a915003a 2019-02-05 stsp static void
2549 a915003a 2019-02-05 stsp init_curses(void)
2551 a915003a 2019-02-05 stsp initscr();
2553 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2556 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2557 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2558 a915003a 2019-02-05 stsp curs_set(0);
2559 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2560 6d17833f 2019-11-08 stsp start_color();
2561 6d17833f 2019-11-08 stsp use_default_colors();
2563 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2564 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2565 61266923 2020-01-14 stsp signal(SIGCONT, tog_sigcont);
2568 c2db6724 2019-01-04 stsp static const struct got_error *
2569 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2570 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2572 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2574 f135c941 2020-02-20 stsp if (argc == 0) {
2575 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2576 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2577 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2578 f135c941 2020-02-20 stsp return NULL;
2581 f135c941 2020-02-20 stsp if (worktree) {
2582 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2583 f135c941 2020-02-20 stsp char *wt_path, *p;
2585 f135c941 2020-02-20 stsp err = got_worktree_resolve_path(&wt_path, worktree, argv[0]);
2587 f135c941 2020-02-20 stsp return err;
2589 f135c941 2020-02-20 stsp if (asprintf(&p, "%s%s%s", prefix,
2590 f135c941 2020-02-20 stsp (strcmp(prefix, "/") != 0) ? "/" : "", wt_path) == -1) {
2591 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2592 f135c941 2020-02-20 stsp free(wt_path);
2593 f135c941 2020-02-20 stsp return err;
2595 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, p, 0);
2597 f135c941 2020-02-20 stsp free(wt_path);
2599 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, argv[0], 1);
2601 f135c941 2020-02-20 stsp return err;
2604 f135c941 2020-02-20 stsp static const struct got_error *
2605 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2607 80ddbec8 2018-04-29 stsp const struct got_error *error;
2608 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2609 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2610 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2611 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2612 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2613 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2614 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2615 04cc582a 2018-08-01 stsp struct tog_view *view;
2617 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2619 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2620 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2621 c2db6724 2019-01-04 stsp NULL) == -1)
2622 80ddbec8 2018-04-29 stsp err(1, "pledge");
2625 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2626 80ddbec8 2018-04-29 stsp switch (ch) {
2628 b672a97a 2020-01-27 stsp log_branches = 1;
2631 80ddbec8 2018-04-29 stsp start_commit = optarg;
2634 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2635 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2636 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2640 17020d27 2019-03-07 stsp usage_log();
2641 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2645 80ddbec8 2018-04-29 stsp argc -= optind;
2646 80ddbec8 2018-04-29 stsp argv += optind;
2648 f135c941 2020-02-20 stsp if (argc > 1)
2649 f135c941 2020-02-20 stsp usage_log();
2651 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2652 6962eb72 2020-02-20 stsp if (cwd == NULL)
2653 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
2655 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2656 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2657 963f97a1 2019-03-18 stsp goto done;
2659 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2660 a1fbf39a 2019-08-11 stsp if (worktree)
2661 6962eb72 2020-02-20 stsp repo_path =
2662 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2664 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2666 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2667 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2668 963f97a1 2019-03-18 stsp goto done;
2671 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2672 80ddbec8 2018-04-29 stsp if (error != NULL)
2673 ecb28ae0 2018-07-16 stsp goto done;
2675 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2676 f135c941 2020-02-20 stsp repo, worktree);
2677 f135c941 2020-02-20 stsp if (error)
2678 f135c941 2020-02-20 stsp goto done;
2680 f135c941 2020-02-20 stsp init_curses();
2682 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2683 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2684 c02c541e 2019-03-29 stsp if (error)
2685 c02c541e 2019-03-29 stsp goto done;
2687 15a94983 2018-12-23 stsp if (start_commit == NULL)
2688 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, worktree ?
2689 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2690 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2692 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, start_commit,
2693 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2694 80ddbec8 2018-04-29 stsp if (error != NULL)
2695 8b473291 2019-02-21 stsp goto done;
2697 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2698 8b473291 2019-02-21 stsp if (error)
2699 ecb28ae0 2018-07-16 stsp goto done;
2701 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2702 04cc582a 2018-08-01 stsp if (view == NULL) {
2703 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2704 04cc582a 2018-08-01 stsp goto done;
2706 2fc00ff4 2019-08-31 stsp if (worktree) {
2707 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2708 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2709 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2710 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2711 2fc00ff4 2019-08-31 stsp goto done;
2714 2fc00ff4 2019-08-31 stsp error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2715 f135c941 2020-02-20 stsp in_repo_path, log_branches);
2716 ba4f502b 2018-08-04 stsp if (error)
2717 ba4f502b 2018-08-04 stsp goto done;
2718 2fc00ff4 2019-08-31 stsp if (worktree) {
2719 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2720 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2721 2fc00ff4 2019-08-31 stsp worktree = NULL;
2723 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2725 f135c941 2020-02-20 stsp free(in_repo_path);
2726 ecb28ae0 2018-07-16 stsp free(repo_path);
2727 ecb28ae0 2018-07-16 stsp free(cwd);
2728 899d86c2 2018-05-10 stsp free(start_id);
2729 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2731 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2732 ec142235 2019-03-07 stsp if (worktree)
2733 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2734 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2735 80ddbec8 2018-04-29 stsp return error;
2738 4ed7e80c 2018-05-20 stsp __dead static void
2739 9f7d7167 2018-04-29 stsp usage_diff(void)
2742 09b5bff8 2020-02-23 naddy fprintf(stderr, "usage: %s diff [-r repository-path] object1 object2\n",
2743 9f7d7167 2018-04-29 stsp getprogname());
2747 b304db33 2018-05-20 stsp static char *
2748 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2750 b304db33 2018-05-20 stsp char *line;
2751 b304db33 2018-05-20 stsp size_t linelen;
2752 b304db33 2018-05-20 stsp size_t lineno;
2753 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2755 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2757 b304db33 2018-05-20 stsp *len = linelen;
2758 b304db33 2018-05-20 stsp return line;
2761 6d17833f 2019-11-08 stsp static int
2762 6d17833f 2019-11-08 stsp match_line(const char *line, regex_t *regex)
2764 6d17833f 2019-11-08 stsp regmatch_t regmatch;
2766 6d17833f 2019-11-08 stsp return regexec(regex, line, 1, ®match, 0) == 0;
2769 f26dddb7 2019-11-08 stsp struct tog_color *
2770 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
2772 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
2774 6d17833f 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
2775 6d17833f 2019-11-08 stsp if (match_line(line, &tc->regex))
2776 6d17833f 2019-11-08 stsp return tc;
2779 6d17833f 2019-11-08 stsp return NULL;
2782 4ed7e80c 2018-05-20 stsp static const struct got_error *
2783 f44b1f58 2020-02-02 tracey draw_file(struct tog_view *view, FILE *f, int *first_displayed_line, int nlines,
2784 f44b1f58 2020-02-02 tracey int selected_line, int max_lines, int *last_displayed_line, int *eof,
2785 f44b1f58 2020-02-02 tracey char *header, struct tog_colors *colors)
2787 61e69b96 2018-05-20 stsp const struct got_error *err;
2788 f44b1f58 2020-02-02 tracey int lineno = 0, nprinted = 0;
2789 b304db33 2018-05-20 stsp char *line;
2790 f26dddb7 2019-11-08 stsp struct tog_color *tc;
2791 b304db33 2018-05-20 stsp size_t len;
2792 61e69b96 2018-05-20 stsp wchar_t *wline;
2793 e0b650dd 2018-05-20 stsp int width;
2795 26ed57b2 2018-05-19 stsp rewind(f);
2796 f7d12f7e 2018-08-01 stsp werase(view->window);
2798 a3404814 2018-09-02 stsp if (header) {
2799 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
2800 a3404814 2018-09-02 stsp if (err) {
2801 a3404814 2018-09-02 stsp return err;
2804 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2805 a3404814 2018-09-02 stsp wstandout(view->window);
2806 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2807 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2808 a3404814 2018-09-02 stsp wstandend(view->window);
2809 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2810 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2812 a3404814 2018-09-02 stsp if (max_lines <= 1)
2813 a3404814 2018-09-02 stsp return NULL;
2814 a3404814 2018-09-02 stsp max_lines--;
2818 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2819 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2820 26ed57b2 2018-05-19 stsp if (line == NULL) {
2824 f44b1f58 2020-02-02 tracey if (++lineno < *first_displayed_line) {
2825 26ed57b2 2018-05-19 stsp free(line);
2829 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2830 61e69b96 2018-05-20 stsp if (err) {
2831 61e69b96 2018-05-20 stsp free(line);
2832 61e69b96 2018-05-20 stsp return err;
2835 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
2837 f26dddb7 2019-11-08 stsp wattr_on(view->window,
2838 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2839 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2841 6d17833f 2019-11-08 stsp wattr_off(view->window,
2842 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2843 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2844 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2845 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2846 f44b1f58 2020-02-02 tracey *first_displayed_line = lineno;
2847 26ed57b2 2018-05-19 stsp free(line);
2848 2550e4c3 2018-07-13 stsp free(wline);
2849 2550e4c3 2018-07-13 stsp wline = NULL;
2851 f44b1f58 2020-02-02 tracey *last_displayed_line = lineno;
2853 1a57306a 2018-09-02 stsp view_vborder(view);
2855 c3e9aa98 2019-05-13 jcs if (*eof) {
2856 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2857 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2858 c3e9aa98 2019-05-13 jcs nprinted++;
2861 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2863 c3e9aa98 2019-05-13 jcs return err;
2866 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2867 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2868 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2871 26ed57b2 2018-05-19 stsp return NULL;
2874 abd2672a 2018-12-23 stsp static char *
2875 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2877 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2878 09867e48 2019-08-13 stsp char *p, *s;
2880 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2881 09867e48 2019-08-13 stsp if (tm == NULL)
2882 09867e48 2019-08-13 stsp return NULL;
2883 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2884 09867e48 2019-08-13 stsp if (s == NULL)
2885 09867e48 2019-08-13 stsp return NULL;
2886 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2888 abd2672a 2018-12-23 stsp *p = '\0';
2892 4ed7e80c 2018-05-20 stsp static const struct got_error *
2893 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2894 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2896 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2897 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
2898 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2899 5943eee2 2019-08-13 stsp char *id_str = NULL, *logmsg = NULL;
2900 45d799e2 2018-12-23 stsp time_t committer_time;
2901 45d799e2 2018-12-23 stsp const char *author, *committer;
2902 8b473291 2019-02-21 stsp char *refs_str = NULL;
2904 8b473291 2019-02-21 stsp if (refs) {
2905 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
2907 8b473291 2019-02-21 stsp return err;
2910 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2912 abd2672a 2018-12-23 stsp return err;
2914 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2915 15a94983 2018-12-23 stsp if (err) {
2916 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2917 15a94983 2018-12-23 stsp goto done;
2920 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2921 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2922 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2923 abd2672a 2018-12-23 stsp goto done;
2925 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2926 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2927 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2928 abd2672a 2018-12-23 stsp goto done;
2930 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2931 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
2932 09867e48 2019-08-13 stsp if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2933 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2934 abd2672a 2018-12-23 stsp goto done;
2936 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2937 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2938 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2939 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2940 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2941 abd2672a 2018-12-23 stsp goto done;
2943 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
2945 5943eee2 2019-08-13 stsp goto done;
2946 5943eee2 2019-08-13 stsp if (fprintf(outfile, "%s\n", logmsg) < 0) {
2947 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2948 abd2672a 2018-12-23 stsp goto done;
2951 abd2672a 2018-12-23 stsp free(id_str);
2952 5943eee2 2019-08-13 stsp free(logmsg);
2953 8b473291 2019-02-21 stsp free(refs_str);
2954 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2955 abd2672a 2018-12-23 stsp return err;
2958 f44b1f58 2020-02-02 tracey const struct got_error *
2959 f44b1f58 2020-02-02 tracey get_filestream_info(size_t *filesize, int *nlines, off_t **line_offsets,
2960 f44b1f58 2020-02-02 tracey FILE *infile)
2962 f44b1f58 2020-02-02 tracey size_t len;
2963 f44b1f58 2020-02-02 tracey char *buf = NULL;
2965 f44b1f58 2020-02-02 tracey size_t noffsets = 0;
2966 f44b1f58 2020-02-02 tracey off_t off = 0;
2968 f44b1f58 2020-02-02 tracey if (line_offsets)
2969 f44b1f58 2020-02-02 tracey *line_offsets = NULL;
2970 f44b1f58 2020-02-02 tracey if (filesize)
2971 f44b1f58 2020-02-02 tracey *filesize = 0;
2972 f44b1f58 2020-02-02 tracey if (nlines)
2973 f44b1f58 2020-02-02 tracey *nlines = 0;
2975 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_END) == -1)
2976 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
2977 f44b1f58 2020-02-02 tracey len = ftell(infile) + 1;
2978 f44b1f58 2020-02-02 tracey if (ferror(infile))
2979 f44b1f58 2020-02-02 tracey return got_error_from_errno("ftell");
2980 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_SET) == -1)
2981 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
2983 f44b1f58 2020-02-02 tracey if (len == 0)
2984 f44b1f58 2020-02-02 tracey return NULL;
2985 f44b1f58 2020-02-02 tracey if ((buf = calloc(len, sizeof(char *))) == NULL)
2986 f44b1f58 2020-02-02 tracey return got_error_from_errno("calloc");
2988 f44b1f58 2020-02-02 tracey fread(buf, 1, len, infile);
2989 f44b1f58 2020-02-02 tracey if (ferror(infile))
2990 f44b1f58 2020-02-02 tracey return got_error_from_errno("fread");
2993 f44b1f58 2020-02-02 tracey if (line_offsets && nlines) {
2994 f44b1f58 2020-02-02 tracey if (*line_offsets == NULL) {
2995 f44b1f58 2020-02-02 tracey /* Have some data but perhaps no '\n'. */
2996 f44b1f58 2020-02-02 tracey noffsets = 1;
2997 f44b1f58 2020-02-02 tracey *nlines = 1;
2998 f44b1f58 2020-02-02 tracey *line_offsets = calloc(1, sizeof(**line_offsets));
2999 f44b1f58 2020-02-02 tracey if (*line_offsets == NULL)
3000 f44b1f58 2020-02-02 tracey return got_error_from_errno("calloc");
3001 f44b1f58 2020-02-02 tracey /* Skip forward over end of first line. */
3002 f44b1f58 2020-02-02 tracey while (i < len) {
3003 f44b1f58 2020-02-02 tracey if (buf[i] == '\n')
3008 f44b1f58 2020-02-02 tracey /* Scan '\n' offsets in remaining chunk of data. */
3009 f44b1f58 2020-02-02 tracey while (i < len) {
3010 f44b1f58 2020-02-02 tracey if (buf[i] != '\n') {
3012 f44b1f58 2020-02-02 tracey continue;
3014 f44b1f58 2020-02-02 tracey (*nlines)++;
3015 f44b1f58 2020-02-02 tracey if (noffsets < *nlines) {
3016 f44b1f58 2020-02-02 tracey off_t *o = recallocarray(*line_offsets,
3017 f44b1f58 2020-02-02 tracey noffsets, *nlines,
3018 f44b1f58 2020-02-02 tracey sizeof(**line_offsets));
3019 f44b1f58 2020-02-02 tracey if (o == NULL) {
3020 f44b1f58 2020-02-02 tracey free(*line_offsets);
3021 f44b1f58 2020-02-02 tracey *line_offsets = NULL;
3022 f44b1f58 2020-02-02 tracey return got_error_from_errno(
3023 f44b1f58 2020-02-02 tracey "recallocarray");
3025 f44b1f58 2020-02-02 tracey *line_offsets = o;
3026 f44b1f58 2020-02-02 tracey noffsets = *nlines;
3028 f44b1f58 2020-02-02 tracey off = i + 1;
3029 f44b1f58 2020-02-02 tracey (*line_offsets)[*nlines - 1] = off;
3034 f44b1f58 2020-02-02 tracey if (fflush(infile) != 0)
3035 f44b1f58 2020-02-02 tracey return got_error_from_errno("fflush");
3036 f44b1f58 2020-02-02 tracey rewind(infile);
3038 f44b1f58 2020-02-02 tracey if (filesize)
3039 f44b1f58 2020-02-02 tracey *filesize = len;
3041 f44b1f58 2020-02-02 tracey return NULL;
3044 abd2672a 2018-12-23 stsp static const struct got_error *
3045 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
3047 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
3048 48ae06ee 2018-10-18 stsp FILE *f = NULL;
3049 15a94983 2018-12-23 stsp int obj_type;
3051 511a516b 2018-05-19 stsp f = got_opentemp();
3052 48ae06ee 2018-10-18 stsp if (f == NULL) {
3053 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3054 48ae06ee 2018-10-18 stsp goto done;
3056 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
3057 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3058 fb43ecf1 2019-02-11 stsp goto done;
3062 15a94983 2018-12-23 stsp if (s->id1)
3063 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3065 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3067 15a94983 2018-12-23 stsp goto done;
3069 15a94983 2018-12-23 stsp switch (obj_type) {
3070 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3071 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
3072 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3074 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3075 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
3076 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3078 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3079 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3080 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3081 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3083 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3085 3ffacbe1 2020-02-02 tracey goto done;
3086 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3087 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3088 f44b1f58 2020-02-02 tracey err =write_commit_info(s->id2, s->refs, s->repo, s->f);
3089 f44b1f58 2020-02-02 tracey if (err)
3090 f44b1f58 2020-02-02 tracey goto done;
3091 f44b1f58 2020-02-02 tracey } else {
3092 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3093 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3094 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
3095 f44b1f58 2020-02-02 tracey err = write_commit_info(s->id2, s->refs,
3096 f44b1f58 2020-02-02 tracey s->repo, s->f);
3097 f44b1f58 2020-02-02 tracey if (err)
3098 f44b1f58 2020-02-02 tracey goto done;
3103 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3105 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
3106 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3110 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3113 f44b1f58 2020-02-02 tracey if (err)
3114 f44b1f58 2020-02-02 tracey goto done;
3115 f44b1f58 2020-02-02 tracey err = get_filestream_info(&s->filesize, &s->nlines, &s->line_offsets,
3118 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3119 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3120 48ae06ee 2018-10-18 stsp return err;
3123 f5215bb9 2019-02-22 stsp static void
3124 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3126 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3127 f5215bb9 2019-02-22 stsp update_panels();
3128 f5215bb9 2019-02-22 stsp doupdate();
3131 f44b1f58 2020-02-02 tracey static const struct got_error *
3132 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3134 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3136 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3137 f44b1f58 2020-02-02 tracey return NULL;
3140 f44b1f58 2020-02-02 tracey static const struct got_error *
3141 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3143 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3144 f44b1f58 2020-02-02 tracey int lineno;
3146 f44b1f58 2020-02-02 tracey if (!view->searching) {
3147 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3148 f44b1f58 2020-02-02 tracey return NULL;
3151 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3152 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3153 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3155 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3156 f44b1f58 2020-02-02 tracey } else {
3157 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3158 f44b1f58 2020-02-02 tracey lineno = 1;
3160 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3163 f44b1f58 2020-02-02 tracey while (1) {
3164 f44b1f58 2020-02-02 tracey char *line = NULL;
3165 f44b1f58 2020-02-02 tracey off_t offset;
3166 f44b1f58 2020-02-02 tracey size_t len;
3168 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3169 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3170 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3171 f44b1f58 2020-02-02 tracey free(line);
3175 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3176 f44b1f58 2020-02-02 tracey lineno = 1;
3178 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3181 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3182 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3183 f44b1f58 2020-02-02 tracey free(line);
3184 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3186 f44b1f58 2020-02-02 tracey free(line);
3187 f44b1f58 2020-02-02 tracey line = parse_next_line(s->f, &len);
3188 f44b1f58 2020-02-02 tracey if (line && match_line(line, &view->regex)) {
3189 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3190 f44b1f58 2020-02-02 tracey s->matched_line = lineno;
3191 f44b1f58 2020-02-02 tracey free(line);
3194 f44b1f58 2020-02-02 tracey free(line);
3195 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3196 f44b1f58 2020-02-02 tracey lineno++;
3198 f44b1f58 2020-02-02 tracey lineno--;
3201 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3202 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3203 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3206 f44b1f58 2020-02-02 tracey return NULL;
3209 48ae06ee 2018-10-18 stsp static const struct got_error *
3210 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3211 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
3212 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
3214 48ae06ee 2018-10-18 stsp const struct got_error *err;
3215 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3217 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3218 15a94983 2018-12-23 stsp int type1, type2;
3219 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3221 15a94983 2018-12-23 stsp return err;
3222 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3224 15a94983 2018-12-23 stsp return err;
3226 15a94983 2018-12-23 stsp if (type1 != type2)
3227 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3229 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3230 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3231 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3232 f44b1f58 2020-02-02 tracey s->repo = repo;
3233 f44b1f58 2020-02-02 tracey s->refs = refs;
3234 f44b1f58 2020-02-02 tracey s->id1 = id1;
3235 f44b1f58 2020-02-02 tracey s->id2 = id2;
3237 15a94983 2018-12-23 stsp if (id1) {
3238 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3239 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3240 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3242 5465d566 2020-02-01 tracey s->id1 = NULL;
3244 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3245 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3246 5465d566 2020-02-01 tracey free(s->id1);
3247 5465d566 2020-02-01 tracey s->id1 = NULL;
3248 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3250 5465d566 2020-02-01 tracey s->f = NULL;
3251 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3252 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3253 5465d566 2020-02-01 tracey s->diff_context = 3;
3254 5465d566 2020-02-01 tracey s->log_view = log_view;
3255 5465d566 2020-02-01 tracey s->repo = repo;
3256 5465d566 2020-02-01 tracey s->refs = refs;
3258 f44b1f58 2020-02-02 tracey SIMPLEQ_INIT(&s->colors);
3259 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3260 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3261 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3262 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3264 6d17833f 2019-11-08 stsp return err;
3265 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
3266 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
3267 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
3268 6d17833f 2019-11-08 stsp if (err) {
3269 5465d566 2020-02-01 tracey free_colors(&s->colors);
3270 6d17833f 2019-11-08 stsp return err;
3272 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3273 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3274 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3275 6d17833f 2019-11-08 stsp if (err) {
3276 5465d566 2020-02-01 tracey free_colors(&s->colors);
3277 6d17833f 2019-11-08 stsp return err;
3280 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3281 11b20872 2019-11-08 stsp "^(commit|(blob|file) [-+] )", TOG_COLOR_DIFF_META,
3282 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3283 6d17833f 2019-11-08 stsp if (err) {
3284 5465d566 2020-02-01 tracey free_colors(&s->colors);
3285 6d17833f 2019-11-08 stsp return err;
3288 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3289 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3290 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3291 11b20872 2019-11-08 stsp if (err) {
3292 5465d566 2020-02-01 tracey free_colors(&s->colors);
3293 11b20872 2019-11-08 stsp return err;
3296 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3297 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3298 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3299 11b20872 2019-11-08 stsp if (err) {
3300 5465d566 2020-02-01 tracey free_colors(&s->colors);
3301 11b20872 2019-11-08 stsp return err;
3305 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3306 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3307 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3309 5465d566 2020-02-01 tracey err = create_diff(s);
3310 48ae06ee 2018-10-18 stsp if (err) {
3311 5465d566 2020-02-01 tracey free(s->id1);
3312 5465d566 2020-02-01 tracey s->id1 = NULL;
3313 5465d566 2020-02-01 tracey free(s->id2);
3314 5465d566 2020-02-01 tracey s->id2 = NULL;
3315 48ae06ee 2018-10-18 stsp return err;
3318 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3319 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3320 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3321 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3322 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3324 5dc9f4bc 2018-08-04 stsp return NULL;
3327 e5a0f69f 2018-08-18 stsp static const struct got_error *
3328 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
3330 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3331 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3333 5465d566 2020-02-01 tracey free(s->id1);
3334 5465d566 2020-02-01 tracey s->id1 = NULL;
3335 5465d566 2020-02-01 tracey free(s->id2);
3336 5465d566 2020-02-01 tracey s->id2 = NULL;
3337 5465d566 2020-02-01 tracey if (s->f && fclose(s->f) == EOF)
3338 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3339 5465d566 2020-02-01 tracey free_colors(&s->colors);
3340 f44b1f58 2020-02-02 tracey free(s->line_offsets);
3341 e5a0f69f 2018-08-18 stsp return err;
3344 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3345 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3347 a3404814 2018-09-02 stsp const struct got_error *err;
3348 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3349 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3351 a3404814 2018-09-02 stsp if (s->id1) {
3352 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3354 a3404814 2018-09-02 stsp return err;
3356 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3358 a3404814 2018-09-02 stsp return err;
3360 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
3361 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3362 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3363 a3404814 2018-09-02 stsp free(id_str1);
3364 a3404814 2018-09-02 stsp free(id_str2);
3365 a3404814 2018-09-02 stsp return err;
3367 a3404814 2018-09-02 stsp free(id_str1);
3368 a3404814 2018-09-02 stsp free(id_str2);
3370 f44b1f58 2020-02-02 tracey return draw_file(view, s->f, &s->first_displayed_line, s->nlines,
3371 f44b1f58 2020-02-02 tracey s->selected_line, view->nlines, &s->last_displayed_line, &s->eof,
3372 bddb1296 2019-11-08 stsp header, &s->colors);
3375 15a087fe 2019-02-21 stsp static const struct got_error *
3376 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3377 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3379 d7a04538 2019-02-21 stsp const struct got_error *err;
3380 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3381 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3382 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3384 15a087fe 2019-02-21 stsp free(s->id2);
3385 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3386 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3387 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3389 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3391 d7a04538 2019-02-21 stsp return err;
3392 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3393 15a087fe 2019-02-21 stsp free(s->id1);
3394 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
3395 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3396 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3397 15a087fe 2019-02-21 stsp return NULL;
3400 0cf4efb1 2018-09-29 stsp static const struct got_error *
3401 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3402 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3404 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3405 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3406 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3407 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
3410 e5a0f69f 2018-08-18 stsp switch (ch) {
3412 1e37a5c2 2019-05-12 jcs case KEY_UP:
3413 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
3414 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3416 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3417 a60a9dc4 2019-05-13 jcs case CTRL('b'):
3418 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
3421 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
3422 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3423 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3426 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3427 1e37a5c2 2019-05-12 jcs if (!s->eof)
3428 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3430 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3431 a60a9dc4 2019-05-13 jcs case CTRL('f'):
3433 00ba99a7 2019-05-12 jcs if (s->eof)
3436 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
3437 1e37a5c2 2019-05-12 jcs char *line;
3438 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
3439 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3440 1e37a5c2 2019-05-12 jcs if (line == NULL)
3445 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
3446 1e37a5c2 2019-05-12 jcs s->diff_context--;
3447 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3448 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3452 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3453 1e37a5c2 2019-05-12 jcs s->diff_context++;
3454 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3455 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3460 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3462 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3463 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
3464 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
3465 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3468 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3473 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3477 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3478 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3480 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3481 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3485 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3487 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3489 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3490 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
3491 7c1452c1 2020-03-26 stsp err = trigger_log_thread(s->log_view, 1,
3492 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
3493 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
3494 7c1452c1 2020-03-26 stsp &ls->thread_args.need_commits,
3495 7c1452c1 2020-03-26 stsp &ls->thread_args.commit_loaded);
3499 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3504 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
3505 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3508 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3512 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3513 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3515 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3516 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3522 bcbd79e2 2018-08-19 stsp return err;
3525 4ed7e80c 2018-05-20 stsp static const struct got_error *
3526 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
3528 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
3529 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
3530 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
3531 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3532 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3533 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
3534 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
3536 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
3538 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3540 26ed57b2 2018-05-19 stsp #ifndef PROFILE
3541 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3542 eb6600df 2019-01-04 stsp NULL) == -1)
3543 26ed57b2 2018-05-19 stsp err(1, "pledge");
3546 09b5bff8 2020-02-23 naddy while ((ch = getopt(argc, argv, "r:")) != -1) {
3547 26ed57b2 2018-05-19 stsp switch (ch) {
3548 09b5bff8 2020-02-23 naddy case 'r':
3549 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
3550 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
3551 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
3555 17020d27 2019-03-07 stsp usage_diff();
3556 26ed57b2 2018-05-19 stsp /* NOTREACHED */
3560 26ed57b2 2018-05-19 stsp argc -= optind;
3561 26ed57b2 2018-05-19 stsp argv += optind;
3563 26ed57b2 2018-05-19 stsp if (argc == 0) {
3564 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
3565 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
3566 15a94983 2018-12-23 stsp id_str1 = argv[0];
3567 15a94983 2018-12-23 stsp id_str2 = argv[1];
3569 26ed57b2 2018-05-19 stsp usage_diff();
3571 a273ac94 2020-02-23 naddy cwd = getcwd(NULL, 0);
3572 a273ac94 2020-02-23 naddy if (cwd == NULL)
3573 a273ac94 2020-02-23 naddy return got_error_from_errno("getcwd");
3575 a273ac94 2020-02-23 naddy error = got_worktree_open(&worktree, cwd);
3576 a273ac94 2020-02-23 naddy if (error && error->code != GOT_ERR_NOT_WORKTREE)
3577 a273ac94 2020-02-23 naddy goto done;
3579 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3580 a273ac94 2020-02-23 naddy if (worktree)
3581 a273ac94 2020-02-23 naddy repo_path =
3582 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
3584 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
3586 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3587 a273ac94 2020-02-23 naddy error = got_error_from_errno("strdup");
3588 a273ac94 2020-02-23 naddy goto done;
3591 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3592 eb6600df 2019-01-04 stsp if (error)
3593 eb6600df 2019-01-04 stsp goto done;
3595 a273ac94 2020-02-23 naddy init_curses();
3597 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3598 26ed57b2 2018-05-19 stsp if (error)
3599 26ed57b2 2018-05-19 stsp goto done;
3601 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
3602 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3603 26ed57b2 2018-05-19 stsp if (error)
3604 26ed57b2 2018-05-19 stsp goto done;
3606 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
3607 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3608 26ed57b2 2018-05-19 stsp if (error)
3609 26ed57b2 2018-05-19 stsp goto done;
3611 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3612 8b473291 2019-02-21 stsp if (error)
3613 8b473291 2019-02-21 stsp goto done;
3615 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3616 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3617 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3618 ea5e7bb5 2018-08-01 stsp goto done;
3620 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3621 5dc9f4bc 2018-08-04 stsp if (error)
3622 5dc9f4bc 2018-08-04 stsp goto done;
3623 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3625 c02c541e 2019-03-29 stsp free(repo_path);
3626 a273ac94 2020-02-23 naddy free(cwd);
3628 921be706 2019-06-28 stsp got_repo_close(repo);
3629 a273ac94 2020-02-23 naddy if (worktree)
3630 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
3631 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3632 26ed57b2 2018-05-19 stsp return error;
3635 4ed7e80c 2018-05-20 stsp __dead static void
3636 9f7d7167 2018-04-29 stsp usage_blame(void)
3639 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3640 9f7d7167 2018-04-29 stsp getprogname());
3644 84451b3e 2018-07-10 stsp struct tog_blame_line {
3645 84451b3e 2018-07-10 stsp int annotated;
3646 84451b3e 2018-07-10 stsp struct got_object_id *id;
3649 4ed7e80c 2018-05-20 stsp static const struct got_error *
3650 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3651 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
3652 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
3653 11b20872 2019-11-08 stsp int *last_displayed_line, int *eof, int max_lines,
3654 11b20872 2019-11-08 stsp struct tog_colors *colors)
3656 84451b3e 2018-07-10 stsp const struct got_error *err;
3657 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3658 84451b3e 2018-07-10 stsp char *line;
3659 84451b3e 2018-07-10 stsp size_t len;
3660 84451b3e 2018-07-10 stsp wchar_t *wline;
3661 27a741e5 2019-09-11 stsp int width;
3662 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3663 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3664 ab089a2a 2018-07-12 stsp char *id_str;
3665 11b20872 2019-11-08 stsp struct tog_color *tc;
3667 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
3669 ab089a2a 2018-07-12 stsp return err;
3671 84451b3e 2018-07-10 stsp rewind(f);
3672 f7d12f7e 2018-08-01 stsp werase(view->window);
3674 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3675 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3676 ab089a2a 2018-07-12 stsp free(id_str);
3677 ab089a2a 2018-07-12 stsp return err;
3680 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3681 ab089a2a 2018-07-12 stsp free(line);
3682 2550e4c3 2018-07-13 stsp line = NULL;
3684 1cae65b4 2019-09-22 stsp return err;
3685 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3686 a3404814 2018-09-02 stsp wstandout(view->window);
3687 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3689 11b20872 2019-11-08 stsp wattr_on(view->window,
3690 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3691 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3693 11b20872 2019-11-08 stsp wattr_off(view->window,
3694 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3695 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3696 a3404814 2018-09-02 stsp wstandend(view->window);
3697 2550e4c3 2018-07-13 stsp free(wline);
3698 2550e4c3 2018-07-13 stsp wline = NULL;
3699 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3700 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3702 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3703 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
3704 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
3705 ab089a2a 2018-07-12 stsp free(id_str);
3706 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3708 ab089a2a 2018-07-12 stsp free(id_str);
3709 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3710 3f60a8ef 2018-07-10 stsp free(line);
3711 2550e4c3 2018-07-13 stsp line = NULL;
3713 3f60a8ef 2018-07-10 stsp return err;
3714 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3715 2550e4c3 2018-07-13 stsp free(wline);
3716 2550e4c3 2018-07-13 stsp wline = NULL;
3717 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3718 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3721 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
3722 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
3723 84451b3e 2018-07-10 stsp if (line == NULL) {
3727 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
3728 84451b3e 2018-07-10 stsp free(line);
3732 27a741e5 2019-09-11 stsp if (view->ncols <= 9) {
3733 27a741e5 2019-09-11 stsp width = 9;
3734 27a741e5 2019-09-11 stsp wline = wcsdup(L"");
3735 27a741e5 2019-09-11 stsp if (wline == NULL)
3736 27a741e5 2019-09-11 stsp err = got_error_from_errno("wcsdup");
3738 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line,
3739 27a741e5 2019-09-11 stsp view->ncols - 9, 9);
3740 27a741e5 2019-09-11 stsp width += 9;
3742 84451b3e 2018-07-10 stsp if (err) {
3743 84451b3e 2018-07-10 stsp free(line);
3744 84451b3e 2018-07-10 stsp return err;
3747 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3748 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3750 8d0fe45a 2019-08-12 stsp if (nlines > 0) {
3751 8d0fe45a 2019-08-12 stsp blame_line = &lines[lineno - 1];
3752 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3753 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3754 27a741e5 2019-09-11 stsp !(view->focussed &&
3755 27a741e5 2019-09-11 stsp nprinted == selected_line - 1)) {
3756 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3757 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3758 8d0fe45a 2019-08-12 stsp char *id_str;
3759 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3760 8d0fe45a 2019-08-12 stsp if (err) {
3761 8d0fe45a 2019-08-12 stsp free(line);
3762 8d0fe45a 2019-08-12 stsp free(wline);
3763 8d0fe45a 2019-08-12 stsp return err;
3765 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3767 11b20872 2019-11-08 stsp wattr_on(view->window,
3768 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3769 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3771 11b20872 2019-11-08 stsp wattr_off(view->window,
3772 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3773 8d0fe45a 2019-08-12 stsp free(id_str);
3774 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3776 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3777 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3780 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3781 ee41ec32 2018-07-10 stsp prev_id = NULL;
3784 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3785 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3786 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3788 27a741e5 2019-09-11 stsp waddwstr(view->window, wline);
3789 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
3790 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
3791 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3792 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3793 84451b3e 2018-07-10 stsp free(line);
3794 2550e4c3 2018-07-13 stsp free(wline);
3795 2550e4c3 2018-07-13 stsp wline = NULL;
3797 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3799 1a57306a 2018-09-02 stsp view_vborder(view);
3801 84451b3e 2018-07-10 stsp return NULL;
3804 84451b3e 2018-07-10 stsp static const struct got_error *
3805 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3807 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3808 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3809 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3810 1a76625f 2018-10-22 stsp int errcode;
3812 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3813 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3814 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3816 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3817 1a76625f 2018-10-22 stsp if (errcode)
3818 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3820 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3821 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3822 d68a0a7d 2018-07-10 stsp goto done;
3825 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3826 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3828 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3829 d68a0a7d 2018-07-10 stsp if (line->annotated)
3830 d68a0a7d 2018-07-10 stsp goto done;
3832 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3833 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3834 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3835 84451b3e 2018-07-10 stsp goto done;
3837 84451b3e 2018-07-10 stsp line->annotated = 1;
3839 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3840 1a76625f 2018-10-22 stsp if (errcode)
3841 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3842 84451b3e 2018-07-10 stsp return err;
3845 84451b3e 2018-07-10 stsp static void *
3846 84451b3e 2018-07-10 stsp blame_thread(void *arg)
3848 18430de3 2018-07-10 stsp const struct got_error *err;
3849 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
3850 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
3851 1a76625f 2018-10-22 stsp int errcode;
3853 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
3855 61266923 2020-01-14 stsp return (void *)err;
3857 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
3858 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3859 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
3860 fc06ba56 2019-08-22 stsp err = NULL;
3862 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3863 1a76625f 2018-10-22 stsp if (errcode)
3864 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
3865 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3867 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
3868 c9beca56 2018-07-22 stsp ta->repo = NULL;
3869 c9beca56 2018-07-22 stsp *ta->complete = 1;
3871 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3872 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
3873 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3875 18430de3 2018-07-10 stsp return (void *)err;
3878 245d91c1 2018-07-12 stsp static struct got_object_id *
3879 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3880 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
3882 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
3884 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
3885 8d0fe45a 2019-08-12 stsp return NULL;
3887 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
3888 245d91c1 2018-07-12 stsp if (!line->annotated)
3889 245d91c1 2018-07-12 stsp return NULL;
3891 245d91c1 2018-07-12 stsp return line->id;
3894 b880a918 2018-07-10 stsp static const struct got_error *
3895 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
3897 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
3900 245d91c1 2018-07-12 stsp if (blame->thread) {
3901 1a76625f 2018-10-22 stsp int errcode;
3902 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3903 1a76625f 2018-10-22 stsp if (errcode)
3904 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3905 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
3906 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
3907 1a76625f 2018-10-22 stsp if (errcode)
3908 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
3909 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3910 1a76625f 2018-10-22 stsp if (errcode)
3911 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3912 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3913 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
3914 245d91c1 2018-07-12 stsp err = NULL;
3915 245d91c1 2018-07-12 stsp blame->thread = NULL;
3917 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
3918 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
3919 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
3921 245d91c1 2018-07-12 stsp if (blame->f) {
3922 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
3923 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3924 245d91c1 2018-07-12 stsp blame->f = NULL;
3926 57670559 2018-12-23 stsp if (blame->lines) {
3927 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
3928 57670559 2018-12-23 stsp free(blame->lines[i].id);
3929 57670559 2018-12-23 stsp free(blame->lines);
3930 57670559 2018-12-23 stsp blame->lines = NULL;
3932 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
3933 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
3935 245d91c1 2018-07-12 stsp return err;
3938 245d91c1 2018-07-12 stsp static const struct got_error *
3939 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
3941 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
3942 fc06ba56 2019-08-22 stsp int *done = arg;
3943 fc06ba56 2019-08-22 stsp int errcode;
3945 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3946 fc06ba56 2019-08-22 stsp if (errcode)
3947 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3948 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
3950 fc06ba56 2019-08-22 stsp if (*done)
3951 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
3953 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3954 fc06ba56 2019-08-22 stsp if (errcode)
3955 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3956 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
3958 fc06ba56 2019-08-22 stsp return err;
3961 fc06ba56 2019-08-22 stsp static const struct got_error *
3962 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3963 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
3964 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
3965 245d91c1 2018-07-12 stsp struct got_repository *repo)
3967 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
3968 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
3969 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
3970 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
3971 15a94983 2018-12-23 stsp int obj_type;
3973 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3975 15a94983 2018-12-23 stsp return err;
3977 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
3979 84451b3e 2018-07-10 stsp goto done;
3981 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
3982 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3983 84451b3e 2018-07-10 stsp goto done;
3986 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3988 a70480e0 2018-06-23 stsp goto done;
3989 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
3990 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
3991 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3992 84451b3e 2018-07-10 stsp goto done;
3994 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3995 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
3996 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
3997 84451b3e 2018-07-10 stsp goto done;
3999 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4000 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4001 b02560ec 2019-08-19 stsp blame->nlines--;
4003 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4004 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
4005 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4006 84451b3e 2018-07-10 stsp goto done;
4009 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
4011 bd24772e 2018-07-11 stsp goto done;
4013 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
4014 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
4015 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
4016 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
4017 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
4018 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4019 245d91c1 2018-07-12 stsp goto done;
4021 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
4023 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
4024 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
4025 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
4026 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
4027 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
4028 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_arg = done;
4029 245d91c1 2018-07-12 stsp *blame_complete = 0;
4033 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
4034 27d434c2 2018-09-15 stsp free(obj_id);
4036 245d91c1 2018-07-12 stsp stop_blame(blame);
4037 245d91c1 2018-07-12 stsp return err;
4040 245d91c1 2018-07-12 stsp static const struct got_error *
4041 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
4042 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4043 8b473291 2019-02-21 stsp struct got_repository *repo)
4045 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
4046 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4048 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
4050 c4843652 2019-08-12 stsp s->path = strdup(path);
4051 c4843652 2019-08-12 stsp if (s->path == NULL)
4052 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4054 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4055 c4843652 2019-08-12 stsp if (err) {
4056 c4843652 2019-08-12 stsp free(s->path);
4057 7cbe629d 2018-08-04 stsp return err;
4060 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4061 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4062 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4063 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4064 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4065 fb2756b9 2018-08-04 stsp s->repo = repo;
4066 8b473291 2019-02-21 stsp s->refs = refs;
4067 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4068 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4070 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4071 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4072 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4073 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4075 11b20872 2019-11-08 stsp return err;
4078 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4079 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4080 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4081 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4082 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4084 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
4085 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
4086 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
4087 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
4090 e5a0f69f 2018-08-18 stsp static const struct got_error *
4091 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4093 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4094 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4096 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4097 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4099 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4100 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4101 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4102 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4103 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4106 e5a0f69f 2018-08-18 stsp free(s->path);
4107 11b20872 2019-11-08 stsp free_colors(&s->colors);
4109 e5a0f69f 2018-08-18 stsp return err;
4112 7cbe629d 2018-08-04 stsp static const struct got_error *
4113 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4115 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4117 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4118 6c4c42e0 2019-06-24 stsp return NULL;
4121 6c4c42e0 2019-06-24 stsp static const struct got_error *
4122 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4124 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4125 6c4c42e0 2019-06-24 stsp int lineno;
4127 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4128 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4129 6c4c42e0 2019-06-24 stsp return NULL;
4132 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4133 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4134 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4136 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4138 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4139 6c4c42e0 2019-06-24 stsp lineno = 1;
4141 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4144 6c4c42e0 2019-06-24 stsp while (1) {
4145 6c4c42e0 2019-06-24 stsp char *line = NULL;
4146 6c4c42e0 2019-06-24 stsp off_t offset;
4147 6c4c42e0 2019-06-24 stsp size_t len;
4149 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4150 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4151 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4152 6c4c42e0 2019-06-24 stsp free(line);
4156 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4157 6c4c42e0 2019-06-24 stsp lineno = 1;
4159 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4162 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4163 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4164 6c4c42e0 2019-06-24 stsp free(line);
4165 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4167 6c4c42e0 2019-06-24 stsp free(line);
4168 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
4169 2246482e 2019-06-25 stsp if (line && match_line(line, &view->regex)) {
4170 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4171 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
4172 6c4c42e0 2019-06-24 stsp free(line);
4175 6c4c42e0 2019-06-24 stsp free(line);
4176 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4182 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4183 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4184 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4187 6c4c42e0 2019-06-24 stsp return NULL;
4190 6c4c42e0 2019-06-24 stsp static const struct got_error *
4191 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4193 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4194 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4195 2b380cc8 2018-10-24 stsp int errcode;
4197 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
4198 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4199 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4200 2b380cc8 2018-10-24 stsp if (errcode)
4201 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4203 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4206 51fe7530 2019-08-19 stsp if (s->blame_complete)
4207 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4209 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
4210 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
4211 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
4212 11b20872 2019-11-08 stsp &s->last_displayed_line, &s->eof, view->nlines, &s->colors);
4214 669b5ffa 2018-10-07 stsp view_vborder(view);
4215 e5a0f69f 2018-08-18 stsp return err;
4218 e5a0f69f 2018-08-18 stsp static const struct got_error *
4219 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
4220 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4222 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4223 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4224 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4225 669b5ffa 2018-10-07 stsp int begin_x = 0;
4227 e5a0f69f 2018-08-18 stsp switch (ch) {
4229 1e37a5c2 2019-05-12 jcs s->done = 1;
4232 1e37a5c2 2019-05-12 jcs case KEY_UP:
4233 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4234 1e37a5c2 2019-05-12 jcs s->selected_line--;
4235 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4236 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4237 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4239 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4240 ea025d1d 2020-02-22 naddy case CTRL('b'):
4241 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4242 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
4245 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
4246 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
4247 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
4249 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4252 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4253 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4254 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4255 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4256 1e37a5c2 2019-05-12 jcs s->selected_line++;
4257 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
4258 1e37a5c2 2019-05-12 jcs s->blame.nlines)
4259 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4262 1e37a5c2 2019-05-12 jcs case 'p': {
4263 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4264 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4265 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4266 1e37a5c2 2019-05-12 jcs if (id == NULL)
4268 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
4269 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
4270 15a94983 2018-12-23 stsp struct got_object_qid *pid;
4271 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
4272 1e37a5c2 2019-05-12 jcs int obj_type;
4273 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
4274 1e37a5c2 2019-05-12 jcs s->repo, id);
4277 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
4278 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
4279 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
4280 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4283 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
4284 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
4285 1e37a5c2 2019-05-12 jcs pid->id, s->path);
4286 e5a0f69f 2018-08-18 stsp if (err) {
4287 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
4288 1e37a5c2 2019-05-12 jcs err = NULL;
4289 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4292 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
4294 1e37a5c2 2019-05-12 jcs free(blob_id);
4295 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
4296 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
4297 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4300 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4302 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4304 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
4305 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
4307 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4312 1e37a5c2 2019-05-12 jcs s->done = 1;
4313 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4314 1e37a5c2 2019-05-12 jcs s->done = 0;
4315 1e37a5c2 2019-05-12 jcs if (thread_err)
4317 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4318 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
4319 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4320 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4321 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
4322 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
4327 1e37a5c2 2019-05-12 jcs case 'B': {
4328 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
4329 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
4330 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
4332 1e37a5c2 2019-05-12 jcs s->done = 1;
4333 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4334 1e37a5c2 2019-05-12 jcs s->done = 0;
4335 1e37a5c2 2019-05-12 jcs if (thread_err)
4337 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4338 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
4339 1e37a5c2 2019-05-12 jcs s->blamed_commit =
4340 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
4341 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4342 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4343 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
4344 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
4349 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4350 1e37a5c2 2019-05-12 jcs case '\r': {
4351 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4352 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
4353 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
4354 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4355 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4356 1e37a5c2 2019-05-12 jcs if (id == NULL)
4358 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
4361 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
4362 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
4363 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4364 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4365 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4366 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
4367 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4368 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
4371 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
4372 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
4373 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4375 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4378 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4379 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4382 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
4384 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4387 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
4388 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4390 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
4395 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4396 ea025d1d 2020-02-22 naddy case CTRL('f'):
4398 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4399 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
4400 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
4403 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4404 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
4405 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4406 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4409 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
4410 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
4411 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
4412 1e37a5c2 2019-05-12 jcs view->nlines - 2;
4414 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
4415 1e37a5c2 2019-05-12 jcs s->blame.nlines -
4416 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
4418 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4419 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
4420 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4421 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4427 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
4430 a70480e0 2018-06-23 stsp static const struct got_error *
4431 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
4433 a70480e0 2018-06-23 stsp const struct got_error *error;
4434 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
4435 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4436 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
4437 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4438 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4439 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
4441 e1cd8fed 2018-08-01 stsp struct tog_view *view;
4443 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4445 a70480e0 2018-06-23 stsp #ifndef PROFILE
4446 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4447 8e94dd5b 2019-01-04 stsp NULL) == -1)
4448 a70480e0 2018-06-23 stsp err(1, "pledge");
4451 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4452 a70480e0 2018-06-23 stsp switch (ch) {
4454 a70480e0 2018-06-23 stsp commit_id_str = optarg;
4457 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4458 69069811 2018-08-02 stsp if (repo_path == NULL)
4459 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4463 17020d27 2019-03-07 stsp usage_blame();
4464 a70480e0 2018-06-23 stsp /* NOTREACHED */
4468 a70480e0 2018-06-23 stsp argc -= optind;
4469 a70480e0 2018-06-23 stsp argv += optind;
4471 f135c941 2020-02-20 stsp if (argc != 1)
4472 a70480e0 2018-06-23 stsp usage_blame();
4474 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
4475 6962eb72 2020-02-20 stsp if (cwd == NULL)
4476 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
4478 f135c941 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
4479 f135c941 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4480 f135c941 2020-02-20 stsp goto done;
4482 69069811 2018-08-02 stsp if (repo_path == NULL) {
4483 f135c941 2020-02-20 stsp if (worktree)
4484 eb41ed75 2019-02-05 stsp repo_path =
4485 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4487 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
4489 f135c941 2020-02-20 stsp if (repo_path == NULL) {
4490 f135c941 2020-02-20 stsp error = got_error_from_errno("strdup");
4491 f135c941 2020-02-20 stsp goto done;
4494 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4495 c02c541e 2019-03-29 stsp if (error != NULL)
4496 8e94dd5b 2019-01-04 stsp goto done;
4498 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4499 f135c941 2020-02-20 stsp worktree);
4500 c02c541e 2019-03-29 stsp if (error)
4501 92205607 2019-01-04 stsp goto done;
4503 f135c941 2020-02-20 stsp init_curses();
4505 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4506 eb41ed75 2019-02-05 stsp if (error)
4507 69069811 2018-08-02 stsp goto done;
4509 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
4510 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
4511 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4512 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4513 a70480e0 2018-06-23 stsp if (error != NULL)
4514 66b4983c 2018-06-23 stsp goto done;
4515 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4516 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
4518 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4519 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4521 a19e88aa 2018-06-23 stsp if (error != NULL)
4522 8b473291 2019-02-21 stsp goto done;
4524 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4525 8b473291 2019-02-21 stsp if (error)
4526 a19e88aa 2018-06-23 stsp goto done;
4528 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4529 e1cd8fed 2018-08-01 stsp if (view == NULL) {
4530 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4531 e1cd8fed 2018-08-01 stsp goto done;
4533 8b473291 2019-02-21 stsp error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
4534 7cbe629d 2018-08-04 stsp if (error)
4535 7cbe629d 2018-08-04 stsp goto done;
4536 12314ad4 2019-08-31 stsp if (worktree) {
4537 12314ad4 2019-08-31 stsp /* Release work tree lock. */
4538 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
4539 12314ad4 2019-08-31 stsp worktree = NULL;
4541 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4543 69069811 2018-08-02 stsp free(repo_path);
4544 f135c941 2020-02-20 stsp free(in_repo_path);
4545 69069811 2018-08-02 stsp free(cwd);
4546 a70480e0 2018-06-23 stsp free(commit_id);
4547 eb41ed75 2019-02-05 stsp if (worktree)
4548 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
4550 a70480e0 2018-06-23 stsp got_repo_close(repo);
4551 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4552 a70480e0 2018-06-23 stsp return error;
4555 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4556 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
4557 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
4558 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
4559 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
4560 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
4561 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int selected, int limit,
4562 f26dddb7 2019-11-08 stsp int isroot, struct tog_colors *colors)
4564 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4565 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
4566 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
4567 f26dddb7 2019-11-08 stsp struct tog_color *tc;
4568 56e0773d 2019-11-28 stsp int width, n, i, nentries;
4570 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
4572 f7d12f7e 2018-08-01 stsp werase(view->window);
4574 ffd1d5e5 2018-06-23 stsp if (limit == 0)
4575 ffd1d5e5 2018-06-23 stsp return NULL;
4577 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, label, view->ncols, 0);
4579 ffd1d5e5 2018-06-23 stsp return err;
4580 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4581 a3404814 2018-09-02 stsp wstandout(view->window);
4582 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
4584 11b20872 2019-11-08 stsp wattr_on(view->window,
4585 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4586 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4588 11b20872 2019-11-08 stsp wattr_off(view->window,
4589 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4590 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4591 a3404814 2018-09-02 stsp wstandend(view->window);
4592 2550e4c3 2018-07-13 stsp free(wline);
4593 2550e4c3 2018-07-13 stsp wline = NULL;
4594 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4595 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4596 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4597 ffd1d5e5 2018-06-23 stsp return NULL;
4598 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
4600 ce52c690 2018-06-23 stsp return err;
4601 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4602 2550e4c3 2018-07-13 stsp free(wline);
4603 2550e4c3 2018-07-13 stsp wline = NULL;
4604 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4605 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4606 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4607 ffd1d5e5 2018-06-23 stsp return NULL;
4608 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4609 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
4610 a1eca9bb 2018-06-23 stsp return NULL;
4612 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
4613 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(tree);
4614 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
4615 0cf4efb1 2018-09-29 stsp if (view->focussed)
4616 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4617 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
4619 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4620 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
4621 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4622 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4623 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4624 ffd1d5e5 2018-06-23 stsp return NULL;
4628 56e0773d 2019-11-28 stsp te = *first_displayed_entry;
4631 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4632 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4633 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
4634 848d6979 2019-08-12 stsp const char *modestr = "";
4635 56e0773d 2019-11-28 stsp mode_t mode;
4637 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4638 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
4640 1d13200f 2018-07-12 stsp if (show_ids) {
4641 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4642 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4644 638f9024 2019-05-13 stsp return got_error_from_errno(
4645 230a42bd 2019-05-11 jcs "got_object_id_str");
4647 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4648 63c5ca5d 2019-08-24 stsp modestr = "$";
4649 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
4650 848d6979 2019-08-12 stsp modestr = "@";
4651 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4652 848d6979 2019-08-12 stsp modestr = "/";
4653 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4654 848d6979 2019-08-12 stsp modestr = "*";
4655 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
4656 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te), modestr) == -1) {
4657 1d13200f 2018-07-12 stsp free(id_str);
4658 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4660 1d13200f 2018-07-12 stsp free(id_str);
4661 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4662 ffd1d5e5 2018-06-23 stsp if (err) {
4663 ffd1d5e5 2018-06-23 stsp free(line);
4666 ffd1d5e5 2018-06-23 stsp if (n == selected) {
4667 0cf4efb1 2018-09-29 stsp if (view->focussed)
4668 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4669 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
4671 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
4673 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
4674 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4675 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4677 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
4678 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4679 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4680 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4681 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
4682 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4683 ffd1d5e5 2018-06-23 stsp free(line);
4684 2550e4c3 2018-07-13 stsp free(wline);
4685 2550e4c3 2018-07-13 stsp wline = NULL;
4687 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4688 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
4689 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4693 ffd1d5e5 2018-06-23 stsp return err;
4696 ffd1d5e5 2018-06-23 stsp static void
4697 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
4698 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
4699 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int isroot)
4701 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4704 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
4707 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, 0);
4708 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
4709 ffd1d5e5 2018-06-23 stsp if (!isroot)
4710 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4715 56e0773d 2019-11-28 stsp while (*first_displayed_entry && i < maxscroll) {
4716 56e0773d 2019-11-28 stsp *first_displayed_entry = got_tree_entry_get_prev(tree,
4717 56e0773d 2019-11-28 stsp *first_displayed_entry);
4720 56e0773d 2019-11-28 stsp if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4721 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4724 768394f3 2019-01-24 stsp static int
4725 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4726 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
4727 56e0773d 2019-11-28 stsp struct got_tree_object *tree)
4729 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4730 ffd1d5e5 2018-06-23 stsp int n = 0;
4732 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
4733 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, *first_displayed_entry);
4735 56e0773d 2019-11-28 stsp next = got_object_tree_get_first_entry(tree);
4737 768394f3 2019-01-24 stsp last = last_displayed_entry;
4738 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4739 56e0773d 2019-11-28 stsp last = got_tree_entry_get_next(tree, last);
4740 768394f3 2019-01-24 stsp if (last) {
4741 768394f3 2019-01-24 stsp *first_displayed_entry = next;
4742 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, next);
4748 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4749 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4750 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4752 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4753 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4754 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4756 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4757 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
4758 56e0773d 2019-11-28 stsp + 1 /* slash */;
4760 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
4762 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4763 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4764 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4766 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4767 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4768 d9765a41 2018-06-23 stsp while (pt) {
4769 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
4770 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
4771 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4772 cb2ebc8a 2018-06-23 stsp goto done;
4774 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4775 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4776 cb2ebc8a 2018-06-23 stsp goto done;
4778 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4781 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4782 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4783 ce52c690 2018-06-23 stsp goto done;
4787 ce52c690 2018-06-23 stsp if (err) {
4788 ce52c690 2018-06-23 stsp free(*path);
4789 ce52c690 2018-06-23 stsp *path = NULL;
4791 ce52c690 2018-06-23 stsp return err;
4794 ce52c690 2018-06-23 stsp static const struct got_error *
4795 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4796 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4797 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4798 8b473291 2019-02-21 stsp struct got_repository *repo)
4800 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
4801 ce52c690 2018-06-23 stsp char *path;
4802 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
4804 a0de39f3 2019-08-09 stsp *new_view = NULL;
4806 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
4808 ce52c690 2018-06-23 stsp return err;
4810 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4811 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
4812 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
4813 83ce39e3 2019-08-12 stsp goto done;
4816 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
4817 e5a0f69f 2018-08-18 stsp if (err) {
4818 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
4819 fc06ba56 2019-08-22 stsp err = NULL;
4820 e5a0f69f 2018-08-18 stsp view_close(blame_view);
4822 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
4824 83ce39e3 2019-08-12 stsp free(path);
4825 69efd4c4 2018-07-18 stsp return err;
4828 69efd4c4 2018-07-18 stsp static const struct got_error *
4829 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
4830 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4831 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4832 8b473291 2019-02-21 stsp struct got_repository *repo)
4834 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
4835 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
4836 69efd4c4 2018-07-18 stsp char *path;
4838 a0de39f3 2019-08-09 stsp *new_view = NULL;
4840 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4841 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
4842 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
4844 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
4846 69efd4c4 2018-07-18 stsp return err;
4848 f135c941 2020-02-20 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4850 e5a0f69f 2018-08-18 stsp view_close(log_view);
4852 e5a0f69f 2018-08-18 stsp *new_view = log_view;
4853 cb2ebc8a 2018-06-23 stsp free(path);
4854 cb2ebc8a 2018-06-23 stsp return err;
4857 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4858 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
4859 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4860 8b473291 2019-02-21 stsp struct got_repository *repo)
4862 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4863 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
4864 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4866 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
4868 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
4869 ffd1d5e5 2018-06-23 stsp if (err != NULL)
4870 ffd1d5e5 2018-06-23 stsp goto done;
4872 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4873 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4874 ffd1d5e5 2018-06-23 stsp goto done;
4877 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
4878 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
4879 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
4880 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
4881 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
4882 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4883 6484ec90 2018-09-29 stsp goto done;
4885 8b473291 2019-02-21 stsp s->refs = refs;
4886 fb2756b9 2018-08-04 stsp s->repo = repo;
4888 bddb1296 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4890 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4891 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
4892 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
4893 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
4895 c0b01bdb 2019-11-08 stsp goto done;
4896 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
4897 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
4898 c0b01bdb 2019-11-08 stsp if (err) {
4899 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4900 c0b01bdb 2019-11-08 stsp goto done;
4902 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
4903 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
4904 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
4905 c0b01bdb 2019-11-08 stsp if (err) {
4906 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4907 c0b01bdb 2019-11-08 stsp goto done;
4910 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
4911 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
4912 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
4913 11b20872 2019-11-08 stsp if (err) {
4914 11b20872 2019-11-08 stsp free_colors(&s->colors);
4915 11b20872 2019-11-08 stsp goto done;
4918 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
4919 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4920 c0b01bdb 2019-11-08 stsp if (err) {
4921 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4922 c0b01bdb 2019-11-08 stsp goto done;
4926 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
4927 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
4928 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
4929 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
4930 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
4932 ad80ab7b 2018-08-04 stsp free(commit_id_str);
4933 6484ec90 2018-09-29 stsp if (err) {
4934 fb2756b9 2018-08-04 stsp free(s->tree_label);
4935 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4937 ad80ab7b 2018-08-04 stsp return err;
4940 e5a0f69f 2018-08-18 stsp static const struct got_error *
4941 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
4943 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4945 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4946 fb2756b9 2018-08-04 stsp free(s->tree_label);
4947 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4948 6484ec90 2018-09-29 stsp free(s->commit_id);
4949 6484ec90 2018-09-29 stsp s->commit_id = NULL;
4950 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
4951 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
4952 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
4953 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
4954 ad80ab7b 2018-08-04 stsp free(parent);
4957 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
4958 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
4959 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
4961 7c32bd05 2019-06-22 stsp return NULL;
4964 7c32bd05 2019-06-22 stsp static const struct got_error *
4965 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
4967 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4969 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
4970 7c32bd05 2019-06-22 stsp return NULL;
4973 7c32bd05 2019-06-22 stsp static int
4974 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4976 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
4978 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
4982 7c32bd05 2019-06-22 stsp static const struct got_error *
4983 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
4985 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4986 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
4988 7c32bd05 2019-06-22 stsp if (!view->searching) {
4989 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4990 7c32bd05 2019-06-22 stsp return NULL;
4993 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4994 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
4995 7c32bd05 2019-06-22 stsp if (s->selected_entry)
4996 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
4997 56e0773d 2019-11-28 stsp s->selected_entry);
4999 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5001 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
5002 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5004 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
5005 56e0773d 2019-11-28 stsp s->selected_entry);
5008 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5009 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5011 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5014 7c32bd05 2019-06-22 stsp while (1) {
5015 56e0773d 2019-11-28 stsp if (te == NULL) {
5016 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
5017 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5018 ac66afb8 2019-06-24 stsp return NULL;
5020 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5021 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5023 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5026 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
5027 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5028 56e0773d 2019-11-28 stsp s->matched_entry = te;
5032 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5033 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5035 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
5038 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5039 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
5040 7c32bd05 2019-06-22 stsp s->selected = 0;
5043 e5a0f69f 2018-08-18 stsp return NULL;
5046 ad80ab7b 2018-08-04 stsp static const struct got_error *
5047 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
5049 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
5050 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5051 e5a0f69f 2018-08-18 stsp char *parent_path;
5053 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5055 e5a0f69f 2018-08-18 stsp return err;
5057 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
5058 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
5059 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
5060 56e0773d 2019-11-28 stsp s->tree, s->selected, view->nlines, s->tree == s->root,
5061 bddb1296 2019-11-08 stsp &s->colors);
5062 e5a0f69f 2018-08-18 stsp free(parent_path);
5064 669b5ffa 2018-10-07 stsp view_vborder(view);
5065 e5a0f69f 2018-08-18 stsp return err;
5068 e5a0f69f 2018-08-18 stsp static const struct got_error *
5069 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
5070 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
5072 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5073 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
5074 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
5075 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
5077 e5a0f69f 2018-08-18 stsp switch (ch) {
5079 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
5082 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
5084 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5085 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5086 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
5087 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
5088 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
5089 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5090 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5092 1e37a5c2 2019-05-12 jcs return err;
5093 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
5095 1e37a5c2 2019-05-12 jcs view_close(log_view);
5098 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
5099 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
5101 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5104 1e37a5c2 2019-05-12 jcs case KEY_UP:
5105 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5106 1e37a5c2 2019-05-12 jcs s->selected--;
5107 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
5110 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
5112 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
5113 56e0773d 2019-11-28 stsp s->tree, s->tree == s->root);
5115 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5116 ea025d1d 2020-02-22 naddy case CTRL('b'):
5117 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
5118 56e0773d 2019-11-28 stsp MAX(0, view->nlines - 4 - s->selected), s->tree,
5119 1e37a5c2 2019-05-12 jcs s->tree == s->root);
5120 1e37a5c2 2019-05-12 jcs s->selected = 0;
5121 56e0773d 2019-11-28 stsp if (got_object_tree_get_first_entry(s->tree) ==
5122 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
5123 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
5126 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5127 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5128 1e37a5c2 2019-05-12 jcs s->selected++;
5131 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5133 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5135 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
5136 56e0773d 2019-11-28 stsp s->last_displayed_entry, s->tree);
5138 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5139 ea025d1d 2020-02-22 naddy case CTRL('f'):
5140 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5142 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5143 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5144 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5147 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
5148 56e0773d 2019-11-28 stsp view->nlines, s->last_displayed_entry, s->tree);
5149 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
5150 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
5151 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
5152 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
5154 1e37a5c2 2019-05-12 jcs ndisplayed++;
5155 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5156 1e37a5c2 2019-05-12 jcs } while (te);
5157 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
5160 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5162 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5163 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5164 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5165 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5166 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5168 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5169 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5171 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5172 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5173 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5174 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
5175 1e37a5c2 2019-05-12 jcs s->selected_entry =
5176 1e37a5c2 2019-05-12 jcs parent->selected_entry;
5177 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
5178 1e37a5c2 2019-05-12 jcs free(parent);
5179 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
5180 56e0773d 2019-11-28 stsp s->selected_entry))) {
5181 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
5182 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
5183 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
5186 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
5187 941e9f74 2019-05-21 stsp if (err) {
5188 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
5191 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
5192 56e0773d 2019-11-28 stsp s->selected_entry))) {
5193 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
5194 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
5195 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
5197 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
5198 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
5199 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
5202 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
5203 669b5ffa 2018-10-07 stsp err = view_close_child(view);
5205 669b5ffa 2018-10-07 stsp return err;
5206 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
5207 669b5ffa 2018-10-07 stsp if (err) {
5208 1e37a5c2 2019-05-12 jcs view_close(blame_view);
5211 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
5212 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
5214 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
5217 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5218 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
5219 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5225 ffd1d5e5 2018-06-23 stsp return err;
5228 ffd1d5e5 2018-06-23 stsp __dead static void
5229 ffd1d5e5 2018-06-23 stsp usage_tree(void)
5232 55cccc34 2020-02-20 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5233 ffd1d5e5 2018-06-23 stsp getprogname());
5237 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5238 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
5240 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
5241 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
5242 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
5243 8b473291 2019-02-21 stsp struct got_reflist_head refs;
5244 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5245 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5246 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
5247 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
5248 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
5250 5221c383 2018-08-01 stsp struct tog_view *view;
5252 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
5254 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
5255 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
5256 d188b9a6 2019-01-04 stsp NULL) == -1)
5257 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
5260 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5261 ffd1d5e5 2018-06-23 stsp switch (ch) {
5263 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
5266 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
5267 74283ab8 2020-02-07 stsp if (repo_path == NULL)
5268 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
5272 17020d27 2019-03-07 stsp usage_tree();
5273 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
5277 ffd1d5e5 2018-06-23 stsp argc -= optind;
5278 ffd1d5e5 2018-06-23 stsp argv += optind;
5280 55cccc34 2020-02-20 stsp if (argc > 1)
5281 74283ab8 2020-02-07 stsp usage_tree();
5283 55cccc34 2020-02-20 stsp cwd = getcwd(NULL, 0);
5284 55cccc34 2020-02-20 stsp if (cwd == NULL)
5285 55cccc34 2020-02-20 stsp return got_error_from_errno("getcwd");
5287 55cccc34 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
5288 55cccc34 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5289 55cccc34 2020-02-20 stsp goto done;
5291 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
5292 55cccc34 2020-02-20 stsp if (worktree)
5293 52185f70 2019-02-05 stsp repo_path =
5294 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5296 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
5298 55cccc34 2020-02-20 stsp if (repo_path == NULL) {
5299 55cccc34 2020-02-20 stsp error = got_error_from_errno("strdup");
5300 55cccc34 2020-02-20 stsp goto done;
5303 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5304 c02c541e 2019-03-29 stsp if (error != NULL)
5305 52185f70 2019-02-05 stsp goto done;
5307 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5308 55cccc34 2020-02-20 stsp repo, worktree);
5309 55cccc34 2020-02-20 stsp if (error)
5310 55cccc34 2020-02-20 stsp goto done;
5312 55cccc34 2020-02-20 stsp init_curses();
5314 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5315 c02c541e 2019-03-29 stsp if (error)
5316 52185f70 2019-02-05 stsp goto done;
5318 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5319 71a27632 2020-01-15 stsp commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5320 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5321 55cccc34 2020-02-20 stsp if (error)
5322 ffd1d5e5 2018-06-23 stsp goto done;
5324 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5325 55cccc34 2020-02-20 stsp if (error)
5326 ffd1d5e5 2018-06-23 stsp goto done;
5328 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
5329 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
5330 55cccc34 2020-02-20 stsp if (error)
5331 8b473291 2019-02-21 stsp goto done;
5333 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5334 8b473291 2019-02-21 stsp if (error)
5335 ffd1d5e5 2018-06-23 stsp goto done;
5337 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5338 5221c383 2018-08-01 stsp if (view == NULL) {
5339 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5340 5221c383 2018-08-01 stsp goto done;
5342 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
5343 ad80ab7b 2018-08-04 stsp if (error)
5344 ad80ab7b 2018-08-04 stsp goto done;
5345 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
5346 55cccc34 2020-02-20 stsp error = tree_view_walk_path(&view->state.tree, commit_id,
5347 55cccc34 2020-02-20 stsp in_repo_path, repo);
5348 55cccc34 2020-02-20 stsp if (error)
5349 55cccc34 2020-02-20 stsp goto done;
5352 55cccc34 2020-02-20 stsp if (worktree) {
5353 55cccc34 2020-02-20 stsp /* Release work tree lock. */
5354 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
5355 55cccc34 2020-02-20 stsp worktree = NULL;
5357 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5359 52185f70 2019-02-05 stsp free(repo_path);
5360 e4a0e26d 2020-02-20 stsp free(cwd);
5361 ffd1d5e5 2018-06-23 stsp free(commit_id);
5362 ffd1d5e5 2018-06-23 stsp if (commit)
5363 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
5365 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
5367 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
5368 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5369 ffd1d5e5 2018-06-23 stsp return error;
5372 ce5b7c56 2019-07-09 stsp static void
5373 ce5b7c56 2019-07-09 stsp list_commands(void)
5377 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
5378 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
5379 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
5380 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->name);
5382 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
5385 4ed7e80c 2018-05-20 stsp __dead static void
5386 ce5b7c56 2019-07-09 stsp usage(int hflag)
5388 ee85c5e8 2020-02-29 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] [command] "
5389 ee85c5e8 2020-02-29 stsp "[arg ...]\n", getprogname());
5390 ee85c5e8 2020-02-29 stsp if (hflag) {
5391 ee85c5e8 2020-02-29 stsp fprintf(stderr, "lazy usage: %s path\n", getprogname());
5392 ce5b7c56 2019-07-09 stsp list_commands();
5397 c2301be8 2018-04-30 stsp static char **
5398 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
5400 ee85c5e8 2020-02-29 stsp va_list ap;
5401 c2301be8 2018-04-30 stsp char **argv;
5404 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
5406 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
5407 c2301be8 2018-04-30 stsp if (argv == NULL)
5408 c2301be8 2018-04-30 stsp err(1, "calloc");
5409 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
5410 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
5411 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
5412 e10c916e 2019-09-15 hiltjo err(1, "strdup");
5415 ee85c5e8 2020-02-29 stsp va_end(ap);
5416 c2301be8 2018-04-30 stsp return argv;
5420 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
5421 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
5422 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
5423 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
5424 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
5426 ee85c5e8 2020-02-29 stsp static const struct got_error *
5427 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
5429 ee85c5e8 2020-02-29 stsp const struct got_error *error = NULL;
5430 ee85c5e8 2020-02-29 stsp struct tog_cmd *cmd = NULL;
5431 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
5432 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
5433 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
5434 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5435 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
5437 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
5438 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
5439 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
5441 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
5442 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5443 ee85c5e8 2020-02-29 stsp goto done;
5445 ee85c5e8 2020-02-29 stsp if (worktree)
5446 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
5448 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
5449 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
5450 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
5451 ee85c5e8 2020-02-29 stsp goto done;
5454 ee85c5e8 2020-02-29 stsp error = got_repo_open(&repo, repo_path, NULL);
5455 ee85c5e8 2020-02-29 stsp if (error != NULL)
5456 ee85c5e8 2020-02-29 stsp goto done;
5458 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5459 ee85c5e8 2020-02-29 stsp repo, worktree);
5460 ee85c5e8 2020-02-29 stsp if (error)
5461 ee85c5e8 2020-02-29 stsp goto done;
5463 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
5464 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
5465 ee85c5e8 2020-02-29 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5466 ee85c5e8 2020-02-29 stsp if (error)
5467 ee85c5e8 2020-02-29 stsp goto done;
5469 ee85c5e8 2020-02-29 stsp if (worktree) {
5470 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5471 ee85c5e8 2020-02-29 stsp worktree = NULL;
5474 ee85c5e8 2020-02-29 stsp error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
5475 ee85c5e8 2020-02-29 stsp if (error) {
5476 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
5477 ee85c5e8 2020-02-29 stsp goto done;
5478 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
5479 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
5481 ee85c5e8 2020-02-29 stsp /* not reached */
5484 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5485 ee85c5e8 2020-02-29 stsp repo = NULL;
5487 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
5488 ee85c5e8 2020-02-29 stsp if (error)
5489 ee85c5e8 2020-02-29 stsp goto done;
5491 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
5493 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
5494 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
5497 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5498 ee85c5e8 2020-02-29 stsp if (worktree)
5499 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5501 ee85c5e8 2020-02-29 stsp free(commit_id_str);
5502 ee85c5e8 2020-02-29 stsp free(commit_id);
5503 ee85c5e8 2020-02-29 stsp free(cwd);
5504 ee85c5e8 2020-02-29 stsp free(repo_path);
5505 ee85c5e8 2020-02-29 stsp free(in_repo_path);
5506 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
5508 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
5509 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
5510 ee85c5e8 2020-02-29 stsp free(cmd_argv);
5512 ee85c5e8 2020-02-29 stsp return error;
5516 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
5518 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
5519 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
5520 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
5521 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
5522 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
5523 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
5524 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
5527 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
5529 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5530 9f7d7167 2018-04-29 stsp switch (ch) {
5532 9f7d7167 2018-04-29 stsp hflag = 1;
5535 53ccebc2 2019-07-30 stsp Vflag = 1;
5538 ce5b7c56 2019-07-09 stsp usage(hflag);
5539 9f7d7167 2018-04-29 stsp /* NOTREACHED */
5543 9f7d7167 2018-04-29 stsp argc -= optind;
5544 9f7d7167 2018-04-29 stsp argv += optind;
5545 9f7d7167 2018-04-29 stsp optind = 0;
5546 c2301be8 2018-04-30 stsp optreset = 1;
5548 53ccebc2 2019-07-30 stsp if (Vflag) {
5549 53ccebc2 2019-07-30 stsp got_version_print_str();
5553 c2301be8 2018-04-30 stsp if (argc == 0) {
5554 f29d3e89 2018-06-23 stsp if (hflag)
5555 ce5b7c56 2019-07-09 stsp usage(hflag);
5556 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
5557 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
5559 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
5563 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
5564 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
5565 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
5566 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
5567 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
5573 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
5574 ee85c5e8 2020-02-29 stsp if (argc != 1)
5576 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
5577 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
5579 ee85c5e8 2020-02-29 stsp if (hflag)
5580 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
5582 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5586 a2f4a359 2020-02-28 stsp if (cmd_argv) {
5588 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
5589 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
5590 a2f4a359 2020-02-28 stsp free(cmd_argv);
5593 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
5594 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
