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 0d6c6ee3 2020-05-20 stsp #include <ctype.h>
22 31120ada 2018-04-30 stsp #include <errno.h>
23 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
24 9f7d7167 2018-04-29 stsp #include <curses.h>
25 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
26 9f7d7167 2018-04-29 stsp #include <panel.h>
27 9f7d7167 2018-04-29 stsp #include <locale.h>
28 61266923 2020-01-14 stsp #include <signal.h>
29 9f7d7167 2018-04-29 stsp #include <stdlib.h>
30 ee85c5e8 2020-02-29 stsp #include <stdarg.h>
31 26ed57b2 2018-05-19 stsp #include <stdio.h>
32 9f7d7167 2018-04-29 stsp #include <getopt.h>
33 9f7d7167 2018-04-29 stsp #include <string.h>
34 9f7d7167 2018-04-29 stsp #include <err.h>
35 80ddbec8 2018-04-29 stsp #include <unistd.h>
36 26ed57b2 2018-05-19 stsp #include <util.h>
37 26ed57b2 2018-05-19 stsp #include <limits.h>
38 61e69b96 2018-05-20 stsp #include <wchar.h>
39 788c352e 2018-06-16 stsp #include <time.h>
40 84451b3e 2018-07-10 stsp #include <pthread.h>
41 5036bf37 2018-09-24 stsp #include <libgen.h>
42 60493ae3 2019-06-20 stsp #include <regex.h>
44 53ccebc2 2019-07-30 stsp #include "got_version.h"
45 9f7d7167 2018-04-29 stsp #include "got_error.h"
46 80ddbec8 2018-04-29 stsp #include "got_object.h"
47 80ddbec8 2018-04-29 stsp #include "got_reference.h"
48 80ddbec8 2018-04-29 stsp #include "got_repository.h"
49 80ddbec8 2018-04-29 stsp #include "got_diff.h"
50 511a516b 2018-05-19 stsp #include "got_opentemp.h"
51 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
52 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
53 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
54 a70480e0 2018-06-23 stsp #include "got_blame.h"
55 c2db6724 2019-01-04 stsp #include "got_privsep.h"
56 1dd54920 2019-05-11 stsp #include "got_path.h"
57 b7165be3 2019-02-05 stsp #include "got_worktree.h"
60 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
67 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
69 9f7d7167 2018-04-29 stsp #ifndef nitems
70 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
73 9f7d7167 2018-04-29 stsp struct tog_cmd {
74 c2301be8 2018-04-30 stsp const char *name;
75 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
76 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
79 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
83 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
85 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
86 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
87 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
88 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
90 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
91 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
92 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
93 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
94 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
97 d6b05b5b 2018-08-04 stsp enum tog_view_type {
98 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
99 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
100 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
101 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
104 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
106 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
107 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
108 ba4f502b 2018-08-04 stsp struct got_object_id *id;
109 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
112 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
113 ba4f502b 2018-08-04 stsp struct commit_queue {
114 ba4f502b 2018-08-04 stsp int ncommits;
115 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
118 f26dddb7 2019-11-08 stsp struct tog_color {
119 f26dddb7 2019-11-08 stsp SIMPLEQ_ENTRY(tog_color) entry;
120 6d17833f 2019-11-08 stsp regex_t regex;
121 6d17833f 2019-11-08 stsp short colorpair;
123 f26dddb7 2019-11-08 stsp SIMPLEQ_HEAD(tog_colors, tog_color);
125 11b20872 2019-11-08 stsp static const struct got_error *
126 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
127 11b20872 2019-11-08 stsp int idx, short color)
129 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
130 11b20872 2019-11-08 stsp struct tog_color *tc;
131 11b20872 2019-11-08 stsp int regerr = 0;
133 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
134 11b20872 2019-11-08 stsp return NULL;
136 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
138 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
139 11b20872 2019-11-08 stsp if (tc == NULL)
140 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
141 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
142 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
143 11b20872 2019-11-08 stsp if (regerr) {
144 11b20872 2019-11-08 stsp static char regerr_msg[512];
145 11b20872 2019-11-08 stsp static char err_msg[512];
146 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
147 11b20872 2019-11-08 stsp sizeof(regerr_msg));
148 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
149 11b20872 2019-11-08 stsp regerr_msg);
150 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
152 11b20872 2019-11-08 stsp return err;
154 11b20872 2019-11-08 stsp tc->colorpair = idx;
155 11b20872 2019-11-08 stsp SIMPLEQ_INSERT_HEAD(colors, tc, entry);
156 11b20872 2019-11-08 stsp return NULL;
159 11b20872 2019-11-08 stsp static void
160 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
162 11b20872 2019-11-08 stsp struct tog_color *tc;
164 11b20872 2019-11-08 stsp while (!SIMPLEQ_EMPTY(colors)) {
165 11b20872 2019-11-08 stsp tc = SIMPLEQ_FIRST(colors);
166 11b20872 2019-11-08 stsp SIMPLEQ_REMOVE_HEAD(colors, entry);
167 11b20872 2019-11-08 stsp regfree(&tc->regex);
172 11b20872 2019-11-08 stsp struct tog_color *
173 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
175 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
177 11b20872 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
178 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
182 11b20872 2019-11-08 stsp return NULL;
186 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
188 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
189 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
190 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
191 11b20872 2019-11-08 stsp return COLOR_CYAN;
192 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
193 11b20872 2019-11-08 stsp return COLOR_YELLOW;
194 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
195 11b20872 2019-11-08 stsp return COLOR_GREEN;
196 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
197 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
198 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
199 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
200 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
201 91b8c405 2020-01-25 stsp return COLOR_CYAN;
202 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
203 11b20872 2019-11-08 stsp return COLOR_GREEN;
204 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
205 11b20872 2019-11-08 stsp return COLOR_GREEN;
206 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
207 11b20872 2019-11-08 stsp return COLOR_CYAN;
208 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
209 11b20872 2019-11-08 stsp return COLOR_YELLOW;
215 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
217 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
219 11b20872 2019-11-08 stsp if (val == NULL)
220 11b20872 2019-11-08 stsp return default_color_value(envvar);
222 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
223 11b20872 2019-11-08 stsp return COLOR_BLACK;
224 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
225 11b20872 2019-11-08 stsp return COLOR_RED;
226 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
227 11b20872 2019-11-08 stsp return COLOR_GREEN;
228 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
229 11b20872 2019-11-08 stsp return COLOR_YELLOW;
230 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
231 11b20872 2019-11-08 stsp return COLOR_BLUE;
232 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
233 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
234 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
235 11b20872 2019-11-08 stsp return COLOR_CYAN;
236 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
237 11b20872 2019-11-08 stsp return COLOR_WHITE;
238 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
241 11b20872 2019-11-08 stsp return default_color_value(envvar);
245 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
246 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
248 15a087fe 2019-02-21 stsp int first_displayed_line;
249 15a087fe 2019-02-21 stsp int last_displayed_line;
251 15a087fe 2019-02-21 stsp int diff_context;
252 15a087fe 2019-02-21 stsp struct got_repository *repo;
253 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
254 bddb1296 2019-11-08 stsp struct tog_colors colors;
255 f44b1f58 2020-02-02 tracey int nlines;
256 f44b1f58 2020-02-02 tracey off_t *line_offsets;
257 f44b1f58 2020-02-02 tracey int matched_line;
258 f44b1f58 2020-02-02 tracey int selected_line;
259 f44b1f58 2020-02-02 tracey size_t filesize;
261 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
262 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
265 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
267 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
268 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
269 7c1452c1 2020-03-26 stsp pthread_cond_t commit_loaded;
270 1a76625f 2018-10-22 stsp int commits_needed;
271 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
272 1a76625f 2018-10-22 stsp struct commit_queue *commits;
273 1a76625f 2018-10-22 stsp const char *in_repo_path;
274 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
275 1a76625f 2018-10-22 stsp struct got_repository *repo;
276 1a76625f 2018-10-22 stsp int log_complete;
277 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
278 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
279 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
280 13add988 2019-10-15 stsp int *searching;
281 13add988 2019-10-15 stsp int *search_next_done;
282 13add988 2019-10-15 stsp regex_t *regex;
285 1a76625f 2018-10-22 stsp struct tog_log_view_state {
286 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
287 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
288 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
289 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
290 b01e7d3b 2018-08-04 stsp int selected;
291 b01e7d3b 2018-08-04 stsp char *in_repo_path;
292 d01904d4 2019-06-25 stsp const char *head_ref_name;
293 b672a97a 2020-01-27 stsp int log_branches;
294 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
295 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
296 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
297 1a76625f 2018-10-22 stsp sig_atomic_t quit;
298 1a76625f 2018-10-22 stsp pthread_t thread;
299 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
300 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
301 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
302 11b20872 2019-11-08 stsp struct tog_colors colors;
305 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
306 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
307 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
308 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
309 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
310 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
311 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
312 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
313 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
314 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
315 11b20872 2019-11-08 stsp #define TOG_COLOR_DATE 11
317 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
318 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
319 e9424729 2018-08-04 stsp int nlines;
321 e9424729 2018-08-04 stsp struct tog_view *view;
322 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
326 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
327 e9424729 2018-08-04 stsp const char *path;
328 e9424729 2018-08-04 stsp struct got_repository *repo;
329 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
330 e9424729 2018-08-04 stsp int *complete;
331 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
332 fc06ba56 2019-08-22 stsp void *cancel_arg;
335 e9424729 2018-08-04 stsp struct tog_blame {
337 e9424729 2018-08-04 stsp size_t filesize;
338 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
339 6fcac457 2018-11-19 stsp int nlines;
340 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
341 e9424729 2018-08-04 stsp pthread_t thread;
342 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
343 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
344 e9424729 2018-08-04 stsp const char *path;
347 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
348 7cbe629d 2018-08-04 stsp int first_displayed_line;
349 7cbe629d 2018-08-04 stsp int last_displayed_line;
350 7cbe629d 2018-08-04 stsp int selected_line;
351 7cbe629d 2018-08-04 stsp int blame_complete;
354 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
355 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
356 e5a0f69f 2018-08-18 stsp char *path;
357 7cbe629d 2018-08-04 stsp struct got_repository *repo;
358 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
359 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
360 e9424729 2018-08-04 stsp struct tog_blame blame;
361 6c4c42e0 2019-06-24 stsp int matched_line;
362 11b20872 2019-11-08 stsp struct tog_colors colors;
365 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
366 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
367 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
368 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
369 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
370 ad80ab7b 2018-08-04 stsp int selected;
373 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
375 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
376 ad80ab7b 2018-08-04 stsp char *tree_label;
377 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
378 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
379 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
380 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
381 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
382 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
383 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
384 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
385 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
386 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
387 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
388 bddb1296 2019-11-08 stsp struct tog_colors colors;
392 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
394 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
395 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
396 669b5ffa 2018-10-07 stsp * there is enough screen estate.
398 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
399 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
401 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
402 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
403 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
405 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
406 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
408 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
410 cc3c9aac 2018-08-01 stsp struct tog_view {
411 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
412 26ed57b2 2018-05-19 stsp WINDOW *window;
413 26ed57b2 2018-05-19 stsp PANEL *panel;
414 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
415 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
416 1004088d 2018-09-29 stsp int focussed;
417 669b5ffa 2018-10-07 stsp struct tog_view *parent;
418 669b5ffa 2018-10-07 stsp struct tog_view *child;
419 669b5ffa 2018-10-07 stsp int child_focussed;
421 5dc9f4bc 2018-08-04 stsp /* type-specific state */
422 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
424 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
425 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
426 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
427 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
430 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
431 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
432 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
433 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
435 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
436 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
437 60493ae3 2019-06-20 stsp int searching;
438 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
439 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
440 60493ae3 2019-06-20 stsp int search_next_done;
441 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_HAVE_MORE 1
442 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_NO_MORE 2
443 f9967bca 2020-03-27 stsp #define TOG_SEARCH_HAVE_NONE 3
444 1803e47f 2019-06-22 stsp regex_t regex;
447 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
448 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
449 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
450 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
451 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
452 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
453 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
454 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
455 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
457 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
458 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
459 f135c941 2020-02-20 stsp struct got_repository *, const char *, const char *, int);
460 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
461 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
462 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
463 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
464 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
465 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
467 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
468 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
469 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
470 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
471 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
472 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
473 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
474 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
476 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
477 55cccc34 2020-02-20 stsp struct got_tree_object *, struct got_object_id *, struct got_reflist_head *,
478 55cccc34 2020-02-20 stsp struct got_repository *);
479 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
480 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
481 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
482 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
483 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
484 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
486 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
487 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
488 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
490 25791caa 2018-10-24 stsp static void
491 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
493 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
496 83baff54 2019-08-12 stsp static void
497 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
499 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
502 61266923 2020-01-14 stsp static void
503 61266923 2020-01-14 stsp tog_sigcont(int signo)
505 61266923 2020-01-14 stsp tog_sigcont_received = 1;
508 e5a0f69f 2018-08-18 stsp static const struct got_error *
509 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
511 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
513 669b5ffa 2018-10-07 stsp if (view->child) {
514 669b5ffa 2018-10-07 stsp view_close(view->child);
515 669b5ffa 2018-10-07 stsp view->child = NULL;
517 e5a0f69f 2018-08-18 stsp if (view->close)
518 e5a0f69f 2018-08-18 stsp err = view->close(view);
519 ea5e7bb5 2018-08-01 stsp if (view->panel)
520 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
521 ea5e7bb5 2018-08-01 stsp if (view->window)
522 ea5e7bb5 2018-08-01 stsp delwin(view->window);
523 ea5e7bb5 2018-08-01 stsp free(view);
524 e5a0f69f 2018-08-18 stsp return err;
527 ea5e7bb5 2018-08-01 stsp static struct tog_view *
528 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
529 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
531 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
533 ea5e7bb5 2018-08-01 stsp if (view == NULL)
534 ea5e7bb5 2018-08-01 stsp return NULL;
536 d6b05b5b 2018-08-04 stsp view->type = type;
537 f7d12f7e 2018-08-01 stsp view->lines = LINES;
538 f7d12f7e 2018-08-01 stsp view->cols = COLS;
539 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
540 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
541 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
542 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
543 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
544 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
545 96a765a8 2018-08-04 stsp view_close(view);
546 ea5e7bb5 2018-08-01 stsp return NULL;
548 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
549 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
550 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
551 96a765a8 2018-08-04 stsp view_close(view);
552 ea5e7bb5 2018-08-01 stsp return NULL;
555 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
556 ea5e7bb5 2018-08-01 stsp return view;
560 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
562 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
564 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
567 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
569 5c60c32a 2018-10-18 stsp static const struct got_error *
570 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
572 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
574 5c60c32a 2018-10-18 stsp view->begin_y = 0;
575 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
576 5c60c32a 2018-10-18 stsp view->nlines = LINES;
577 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
578 5c60c32a 2018-10-18 stsp view->lines = LINES;
579 5c60c32a 2018-10-18 stsp view->cols = COLS;
580 5c60c32a 2018-10-18 stsp err = view_resize(view);
582 5c60c32a 2018-10-18 stsp return err;
584 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
585 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
587 5c60c32a 2018-10-18 stsp return NULL;
590 5c60c32a 2018-10-18 stsp static const struct got_error *
591 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
593 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
595 5c60c32a 2018-10-18 stsp view->begin_x = 0;
596 5c60c32a 2018-10-18 stsp view->begin_y = 0;
597 5c60c32a 2018-10-18 stsp view->nlines = LINES;
598 5c60c32a 2018-10-18 stsp view->ncols = COLS;
599 5c60c32a 2018-10-18 stsp view->lines = LINES;
600 5c60c32a 2018-10-18 stsp view->cols = COLS;
601 5c60c32a 2018-10-18 stsp err = view_resize(view);
603 5c60c32a 2018-10-18 stsp return err;
605 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
606 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
608 5c60c32a 2018-10-18 stsp return NULL;
612 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
614 5c60c32a 2018-10-18 stsp return view->parent == NULL;
617 4d8c2215 2018-08-19 stsp static const struct got_error *
618 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
620 f7d12f7e 2018-08-01 stsp int nlines, ncols;
622 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
623 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
625 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
627 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
628 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
630 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
632 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
633 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
634 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
635 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
636 25791caa 2018-10-24 stsp wclear(view->window);
638 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
639 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
640 0cf4efb1 2018-09-29 stsp view->lines = LINES;
641 0cf4efb1 2018-09-29 stsp view->cols = COLS;
643 6e3e5d9c 2018-10-18 stsp if (view->child) {
644 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
645 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
646 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
647 5c60c32a 2018-10-18 stsp if (view->child->focussed)
648 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
650 5c60c32a 2018-10-18 stsp show_panel(view->panel);
652 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
653 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
657 5c60c32a 2018-10-18 stsp return NULL;
660 669b5ffa 2018-10-07 stsp static const struct got_error *
661 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
663 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
665 669b5ffa 2018-10-07 stsp if (view->child == NULL)
666 669b5ffa 2018-10-07 stsp return NULL;
668 669b5ffa 2018-10-07 stsp err = view_close(view->child);
669 669b5ffa 2018-10-07 stsp view->child = NULL;
670 669b5ffa 2018-10-07 stsp return err;
673 669b5ffa 2018-10-07 stsp static const struct got_error *
674 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
676 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
678 669b5ffa 2018-10-07 stsp view->child = child;
679 669b5ffa 2018-10-07 stsp child->parent = view;
680 669b5ffa 2018-10-07 stsp return err;
684 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
686 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
689 34bc9ec9 2019-02-22 stsp static void
690 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
692 25791caa 2018-10-24 stsp int cols, lines;
693 25791caa 2018-10-24 stsp struct winsize size;
695 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
696 25791caa 2018-10-24 stsp cols = 80; /* Default */
697 25791caa 2018-10-24 stsp lines = 24;
699 25791caa 2018-10-24 stsp cols = size.ws_col;
700 25791caa 2018-10-24 stsp lines = size.ws_row;
702 25791caa 2018-10-24 stsp resize_term(lines, cols);
705 2b49a8ae 2019-06-22 stsp static const struct got_error *
706 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
708 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
709 2b49a8ae 2019-06-22 stsp char pattern[1024];
712 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
713 2b49a8ae 2019-06-22 stsp return NULL;
715 cb1159f8 2020-02-19 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
716 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
718 2b49a8ae 2019-06-22 stsp nocbreak();
720 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
723 2b49a8ae 2019-06-22 stsp if (ret == ERR)
724 2b49a8ae 2019-06-22 stsp return NULL;
726 2b49a8ae 2019-06-22 stsp if (view->searching) {
727 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
728 2b49a8ae 2019-06-22 stsp view->searching = 0;
731 2b49a8ae 2019-06-22 stsp if (regcomp(&view->regex, pattern,
732 f5daf9b1 2019-06-24 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
733 7c32bd05 2019-06-22 stsp err = view->search_start(view);
735 7c32bd05 2019-06-22 stsp regfree(&view->regex);
736 7c32bd05 2019-06-22 stsp return err;
738 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
739 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
740 2b49a8ae 2019-06-22 stsp view->search_next(view);
743 2b49a8ae 2019-06-22 stsp return NULL;
746 0cf4efb1 2018-09-29 stsp static const struct got_error *
747 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
748 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
749 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
751 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
752 669b5ffa 2018-10-07 stsp struct tog_view *v;
753 1a76625f 2018-10-22 stsp int ch, errcode;
755 e5a0f69f 2018-08-18 stsp *new = NULL;
756 e5a0f69f 2018-08-18 stsp *dead = NULL;
757 0cf4efb1 2018-09-29 stsp *focus = NULL;
759 f9967bca 2020-03-27 stsp /* Clear "no matches" indicator. */
760 f9967bca 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE ||
761 f9967bca 2020-03-27 stsp view->search_next_done == TOG_SEARCH_HAVE_NONE)
762 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
764 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
765 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
766 82954512 2020-02-03 stsp if (errcode)
767 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
768 82954512 2020-02-03 stsp "pthread_mutex_unlock");
769 82954512 2020-02-03 stsp pthread_yield();
770 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
771 82954512 2020-02-03 stsp if (errcode)
772 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
773 82954512 2020-02-03 stsp "pthread_mutex_lock");
774 60493ae3 2019-06-20 stsp view->search_next(view);
775 60493ae3 2019-06-20 stsp return NULL;
778 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
779 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
780 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
781 1a76625f 2018-10-22 stsp if (errcode)
782 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
783 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
784 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
785 1a76625f 2018-10-22 stsp if (errcode)
786 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
787 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
789 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
790 25791caa 2018-10-24 stsp tog_resizeterm();
791 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
792 61266923 2020-01-14 stsp tog_sigcont_received = 0;
793 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
794 25791caa 2018-10-24 stsp err = view_resize(v);
796 25791caa 2018-10-24 stsp return err;
797 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
799 25791caa 2018-10-24 stsp return err;
803 e5a0f69f 2018-08-18 stsp switch (ch) {
807 1e37a5c2 2019-05-12 jcs if (view->child) {
808 1e37a5c2 2019-05-12 jcs *focus = view->child;
809 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
810 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
811 1e37a5c2 2019-05-12 jcs *focus = view->parent;
812 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
816 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
817 1e37a5c2 2019-05-12 jcs *dead = view;
823 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
824 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
826 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
827 669b5ffa 2018-10-07 stsp *focus = view->child;
828 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
829 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
831 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
834 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
835 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
837 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
838 1e37a5c2 2019-05-12 jcs *focus = view;
839 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
840 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
842 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
846 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
847 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
850 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
853 60493ae3 2019-06-20 stsp if (view->search_start)
854 2b49a8ae 2019-06-22 stsp view_search_start(view);
856 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
860 8f4ed634 2020-03-26 stsp if (view->search_next) {
861 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
862 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
863 60493ae3 2019-06-20 stsp view->search_next_done = 0;
864 60493ae3 2019-06-20 stsp view->search_next(view);
866 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
869 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
873 e5a0f69f 2018-08-18 stsp return err;
877 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
879 0cf4efb1 2018-09-29 stsp PANEL *panel;
880 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
882 669b5ffa 2018-10-07 stsp if (view->parent)
883 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
885 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
886 0cf4efb1 2018-09-29 stsp if (panel == NULL)
889 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
890 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
891 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
895 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
897 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
898 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
900 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
902 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
905 669b5ffa 2018-10-07 stsp return view->focussed;
908 bcbd79e2 2018-08-19 stsp static const struct got_error *
909 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
911 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
912 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
913 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
914 fd823528 2018-10-22 stsp int fast_refresh = 10;
915 1a76625f 2018-10-22 stsp int done = 0, errcode;
917 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
918 1a76625f 2018-10-22 stsp if (errcode)
919 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
921 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
922 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
924 a81bf10d 2018-09-29 stsp main_view = view;
925 1004088d 2018-09-29 stsp view->focussed = 1;
926 878940b7 2018-09-29 stsp err = view->show(view);
928 0cf4efb1 2018-09-29 stsp return err;
929 0cf4efb1 2018-09-29 stsp update_panels();
930 0cf4efb1 2018-09-29 stsp doupdate();
931 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
932 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
933 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
934 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
936 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
937 e4197bf9 2018-08-18 stsp view, &views);
940 e5a0f69f 2018-08-18 stsp if (dead_view) {
941 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
943 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
944 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
945 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
946 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
947 669b5ffa 2018-10-07 stsp prev = view->parent;
949 669b5ffa 2018-10-07 stsp if (dead_view->parent)
950 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
952 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
954 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
955 d01904d4 2019-06-25 stsp if (err || (dead_view == main_view && new_view == NULL))
958 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
959 0cf4efb1 2018-09-29 stsp if (focus_view)
960 0cf4efb1 2018-09-29 stsp view = focus_view;
961 669b5ffa 2018-10-07 stsp else if (prev)
962 669b5ffa 2018-10-07 stsp view = prev;
963 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
964 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
965 0cf4efb1 2018-09-29 stsp tog_view_list_head);
967 0cf4efb1 2018-09-29 stsp view = NULL;
968 669b5ffa 2018-10-07 stsp if (view) {
969 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
970 669b5ffa 2018-10-07 stsp focus_view = view->child;
972 669b5ffa 2018-10-07 stsp focus_view = view;
976 bcbd79e2 2018-08-19 stsp if (new_view) {
977 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
978 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
979 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
980 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
982 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
983 86c66b02 2018-10-18 stsp err = view_close(v);
988 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
989 fed7eaa8 2018-10-24 stsp view = new_view;
990 878940b7 2018-09-29 stsp if (focus_view == NULL)
991 878940b7 2018-09-29 stsp focus_view = new_view;
993 0cf4efb1 2018-09-29 stsp if (focus_view) {
994 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
996 0cf4efb1 2018-09-29 stsp view->focussed = 0;
997 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
998 0cf4efb1 2018-09-29 stsp view = focus_view;
999 878940b7 2018-09-29 stsp if (new_view)
1000 878940b7 2018-09-29 stsp show_panel(new_view->panel);
1001 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
1002 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
1004 669b5ffa 2018-10-07 stsp if (view) {
1005 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
1006 758194b5 2018-10-24 stsp view->focussed = 1;
1007 758194b5 2018-10-24 stsp show_panel(view->panel);
1008 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
1009 758194b5 2018-10-24 stsp show_panel(view->child->panel);
1010 1a76625f 2018-10-22 stsp focus_view = view;
1012 669b5ffa 2018-10-07 stsp if (view->parent) {
1013 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1015 1a76625f 2018-10-22 stsp goto done;
1017 669b5ffa 2018-10-07 stsp err = view->show(view);
1019 1a76625f 2018-10-22 stsp goto done;
1020 669b5ffa 2018-10-07 stsp if (view->child) {
1021 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1023 1a76625f 2018-10-22 stsp goto done;
1025 1a76625f 2018-10-22 stsp update_panels();
1026 1a76625f 2018-10-22 stsp doupdate();
1030 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1031 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1032 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1033 e5a0f69f 2018-08-18 stsp view_close(view);
1036 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1037 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1038 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1040 e5a0f69f 2018-08-18 stsp return err;
1043 4ed7e80c 2018-05-20 stsp __dead static void
1044 9f7d7167 2018-04-29 stsp usage_log(void)
1047 c70c5802 2018-08-01 stsp fprintf(stderr,
1048 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1049 9f7d7167 2018-04-29 stsp getprogname());
1053 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1054 80ddbec8 2018-04-29 stsp static const struct got_error *
1055 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1057 00dfcb92 2018-06-11 stsp char *vis = NULL;
1058 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1060 963b370f 2018-05-20 stsp *ws = NULL;
1061 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1062 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1063 00dfcb92 2018-06-11 stsp int vislen;
1064 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1065 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1067 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1068 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1070 00dfcb92 2018-06-11 stsp return err;
1071 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1072 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1073 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1074 a7f50699 2018-06-11 stsp goto done;
1078 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1079 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1080 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1081 a7f50699 2018-06-11 stsp goto done;
1084 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1085 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1087 00dfcb92 2018-06-11 stsp free(vis);
1088 963b370f 2018-05-20 stsp if (err) {
1089 963b370f 2018-05-20 stsp free(*ws);
1090 963b370f 2018-05-20 stsp *ws = NULL;
1091 963b370f 2018-05-20 stsp *wlen = 0;
1093 963b370f 2018-05-20 stsp return err;
1096 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
1097 963b370f 2018-05-20 stsp static const struct got_error *
1098 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1099 27a741e5 2019-09-11 stsp int col_tab_align)
1101 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1102 963b370f 2018-05-20 stsp int cols = 0;
1103 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1104 963b370f 2018-05-20 stsp size_t wlen;
1107 963b370f 2018-05-20 stsp *wlinep = NULL;
1108 b700b5d6 2018-07-10 stsp *widthp = 0;
1110 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
1112 963b370f 2018-05-20 stsp return err;
1115 27a741e5 2019-09-11 stsp while (i < wlen) {
1116 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
1118 27a741e5 2019-09-11 stsp if (width == 0) {
1123 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
1124 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1126 27a741e5 2019-09-11 stsp cols += width;
1128 27a741e5 2019-09-11 stsp } else if (width == -1) {
1129 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
1130 27a741e5 2019-09-11 stsp width = TABSIZE -
1131 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
1132 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1134 27a741e5 2019-09-11 stsp cols += width;
1138 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
1139 963b370f 2018-05-20 stsp goto done;
1142 963b370f 2018-05-20 stsp wline[i] = L'\0';
1143 b700b5d6 2018-07-10 stsp if (widthp)
1144 b700b5d6 2018-07-10 stsp *widthp = cols;
1147 963b370f 2018-05-20 stsp free(wline);
1149 963b370f 2018-05-20 stsp *wlinep = wline;
1150 963b370f 2018-05-20 stsp return err;
1153 8b473291 2019-02-21 stsp static const struct got_error*
1154 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1155 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1157 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1158 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1160 8b473291 2019-02-21 stsp const char *name;
1162 8b473291 2019-02-21 stsp *refs_str = NULL;
1164 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1165 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1168 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1169 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1171 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1172 8b473291 2019-02-21 stsp name += 5;
1173 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1175 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1176 8b473291 2019-02-21 stsp name += 6;
1177 79cc719f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
1178 8b473291 2019-02-21 stsp name += 8;
1179 79cc719f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
1180 79cc719f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
1183 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1184 52b5abe1 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1185 5d844a1e 2019-08-13 stsp if (err) {
1186 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1188 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1189 5d844a1e 2019-08-13 stsp err = NULL;
1190 5d844a1e 2019-08-13 stsp tag = NULL;
1193 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1194 52b5abe1 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1196 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1197 52b5abe1 2019-08-13 stsp if (cmp != 0)
1199 8b473291 2019-02-21 stsp s = *refs_str;
1200 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1201 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1202 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1204 8b473291 2019-02-21 stsp *refs_str = NULL;
1210 8b473291 2019-02-21 stsp return err;
1213 963b370f 2018-05-20 stsp static const struct got_error *
1214 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1215 27a741e5 2019-09-11 stsp int col_tab_align)
1217 5813d178 2019-03-09 stsp char *smallerthan, *at;
1219 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1220 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1221 5813d178 2019-03-09 stsp author = smallerthan + 1;
1222 5813d178 2019-03-09 stsp at = strchr(author, '@');
1224 5813d178 2019-03-09 stsp *at = '\0';
1225 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1228 5813d178 2019-03-09 stsp static const struct got_error *
1229 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1230 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1231 11b20872 2019-11-08 stsp const size_t date_display_cols, int author_display_cols,
1232 11b20872 2019-11-08 stsp struct tog_colors *colors)
1234 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1235 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1236 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1237 5813d178 2019-03-09 stsp char *author = NULL;
1238 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1239 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1240 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1241 bb737323 2018-05-20 stsp int col, limit;
1242 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1243 ccb26ccd 2018-11-05 stsp struct tm tm;
1244 45d799e2 2018-12-23 stsp time_t committer_time;
1245 11b20872 2019-11-08 stsp struct tog_color *tc;
1247 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1248 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1249 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1250 6db9f7f6 2019-12-10 stsp if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1251 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1252 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1254 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1255 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1257 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1258 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_DATE);
1260 11b20872 2019-11-08 stsp wattr_on(view->window,
1261 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1262 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1264 11b20872 2019-11-08 stsp wattr_off(view->window,
1265 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1266 27a741e5 2019-09-11 stsp col = limit;
1267 b39d25c7 2018-07-10 stsp if (col > avail)
1268 b39d25c7 2018-07-10 stsp goto done;
1270 6570a66d 2019-11-08 stsp if (avail >= 120) {
1271 6570a66d 2019-11-08 stsp char *id_str;
1272 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1274 6570a66d 2019-11-08 stsp goto done;
1275 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1277 11b20872 2019-11-08 stsp wattr_on(view->window,
1278 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1279 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1281 11b20872 2019-11-08 stsp wattr_off(view->window,
1282 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1283 6570a66d 2019-11-08 stsp free(id_str);
1285 6570a66d 2019-11-08 stsp if (col > avail)
1286 6570a66d 2019-11-08 stsp goto done;
1289 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1290 5813d178 2019-03-09 stsp if (author == NULL) {
1291 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1292 80ddbec8 2018-04-29 stsp goto done;
1294 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1296 bb737323 2018-05-20 stsp goto done;
1297 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_AUTHOR);
1299 11b20872 2019-11-08 stsp wattr_on(view->window,
1300 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1301 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1303 11b20872 2019-11-08 stsp wattr_off(view->window,
1304 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1305 bb737323 2018-05-20 stsp col += author_width;
1306 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1307 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1309 bb737323 2018-05-20 stsp author_width++;
1311 9c2eaf34 2018-05-20 stsp if (col > avail)
1312 9c2eaf34 2018-05-20 stsp goto done;
1314 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1316 6d9fbc00 2018-04-29 stsp goto done;
1317 bb737323 2018-05-20 stsp logmsg = logmsg0;
1318 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1320 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1321 bb737323 2018-05-20 stsp if (newline)
1322 bb737323 2018-05-20 stsp *newline = '\0';
1323 bb737323 2018-05-20 stsp limit = avail - col;
1324 dee2c213 2019-11-13 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1326 bb737323 2018-05-20 stsp goto done;
1327 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1328 bb737323 2018-05-20 stsp col += logmsg_width;
1329 27a741e5 2019-09-11 stsp while (col < avail) {
1330 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1334 80ddbec8 2018-04-29 stsp free(logmsg0);
1335 bb737323 2018-05-20 stsp free(wlogmsg);
1336 5813d178 2019-03-09 stsp free(author);
1337 bb737323 2018-05-20 stsp free(wauthor);
1338 80ddbec8 2018-04-29 stsp free(line);
1339 80ddbec8 2018-04-29 stsp return err;
1342 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1343 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1344 899d86c2 2018-05-10 stsp struct got_object_id *id)
1346 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1348 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1349 80ddbec8 2018-04-29 stsp if (entry == NULL)
1350 899d86c2 2018-05-10 stsp return NULL;
1352 899d86c2 2018-05-10 stsp entry->id = id;
1353 99db9666 2018-05-07 stsp entry->commit = commit;
1354 899d86c2 2018-05-10 stsp return entry;
1357 99db9666 2018-05-07 stsp static void
1358 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1360 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1362 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1363 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1364 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1365 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1366 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1367 99db9666 2018-05-07 stsp free(entry);
1370 99db9666 2018-05-07 stsp static void
1371 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1373 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1374 99db9666 2018-05-07 stsp pop_commit(commits);
1377 c4972b91 2018-05-07 stsp static const struct got_error *
1378 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1379 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1381 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1382 13add988 2019-10-15 stsp regmatch_t regmatch;
1383 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1385 13add988 2019-10-15 stsp *have_match = 0;
1387 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1389 13add988 2019-10-15 stsp return err;
1391 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1393 13add988 2019-10-15 stsp goto done;
1395 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1396 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1397 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1398 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1399 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1400 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1401 13add988 2019-10-15 stsp *have_match = 1;
1403 13add988 2019-10-15 stsp free(id_str);
1404 13add988 2019-10-15 stsp free(logmsg);
1405 13add988 2019-10-15 stsp return err;
1408 13add988 2019-10-15 stsp static const struct got_error *
1409 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1410 13add988 2019-10-15 stsp int minqueue, struct got_repository *repo, const char *path,
1411 13add988 2019-10-15 stsp int *searching, int *search_next_done, regex_t *regex)
1413 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1414 7c1452c1 2020-03-26 stsp int nqueued = 0;
1417 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1418 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1419 1a76625f 2018-10-22 stsp * while updating the display.
1421 13add988 2019-10-15 stsp while (nqueued < minqueue ||
1422 13add988 2019-10-15 stsp (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1423 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1424 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1425 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1426 1a76625f 2018-10-22 stsp int errcode;
1428 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1429 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1432 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1435 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1436 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1437 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1441 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1442 1a76625f 2018-10-22 stsp if (errcode) {
1443 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1444 13add988 2019-10-15 stsp "pthread_mutex_lock");
1448 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1449 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1450 ecb28ae0 2018-07-16 stsp nqueued++;
1451 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1453 13add988 2019-10-15 stsp if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1454 7c1452c1 2020-03-26 stsp int have_match;
1455 13add988 2019-10-15 stsp err = match_commit(&have_match, id, commit, regex);
1458 7c1452c1 2020-03-26 stsp if (have_match)
1459 8f4ed634 2020-03-26 stsp *search_next_done = TOG_SEARCH_HAVE_MORE;
1462 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1463 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1464 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1465 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1470 9ba79e04 2018-06-11 stsp return err;
1473 0553a4e3 2018-04-30 stsp static const struct got_error *
1474 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1475 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1476 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1477 11b20872 2019-11-08 stsp struct got_reflist_head *refs, const char *path, int commits_needed,
1478 11b20872 2019-11-08 stsp struct tog_colors *colors)
1480 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1481 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1482 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1483 60493ae3 2019-06-20 stsp int width;
1484 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1485 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1486 8b473291 2019-02-21 stsp char *refs_str = NULL;
1487 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1488 11b20872 2019-11-08 stsp struct tog_color *tc;
1489 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1491 e0d42f60 2018-07-22 stsp entry = first;
1492 e0d42f60 2018-07-22 stsp ncommits = 0;
1493 e0d42f60 2018-07-22 stsp while (entry) {
1494 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1495 e0d42f60 2018-07-22 stsp *selected = entry;
1498 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1499 e0d42f60 2018-07-22 stsp ncommits++;
1502 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1503 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1505 ecb28ae0 2018-07-16 stsp return err;
1506 8b473291 2019-02-21 stsp if (refs) {
1507 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, (*selected)->id,
1510 8b473291 2019-02-21 stsp goto done;
1514 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1515 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1517 8f4ed634 2020-03-26 stsp if (commits_needed > 0) {
1518 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1519 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1520 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
1521 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
1522 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1523 8f4ed634 2020-03-26 stsp goto done;
1526 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
1528 f9686aa5 2020-03-27 stsp if (view->searching) {
1529 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
1530 f9686aa5 2020-03-27 stsp search_str = "no more matches";
1531 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1532 f9686aa5 2020-03-27 stsp search_str = "no matches found";
1533 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
1534 f9686aa5 2020-03-27 stsp search_str = "searching...";
1537 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1538 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1539 f9686aa5 2020-03-27 stsp search_str ? search_str :
1540 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
1541 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1542 8f4ed634 2020-03-26 stsp goto done;
1546 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1547 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1548 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1549 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1550 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1551 1a76625f 2018-10-22 stsp header = NULL;
1552 1a76625f 2018-10-22 stsp goto done;
1554 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1555 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1556 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1557 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1558 1a76625f 2018-10-22 stsp header = NULL;
1559 1a76625f 2018-10-22 stsp goto done;
1561 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1563 1a76625f 2018-10-22 stsp goto done;
1565 2814baeb 2018-08-01 stsp werase(view->window);
1567 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1568 a3404814 2018-09-02 stsp wstandout(view->window);
1569 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1571 11b20872 2019-11-08 stsp wattr_on(view->window,
1572 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1573 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1575 11b20872 2019-11-08 stsp wattr_off(view->window,
1576 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1577 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1578 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1581 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1582 a3404814 2018-09-02 stsp wstandend(view->window);
1583 ecb28ae0 2018-07-16 stsp free(wline);
1584 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1585 1a76625f 2018-10-22 stsp goto done;
1587 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1588 899d86c2 2018-05-10 stsp entry = first;
1589 5813d178 2019-03-09 stsp ncommits = 0;
1590 5813d178 2019-03-09 stsp while (entry) {
1591 5813d178 2019-03-09 stsp char *author;
1592 5813d178 2019-03-09 stsp wchar_t *wauthor;
1593 5813d178 2019-03-09 stsp int width;
1594 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1596 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1597 5813d178 2019-03-09 stsp if (author == NULL) {
1598 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1599 5813d178 2019-03-09 stsp goto done;
1601 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1602 27a741e5 2019-09-11 stsp date_display_cols);
1603 5813d178 2019-03-09 stsp if (author_cols < width)
1604 5813d178 2019-03-09 stsp author_cols = width;
1605 5813d178 2019-03-09 stsp free(wauthor);
1606 5813d178 2019-03-09 stsp free(author);
1607 7ca04879 2019-10-19 stsp ncommits++;
1608 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1611 5813d178 2019-03-09 stsp entry = first;
1612 899d86c2 2018-05-10 stsp *last = first;
1613 867c6645 2018-07-10 stsp ncommits = 0;
1614 899d86c2 2018-05-10 stsp while (entry) {
1615 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1617 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1618 2814baeb 2018-08-01 stsp wstandout(view->window);
1619 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1620 11b20872 2019-11-08 stsp date_display_cols, author_cols, colors);
1621 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1622 2814baeb 2018-08-01 stsp wstandend(view->window);
1624 60493ae3 2019-06-20 stsp goto done;
1625 0553a4e3 2018-04-30 stsp ncommits++;
1626 899d86c2 2018-05-10 stsp *last = entry;
1627 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1630 1a57306a 2018-09-02 stsp view_vborder(view);
1632 1a76625f 2018-10-22 stsp free(id_str);
1633 8b473291 2019-02-21 stsp free(refs_str);
1634 1a76625f 2018-10-22 stsp free(ncommits_str);
1635 1a76625f 2018-10-22 stsp free(header);
1636 80ddbec8 2018-04-29 stsp return err;
1639 07b55e75 2018-05-10 stsp static void
1640 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1641 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1642 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1644 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1645 07b55e75 2018-05-10 stsp int nscrolled = 0;
1647 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1648 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1651 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1652 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1653 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1654 07b55e75 2018-05-10 stsp if (entry) {
1655 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1656 07b55e75 2018-05-10 stsp nscrolled++;
1661 aa075928 2018-05-10 stsp static const struct got_error *
1662 7c1452c1 2020-03-26 stsp trigger_log_thread(struct tog_view *log_view, int wait,
1663 7c1452c1 2020-03-26 stsp int *commits_needed, int *log_complete,
1664 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1666 5e224a3e 2019-02-22 stsp int errcode;
1668 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1670 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1671 5e224a3e 2019-02-22 stsp if (*log_complete)
1674 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1675 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1676 7aafa0d1 2019-02-22 stsp if (errcode)
1677 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1678 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1681 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
1682 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
1684 7c1452c1 2020-03-26 stsp if (!wait)
1687 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1688 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1689 7c1452c1 2020-03-26 stsp update_panels();
1690 7c1452c1 2020-03-26 stsp doupdate();
1692 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
1693 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(commit_loaded, &tog_mutex);
1694 82954512 2020-02-03 stsp if (errcode)
1695 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1696 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1698 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1699 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1700 7c1452c1 2020-03-26 stsp update_panels();
1701 7c1452c1 2020-03-26 stsp doupdate();
1704 5e224a3e 2019-02-22 stsp return NULL;
1707 5e224a3e 2019-02-22 stsp static const struct got_error *
1708 7c1452c1 2020-03-26 stsp scroll_down(struct tog_view *log_view,
1709 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1710 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1711 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1712 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1714 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1715 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1716 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
1718 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1719 5e224a3e 2019-02-22 stsp return NULL;
1721 7c1452c1 2020-03-26 stsp ncommits_needed = (*last_displayed_entry)->idx + 1 + maxscroll;
1722 7c1452c1 2020-03-26 stsp if (commits->ncommits < ncommits_needed && !*log_complete) {
1724 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
1726 7c1452c1 2020-03-26 stsp (*commits_needed) += maxscroll;
1727 7c1452c1 2020-03-26 stsp err = trigger_log_thread(log_view, 1, commits_needed,
1728 7c1452c1 2020-03-26 stsp log_complete, need_commits, commit_loaded);
1730 5e224a3e 2019-02-22 stsp return err;
1734 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1735 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1738 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1740 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1741 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1743 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1744 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1746 dd0a52c1 2018-05-20 stsp return err;
1749 cd0acaa7 2018-05-20 stsp static const struct got_error *
1750 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1751 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1752 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1753 8b473291 2019-02-21 stsp struct got_repository *repo)
1755 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1756 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1757 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1759 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1760 15a94983 2018-12-23 stsp if (diff_view == NULL)
1761 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1763 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1764 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1765 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1766 e5a0f69f 2018-08-18 stsp if (err == NULL)
1767 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1768 cd0acaa7 2018-05-20 stsp return err;
1771 80ddbec8 2018-04-29 stsp static const struct got_error *
1772 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1773 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1775 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1777 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1778 941e9f74 2019-05-21 stsp if (parent == NULL)
1779 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1781 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1782 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1783 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1784 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1785 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1786 941e9f74 2019-05-21 stsp s->tree = subtree;
1787 941e9f74 2019-05-21 stsp s->selected = 0;
1788 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1789 941e9f74 2019-05-21 stsp return NULL;
1792 941e9f74 2019-05-21 stsp static const struct got_error *
1793 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
1794 55cccc34 2020-02-20 stsp struct got_object_id *commit_id,
1795 55cccc34 2020-02-20 stsp const char *path, struct got_repository *repo)
1797 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1798 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
1799 941e9f74 2019-05-21 stsp const char *p;
1800 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
1802 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1804 941e9f74 2019-05-21 stsp while (*p) {
1805 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
1806 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1807 56e0773d 2019-11-28 stsp char *te_name;
1809 33cbf02b 2020-01-12 stsp while (p[0] == '/')
1812 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1813 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1814 941e9f74 2019-05-21 stsp if (slash == NULL)
1815 33cbf02b 2020-01-12 stsp te_name = strdup(p);
1817 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
1818 56e0773d 2019-11-28 stsp if (te_name == NULL) {
1819 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
1822 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
1823 56e0773d 2019-11-28 stsp if (te == NULL) {
1824 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1825 56e0773d 2019-11-28 stsp free(te_name);
1828 56e0773d 2019-11-28 stsp free(te_name);
1829 56e0773d 2019-11-28 stsp s->selected_entry = te;
1830 56e0773d 2019-11-28 stsp s->selected = got_tree_entry_get_index(te);
1831 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1832 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1834 56e0773d 2019-11-28 stsp if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry))) {
1835 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1836 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1837 67409a31 2019-05-24 stsp s->selected = 0;
1841 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1842 941e9f74 2019-05-21 stsp if (slash)
1843 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1845 941e9f74 2019-05-21 stsp subpath = strdup(path);
1846 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1847 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1851 55cccc34 2020-02-20 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
1856 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1857 941e9f74 2019-05-21 stsp free(tree_id);
1861 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1862 941e9f74 2019-05-21 stsp if (err) {
1863 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1866 941e9f74 2019-05-21 stsp if (slash == NULL)
1868 941e9f74 2019-05-21 stsp free(subpath);
1869 941e9f74 2019-05-21 stsp subpath = NULL;
1870 941e9f74 2019-05-21 stsp p = slash;
1873 941e9f74 2019-05-21 stsp free(subpath);
1874 1a76625f 2018-10-22 stsp return err;
1877 61266923 2020-01-14 stsp static const struct got_error *
1878 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1879 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
1880 55cccc34 2020-02-20 stsp struct got_reflist_head *refs, struct got_repository *repo)
1882 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
1883 55cccc34 2020-02-20 stsp struct got_tree_object *tree;
1884 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
1885 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
1887 55cccc34 2020-02-20 stsp err = got_object_open_as_tree(&tree, repo,
1888 55cccc34 2020-02-20 stsp got_object_commit_get_tree_id(entry->commit));
1890 55cccc34 2020-02-20 stsp return err;
1892 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1893 55cccc34 2020-02-20 stsp if (tree_view == NULL)
1894 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
1896 55cccc34 2020-02-20 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1897 55cccc34 2020-02-20 stsp if (err) {
1898 55cccc34 2020-02-20 stsp got_object_tree_close(tree);
1899 55cccc34 2020-02-20 stsp return err;
1901 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
1903 55cccc34 2020-02-20 stsp *new_view = tree_view;
1905 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
1906 55cccc34 2020-02-20 stsp return NULL;
1908 55cccc34 2020-02-20 stsp return tree_view_walk_path(s, entry->id, path, repo);
1911 55cccc34 2020-02-20 stsp static const struct got_error *
1912 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
1914 61266923 2020-01-14 stsp sigset_t sigset;
1915 61266923 2020-01-14 stsp int errcode;
1917 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
1918 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
1920 61266923 2020-01-14 stsp /* tog handles SIGWINCH and SIGCONT */
1921 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
1922 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1923 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
1924 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1926 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
1927 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
1928 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1930 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1931 61266923 2020-01-14 stsp if (errcode)
1932 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
1934 61266923 2020-01-14 stsp return NULL;
1937 1a76625f 2018-10-22 stsp static void *
1938 1a76625f 2018-10-22 stsp log_thread(void *arg)
1940 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1941 1a76625f 2018-10-22 stsp int errcode = 0;
1942 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1943 1a76625f 2018-10-22 stsp int done = 0;
1945 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
1947 61266923 2020-01-14 stsp return (void *)err;
1949 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1950 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1951 13add988 2019-10-15 stsp a->in_repo_path, a->searching, a->search_next_done,
1952 13add988 2019-10-15 stsp a->regex);
1953 1a76625f 2018-10-22 stsp if (err) {
1954 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1955 1a76625f 2018-10-22 stsp return (void *)err;
1956 1a76625f 2018-10-22 stsp err = NULL;
1958 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1959 1a76625f 2018-10-22 stsp a->commits_needed--;
1961 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1962 3abe8080 2019-04-10 stsp if (errcode) {
1963 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1964 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1966 3abe8080 2019-04-10 stsp } else if (*a->quit)
1968 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1969 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1970 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1971 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1974 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
1975 7c1452c1 2020-03-26 stsp if (errcode) {
1976 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1977 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
1978 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
1983 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1985 7c1452c1 2020-03-26 stsp if (a->commits_needed == 0) {
1986 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
1987 7c1452c1 2020-03-26 stsp &tog_mutex);
1988 7c1452c1 2020-03-26 stsp if (errcode)
1989 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1990 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1994 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1995 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1996 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1997 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1999 3abe8080 2019-04-10 stsp a->log_complete = 1;
2000 1a76625f 2018-10-22 stsp return (void *)err;
2003 1a76625f 2018-10-22 stsp static const struct got_error *
2004 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2006 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2007 1a76625f 2018-10-22 stsp int errcode;
2009 1a76625f 2018-10-22 stsp if (s->thread) {
2010 1a76625f 2018-10-22 stsp s->quit = 1;
2011 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2012 1a76625f 2018-10-22 stsp if (errcode)
2013 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2014 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2015 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2016 1a76625f 2018-10-22 stsp if (errcode)
2017 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2018 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2019 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
2020 1a76625f 2018-10-22 stsp if (errcode)
2021 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2022 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2023 1a76625f 2018-10-22 stsp if (errcode)
2024 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2025 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2026 1a76625f 2018-10-22 stsp s->thread = NULL;
2029 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2030 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2031 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
2033 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2034 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
2035 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2038 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2039 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2040 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2043 9343a5fb 2018-06-23 stsp return err;
2046 9343a5fb 2018-06-23 stsp static const struct got_error *
2047 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2049 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2050 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2052 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2053 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2054 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2055 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2056 1a76625f 2018-10-22 stsp free(s->start_id);
2057 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2058 1a76625f 2018-10-22 stsp return err;
2061 1a76625f 2018-10-22 stsp static const struct got_error *
2062 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2064 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2066 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2067 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2068 60493ae3 2019-06-20 stsp return NULL;
2071 60493ae3 2019-06-20 stsp static const struct got_error *
2072 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2074 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2075 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2076 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2078 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2079 f9686aa5 2020-03-27 stsp show_log_view(view);
2080 f9686aa5 2020-03-27 stsp update_panels();
2081 f9686aa5 2020-03-27 stsp doupdate();
2083 96e2b566 2019-07-08 stsp if (s->search_entry) {
2084 13add988 2019-10-15 stsp int errcode, ch;
2085 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&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_unlock");
2089 13add988 2019-10-15 stsp ch = wgetch(view->window);
2090 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2091 13add988 2019-10-15 stsp if (errcode)
2092 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2093 13add988 2019-10-15 stsp "pthread_mutex_lock");
2094 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2095 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2096 678cbce5 2019-07-28 stsp return NULL;
2098 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2099 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2101 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2102 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2103 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2104 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2105 8f4ed634 2020-03-26 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2107 8f4ed634 2020-03-26 stsp entry = TAILQ_PREV(s->matched_entry,
2108 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2110 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2111 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
2113 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2116 60493ae3 2019-06-20 stsp while (1) {
2117 13add988 2019-10-15 stsp int have_match = 0;
2119 60493ae3 2019-06-20 stsp if (entry == NULL) {
2120 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2121 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2122 f9967bca 2020-03-27 stsp view->search_next_done =
2123 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2124 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2125 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2126 f801134a 2019-06-25 stsp return NULL;
2129 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2130 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2131 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2133 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2134 7c1452c1 2020-03-26 stsp return trigger_log_thread(view, 0,
2135 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
2136 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
2137 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2138 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2141 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2142 13add988 2019-10-15 stsp &view->regex);
2145 13add988 2019-10-15 stsp if (have_match) {
2146 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2147 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2151 96e2b566 2019-07-08 stsp s->search_entry = entry;
2152 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2153 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2155 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2158 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2159 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2160 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2161 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2163 60493ae3 2019-06-20 stsp return err;
2166 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2167 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2169 60493ae3 2019-06-20 stsp return err;
2174 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2176 60493ae3 2019-06-20 stsp return NULL;
2179 60493ae3 2019-06-20 stsp static const struct got_error *
2180 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2181 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
2182 f135c941 2020-02-20 stsp const char *head_ref_name, const char *in_repo_path,
2183 b672a97a 2020-01-27 stsp int log_branches)
2185 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2186 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2187 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2188 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2189 1a76625f 2018-10-22 stsp int errcode;
2191 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2192 f135c941 2020-02-20 stsp free(s->in_repo_path);
2193 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2194 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2195 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2198 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2199 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2200 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2202 8b473291 2019-02-21 stsp s->refs = refs;
2203 fb2756b9 2018-08-04 stsp s->repo = repo;
2204 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
2205 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2206 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2207 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2208 5036bf37 2018-09-24 stsp goto done;
2210 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2212 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
2213 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2214 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2215 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2217 11b20872 2019-11-08 stsp goto done;
2218 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2219 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2220 11b20872 2019-11-08 stsp if (err) {
2221 11b20872 2019-11-08 stsp free_colors(&s->colors);
2222 11b20872 2019-11-08 stsp goto done;
2224 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2225 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2226 11b20872 2019-11-08 stsp if (err) {
2227 11b20872 2019-11-08 stsp free_colors(&s->colors);
2228 11b20872 2019-11-08 stsp goto done;
2232 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2233 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2234 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2235 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2236 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2238 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2240 1a76625f 2018-10-22 stsp goto done;
2241 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2242 b672a97a 2020-01-27 stsp !s->log_branches);
2244 1a76625f 2018-10-22 stsp goto done;
2245 c5b78334 2020-01-12 stsp err = got_commit_graph_iter_start(thread_graph,
2246 c5b78334 2020-01-12 stsp s->start_id, s->repo, NULL, NULL);
2248 c5b78334 2020-01-12 stsp goto done;
2250 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2251 1a76625f 2018-10-22 stsp if (errcode) {
2252 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2253 1a76625f 2018-10-22 stsp goto done;
2255 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2256 7c1452c1 2020-03-26 stsp if (errcode) {
2257 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
2258 7c1452c1 2020-03-26 stsp goto done;
2261 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2262 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2263 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2264 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2265 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2266 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2267 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2268 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2269 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2270 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2271 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2272 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2273 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2276 1a76625f 2018-10-22 stsp close_log_view(view);
2277 ba4f502b 2018-08-04 stsp return err;
2280 e5a0f69f 2018-08-18 stsp static const struct got_error *
2281 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2283 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2285 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2286 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2287 2b380cc8 2018-10-24 stsp &s->thread_args);
2288 2b380cc8 2018-10-24 stsp if (errcode)
2289 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2292 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
2293 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
2294 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
2295 11b20872 2019-11-08 stsp s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2298 e5a0f69f 2018-08-18 stsp static const struct got_error *
2299 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2300 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2302 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2303 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2304 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
2305 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2306 669b5ffa 2018-10-07 stsp int begin_x = 0;
2307 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
2309 e5a0f69f 2018-08-18 stsp switch (ch) {
2311 1e37a5c2 2019-05-12 jcs s->quit = 1;
2314 1e37a5c2 2019-05-12 jcs case KEY_UP:
2317 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2319 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2320 1e37a5c2 2019-05-12 jcs s->selected--;
2322 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
2323 1144d21a 2019-06-21 stsp &s->commits);
2325 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2326 a4292ac5 2019-05-12 jcs case CTRL('b'):
2327 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2329 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
2330 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
2331 1e37a5c2 2019-05-12 jcs s->selected = 0;
2334 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
2335 1831ac02 2020-03-23 naddy view->nlines - 1, &s->commits);
2338 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2341 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2343 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2344 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2345 1e37a5c2 2019-05-12 jcs s->selected++;
2348 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
2349 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
2350 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
2351 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2352 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2353 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2355 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2356 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2357 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2358 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2359 1e37a5c2 2019-05-12 jcs if (first == NULL)
2361 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
2362 1831ac02 2020-03-23 naddy view->nlines - 1, &s->last_displayed_entry,
2363 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
2364 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2365 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2366 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2369 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2370 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2371 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2372 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2373 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2374 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2376 1e37a5c2 2019-05-12 jcs err = NULL;
2379 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2380 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2381 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2382 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2383 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2385 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2388 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2390 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2391 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2392 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2393 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2394 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2397 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2398 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2400 1e37a5c2 2019-05-12 jcs return err;
2401 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2403 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2406 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2407 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2409 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2412 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2414 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2415 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2416 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2417 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2420 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2421 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2423 1e37a5c2 2019-05-12 jcs return err;
2424 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2426 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2429 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2430 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2432 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2434 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2435 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
2437 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
2438 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
2439 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
2441 1e37a5c2 2019-05-12 jcs return err;
2442 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
2443 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
2444 1e37a5c2 2019-05-12 jcs if (lv == NULL)
2445 638f9024 2019-05-13 stsp return got_error_from_errno(
2446 1e37a5c2 2019-05-12 jcs "view_open");
2447 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
2448 f135c941 2020-02-20 stsp s->repo, s->head_ref_name, parent_path,
2449 b672a97a 2020-01-27 stsp s->log_branches);
2451 1e37a5c2 2019-05-12 jcs return err;;
2452 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2453 1e37a5c2 2019-05-12 jcs *new_view = lv;
2455 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
2456 1e37a5c2 2019-05-12 jcs *focus_view = lv;
2458 1e37a5c2 2019-05-12 jcs return NULL;
2461 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2462 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2464 d01904d4 2019-06-25 stsp return err;
2465 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2466 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2467 d01904d4 2019-06-25 stsp if (lv == NULL)
2468 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2469 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&start_id, NULL,
2470 71a27632 2020-01-15 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2471 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2472 ef129c5e 2019-08-03 stsp if (err) {
2473 ef129c5e 2019-08-03 stsp view_close(lv);
2474 d01904d4 2019-06-25 stsp return err;
2476 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2477 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2478 e6b23735 2019-10-04 stsp free(start_id);
2479 e6b23735 2019-10-04 stsp view_close(lv);
2480 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2482 e6b23735 2019-10-04 stsp got_ref_list_free(s->refs);
2483 e6b23735 2019-10-04 stsp err = got_ref_list(s->refs, s->repo, NULL,
2484 e6b23735 2019-10-04 stsp got_ref_cmp_by_name, NULL);
2485 e6b23735 2019-10-04 stsp if (err) {
2486 d01904d4 2019-06-25 stsp free(start_id);
2487 ef129c5e 2019-08-03 stsp view_close(lv);
2488 50284065 2019-10-04 stsp return err;
2490 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2491 f135c941 2020-02-20 stsp s->head_ref_name, in_repo_path, s->log_branches);
2492 ef129c5e 2019-08-03 stsp if (err) {
2493 ef129c5e 2019-08-03 stsp free(start_id);
2494 b672a97a 2020-01-27 stsp view_close(lv);
2495 b672a97a 2020-01-27 stsp return err;;
2497 b672a97a 2020-01-27 stsp *dead_view = view;
2498 b672a97a 2020-01-27 stsp *new_view = lv;
2501 b672a97a 2020-01-27 stsp s->log_branches = !s->log_branches;
2502 b672a97a 2020-01-27 stsp err = stop_log_thread(s);
2504 b672a97a 2020-01-27 stsp return err;
2505 b672a97a 2020-01-27 stsp lv = view_open(view->nlines, view->ncols,
2506 b672a97a 2020-01-27 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2507 b672a97a 2020-01-27 stsp if (lv == NULL)
2508 b672a97a 2020-01-27 stsp return got_error_from_errno("view_open");
2509 b672a97a 2020-01-27 stsp err = open_log_view(lv, s->start_id, s->refs, s->repo,
2510 f135c941 2020-02-20 stsp s->head_ref_name, s->in_repo_path, s->log_branches);
2511 b672a97a 2020-01-27 stsp if (err) {
2512 ef129c5e 2019-08-03 stsp view_close(lv);
2513 d01904d4 2019-06-25 stsp return err;;
2515 d01904d4 2019-06-25 stsp *dead_view = view;
2516 d01904d4 2019-06-25 stsp *new_view = lv;
2522 80ddbec8 2018-04-29 stsp return err;
2525 4ed7e80c 2018-05-20 stsp static const struct got_error *
2526 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2528 c2db6724 2019-01-04 stsp const struct got_error *error;
2530 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2531 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2532 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2534 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2535 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2537 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2538 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2540 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2541 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2543 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2544 c2db6724 2019-01-04 stsp if (error != NULL)
2545 c2db6724 2019-01-04 stsp return error;
2547 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2548 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2550 c2db6724 2019-01-04 stsp return NULL;
2553 a915003a 2019-02-05 stsp static void
2554 a915003a 2019-02-05 stsp init_curses(void)
2556 a915003a 2019-02-05 stsp initscr();
2558 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2561 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2562 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2563 a915003a 2019-02-05 stsp curs_set(0);
2564 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2565 6d17833f 2019-11-08 stsp start_color();
2566 6d17833f 2019-11-08 stsp use_default_colors();
2568 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2569 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2570 61266923 2020-01-14 stsp signal(SIGCONT, tog_sigcont);
2573 c2db6724 2019-01-04 stsp static const struct got_error *
2574 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2575 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2577 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2579 f135c941 2020-02-20 stsp if (argc == 0) {
2580 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2581 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2582 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2583 f135c941 2020-02-20 stsp return NULL;
2586 f135c941 2020-02-20 stsp if (worktree) {
2587 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2588 f135c941 2020-02-20 stsp char *wt_path, *p;
2590 f135c941 2020-02-20 stsp err = got_worktree_resolve_path(&wt_path, worktree, argv[0]);
2592 f135c941 2020-02-20 stsp return err;
2594 f135c941 2020-02-20 stsp if (asprintf(&p, "%s%s%s", prefix,
2595 f135c941 2020-02-20 stsp (strcmp(prefix, "/") != 0) ? "/" : "", wt_path) == -1) {
2596 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2597 f135c941 2020-02-20 stsp free(wt_path);
2598 f135c941 2020-02-20 stsp return err;
2600 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, p, 0);
2602 f135c941 2020-02-20 stsp free(wt_path);
2604 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, argv[0], 1);
2606 f135c941 2020-02-20 stsp return err;
2609 f135c941 2020-02-20 stsp static const struct got_error *
2610 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2612 80ddbec8 2018-04-29 stsp const struct got_error *error;
2613 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2614 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2615 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2616 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2617 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2618 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2619 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2620 04cc582a 2018-08-01 stsp struct tog_view *view;
2622 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2624 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2625 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2626 c2db6724 2019-01-04 stsp NULL) == -1)
2627 80ddbec8 2018-04-29 stsp err(1, "pledge");
2630 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2631 80ddbec8 2018-04-29 stsp switch (ch) {
2633 b672a97a 2020-01-27 stsp log_branches = 1;
2636 80ddbec8 2018-04-29 stsp start_commit = optarg;
2639 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2640 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2641 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2645 17020d27 2019-03-07 stsp usage_log();
2646 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2650 80ddbec8 2018-04-29 stsp argc -= optind;
2651 80ddbec8 2018-04-29 stsp argv += optind;
2653 f135c941 2020-02-20 stsp if (argc > 1)
2654 f135c941 2020-02-20 stsp usage_log();
2656 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2657 6962eb72 2020-02-20 stsp if (cwd == NULL)
2658 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
2660 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2661 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2662 963f97a1 2019-03-18 stsp goto done;
2664 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2665 a1fbf39a 2019-08-11 stsp if (worktree)
2666 6962eb72 2020-02-20 stsp repo_path =
2667 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2669 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2671 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2672 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2673 963f97a1 2019-03-18 stsp goto done;
2676 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2677 80ddbec8 2018-04-29 stsp if (error != NULL)
2678 ecb28ae0 2018-07-16 stsp goto done;
2680 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2681 f135c941 2020-02-20 stsp repo, worktree);
2682 f135c941 2020-02-20 stsp if (error)
2683 f135c941 2020-02-20 stsp goto done;
2685 f135c941 2020-02-20 stsp init_curses();
2687 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2688 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2689 c02c541e 2019-03-29 stsp if (error)
2690 c02c541e 2019-03-29 stsp goto done;
2692 15a94983 2018-12-23 stsp if (start_commit == NULL)
2693 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, worktree ?
2694 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2695 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2697 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, start_commit,
2698 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2699 80ddbec8 2018-04-29 stsp if (error != NULL)
2700 8b473291 2019-02-21 stsp goto done;
2702 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2703 8b473291 2019-02-21 stsp if (error)
2704 ecb28ae0 2018-07-16 stsp goto done;
2706 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2707 04cc582a 2018-08-01 stsp if (view == NULL) {
2708 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2709 04cc582a 2018-08-01 stsp goto done;
2711 2fc00ff4 2019-08-31 stsp if (worktree) {
2712 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2713 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2714 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2715 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2716 2fc00ff4 2019-08-31 stsp goto done;
2719 2fc00ff4 2019-08-31 stsp error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2720 f135c941 2020-02-20 stsp in_repo_path, log_branches);
2721 ba4f502b 2018-08-04 stsp if (error)
2722 ba4f502b 2018-08-04 stsp goto done;
2723 2fc00ff4 2019-08-31 stsp if (worktree) {
2724 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2725 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2726 2fc00ff4 2019-08-31 stsp worktree = NULL;
2728 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2730 f135c941 2020-02-20 stsp free(in_repo_path);
2731 ecb28ae0 2018-07-16 stsp free(repo_path);
2732 ecb28ae0 2018-07-16 stsp free(cwd);
2733 899d86c2 2018-05-10 stsp free(start_id);
2734 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2736 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2737 ec142235 2019-03-07 stsp if (worktree)
2738 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2739 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2740 80ddbec8 2018-04-29 stsp return error;
2743 4ed7e80c 2018-05-20 stsp __dead static void
2744 9f7d7167 2018-04-29 stsp usage_diff(void)
2747 09b5bff8 2020-02-23 naddy fprintf(stderr, "usage: %s diff [-r repository-path] object1 object2\n",
2748 9f7d7167 2018-04-29 stsp getprogname());
2752 b304db33 2018-05-20 stsp static char *
2753 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2755 b304db33 2018-05-20 stsp char *line;
2756 b304db33 2018-05-20 stsp size_t linelen;
2757 b304db33 2018-05-20 stsp size_t lineno;
2758 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2760 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2762 b304db33 2018-05-20 stsp *len = linelen;
2763 b304db33 2018-05-20 stsp return line;
2766 6d17833f 2019-11-08 stsp static int
2767 6d17833f 2019-11-08 stsp match_line(const char *line, regex_t *regex)
2769 6d17833f 2019-11-08 stsp regmatch_t regmatch;
2771 6d17833f 2019-11-08 stsp return regexec(regex, line, 1, ®match, 0) == 0;
2774 f26dddb7 2019-11-08 stsp struct tog_color *
2775 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
2777 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
2779 6d17833f 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
2780 6d17833f 2019-11-08 stsp if (match_line(line, &tc->regex))
2781 6d17833f 2019-11-08 stsp return tc;
2784 6d17833f 2019-11-08 stsp return NULL;
2787 4ed7e80c 2018-05-20 stsp static const struct got_error *
2788 f44b1f58 2020-02-02 tracey draw_file(struct tog_view *view, FILE *f, int *first_displayed_line, int nlines,
2789 f44b1f58 2020-02-02 tracey int selected_line, int max_lines, int *last_displayed_line, int *eof,
2790 f44b1f58 2020-02-02 tracey char *header, struct tog_colors *colors)
2792 61e69b96 2018-05-20 stsp const struct got_error *err;
2793 f44b1f58 2020-02-02 tracey int lineno = 0, nprinted = 0;
2794 b304db33 2018-05-20 stsp char *line;
2795 f26dddb7 2019-11-08 stsp struct tog_color *tc;
2796 b304db33 2018-05-20 stsp size_t len;
2797 61e69b96 2018-05-20 stsp wchar_t *wline;
2798 e0b650dd 2018-05-20 stsp int width;
2800 26ed57b2 2018-05-19 stsp rewind(f);
2801 f7d12f7e 2018-08-01 stsp werase(view->window);
2803 a3404814 2018-09-02 stsp if (header) {
2804 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
2805 a3404814 2018-09-02 stsp if (err) {
2806 a3404814 2018-09-02 stsp return err;
2809 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2810 a3404814 2018-09-02 stsp wstandout(view->window);
2811 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2812 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2813 a3404814 2018-09-02 stsp wstandend(view->window);
2814 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2815 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2817 a3404814 2018-09-02 stsp if (max_lines <= 1)
2818 a3404814 2018-09-02 stsp return NULL;
2819 a3404814 2018-09-02 stsp max_lines--;
2823 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2824 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2825 26ed57b2 2018-05-19 stsp if (line == NULL) {
2829 f44b1f58 2020-02-02 tracey if (++lineno < *first_displayed_line) {
2830 26ed57b2 2018-05-19 stsp free(line);
2834 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2835 61e69b96 2018-05-20 stsp if (err) {
2836 61e69b96 2018-05-20 stsp free(line);
2837 61e69b96 2018-05-20 stsp return err;
2840 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
2842 f26dddb7 2019-11-08 stsp wattr_on(view->window,
2843 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2844 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2846 6d17833f 2019-11-08 stsp wattr_off(view->window,
2847 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2848 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2849 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2850 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2851 f44b1f58 2020-02-02 tracey *first_displayed_line = lineno;
2852 26ed57b2 2018-05-19 stsp free(line);
2853 2550e4c3 2018-07-13 stsp free(wline);
2854 2550e4c3 2018-07-13 stsp wline = NULL;
2856 f44b1f58 2020-02-02 tracey *last_displayed_line = lineno;
2858 1a57306a 2018-09-02 stsp view_vborder(view);
2860 c3e9aa98 2019-05-13 jcs if (*eof) {
2861 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2862 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2863 c3e9aa98 2019-05-13 jcs nprinted++;
2866 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2868 c3e9aa98 2019-05-13 jcs return err;
2871 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2872 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2873 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2876 26ed57b2 2018-05-19 stsp return NULL;
2879 abd2672a 2018-12-23 stsp static char *
2880 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2882 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2883 09867e48 2019-08-13 stsp char *p, *s;
2885 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2886 09867e48 2019-08-13 stsp if (tm == NULL)
2887 09867e48 2019-08-13 stsp return NULL;
2888 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2889 09867e48 2019-08-13 stsp if (s == NULL)
2890 09867e48 2019-08-13 stsp return NULL;
2891 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2893 abd2672a 2018-12-23 stsp *p = '\0';
2897 4ed7e80c 2018-05-20 stsp static const struct got_error *
2898 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
2899 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
2901 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
2902 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2903 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2904 0208f208 2020-05-05 stsp struct got_object_qid *qid;
2906 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2907 0208f208 2020-05-05 stsp if (qid != NULL) {
2908 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
2909 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
2912 0208f208 2020-05-05 stsp return err;
2914 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
2915 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
2919 0208f208 2020-05-05 stsp if (tree_id1) {
2920 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2922 0208f208 2020-05-05 stsp goto done;
2925 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
2926 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2928 0208f208 2020-05-05 stsp goto done;
2930 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
2931 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
2933 0208f208 2020-05-05 stsp if (tree1)
2934 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
2935 0208f208 2020-05-05 stsp if (tree2)
2936 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
2937 0208f208 2020-05-05 stsp return err;
2940 0208f208 2020-05-05 stsp static const struct got_error *
2941 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2942 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2944 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2945 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
2946 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2947 5943eee2 2019-08-13 stsp char *id_str = NULL, *logmsg = NULL;
2948 45d799e2 2018-12-23 stsp time_t committer_time;
2949 45d799e2 2018-12-23 stsp const char *author, *committer;
2950 8b473291 2019-02-21 stsp char *refs_str = NULL;
2951 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
2952 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
2954 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
2956 8b473291 2019-02-21 stsp if (refs) {
2957 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
2959 8b473291 2019-02-21 stsp return err;
2962 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2964 abd2672a 2018-12-23 stsp return err;
2966 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2967 15a94983 2018-12-23 stsp if (err) {
2968 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2969 15a94983 2018-12-23 stsp goto done;
2972 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2973 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2974 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2975 abd2672a 2018-12-23 stsp goto done;
2977 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2978 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2979 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2980 abd2672a 2018-12-23 stsp goto done;
2982 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2983 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
2984 09867e48 2019-08-13 stsp if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2985 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2986 abd2672a 2018-12-23 stsp goto done;
2988 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2989 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2990 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2991 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2992 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2993 abd2672a 2018-12-23 stsp goto done;
2995 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
2997 5943eee2 2019-08-13 stsp goto done;
2998 5943eee2 2019-08-13 stsp if (fprintf(outfile, "%s\n", logmsg) < 0) {
2999 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3000 abd2672a 2018-12-23 stsp goto done;
3002 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3004 0208f208 2020-05-05 stsp goto done;
3005 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3006 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3007 0208f208 2020-05-05 stsp fprintf(outfile, "%c %s\n", cp->status, pe->path);
3008 0208f208 2020-05-05 stsp free((char *)pe->path);
3009 0208f208 2020-05-05 stsp free(pe->data);
3011 0208f208 2020-05-05 stsp fputc('\n', outfile);
3013 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3014 abd2672a 2018-12-23 stsp free(id_str);
3015 5943eee2 2019-08-13 stsp free(logmsg);
3016 8b473291 2019-02-21 stsp free(refs_str);
3017 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3018 abd2672a 2018-12-23 stsp return err;
3021 f44b1f58 2020-02-02 tracey const struct got_error *
3022 f44b1f58 2020-02-02 tracey get_filestream_info(size_t *filesize, int *nlines, off_t **line_offsets,
3023 f44b1f58 2020-02-02 tracey FILE *infile)
3025 7510f233 2020-08-09 stsp const struct got_error *err = NULL;
3026 ae6a6978 2020-08-09 stsp size_t len, remain;
3027 ae6a6978 2020-08-09 stsp char buf[32768];
3029 ae6a6978 2020-08-09 stsp size_t nalloc = 0;
3030 f44b1f58 2020-02-02 tracey off_t off = 0;
3032 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3033 ae6a6978 2020-08-09 stsp *filesize = 0;
3034 ae6a6978 2020-08-09 stsp *nlines = 0;
3036 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_END) == -1)
3037 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
3038 f44b1f58 2020-02-02 tracey len = ftell(infile) + 1;
3039 f44b1f58 2020-02-02 tracey if (ferror(infile))
3040 f44b1f58 2020-02-02 tracey return got_error_from_errno("ftell");
3041 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_SET) == -1)
3042 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
3044 f44b1f58 2020-02-02 tracey if (len == 0)
3045 f44b1f58 2020-02-02 tracey return NULL;
3047 ae6a6978 2020-08-09 stsp remain = len;
3048 ae6a6978 2020-08-09 stsp while (remain > 0) {
3049 ae6a6978 2020-08-09 stsp size_t r, n = MIN(remain, sizeof(buf));
3050 ae6a6978 2020-08-09 stsp r = fread(buf, 1, n, infile);
3051 ae6a6978 2020-08-09 stsp if (r == 0) {
3052 ae6a6978 2020-08-09 stsp if (ferror(infile)) {
3053 ae6a6978 2020-08-09 stsp err = got_error_from_errno("fread");
3054 ae6a6978 2020-08-09 stsp goto done;
3059 ae6a6978 2020-08-09 stsp remain -= r;
3061 f44b1f58 2020-02-02 tracey if (*line_offsets == NULL) {
3062 f44b1f58 2020-02-02 tracey /* Have some data but perhaps no '\n'. */
3063 ae6a6978 2020-08-09 stsp *nlines = 1;
3064 ae6a6978 2020-08-09 stsp nalloc = len / 40; /* 40-char average line length */
3065 ae6a6978 2020-08-09 stsp *line_offsets = calloc(nalloc, sizeof(**line_offsets));
3066 369eef86 2020-08-09 tracey if (*line_offsets == NULL) {
3067 7510f233 2020-08-09 stsp err = got_error_from_errno("calloc");
3068 7510f233 2020-08-09 stsp goto done;
3070 f44b1f58 2020-02-02 tracey /* Skip forward over end of first line. */
3071 f44b1f58 2020-02-02 tracey while (i < len) {
3072 f44b1f58 2020-02-02 tracey if (buf[i] == '\n')
3078 f44b1f58 2020-02-02 tracey /* Scan '\n' offsets in remaining chunk of data. */
3079 ae6a6978 2020-08-09 stsp while (i < r) {
3080 f44b1f58 2020-02-02 tracey if (buf[i] != '\n') {
3082 f44b1f58 2020-02-02 tracey continue;
3084 f44b1f58 2020-02-02 tracey (*nlines)++;
3085 ae6a6978 2020-08-09 stsp if (nalloc < *nlines) {
3086 ae6a6978 2020-08-09 stsp size_t nallocnew = *nlines + (remain / 40);
3087 f44b1f58 2020-02-02 tracey off_t *o = recallocarray(*line_offsets,
3088 ae6a6978 2020-08-09 stsp nalloc, nallocnew, sizeof(**line_offsets));
3089 f44b1f58 2020-02-02 tracey if (o == NULL) {
3090 7510f233 2020-08-09 stsp err = got_error_from_errno(
3091 f44b1f58 2020-02-02 tracey "recallocarray");
3092 7510f233 2020-08-09 stsp goto done;
3094 f44b1f58 2020-02-02 tracey *line_offsets = o;
3095 ae6a6978 2020-08-09 stsp nalloc = nallocnew;
3097 f44b1f58 2020-02-02 tracey off = i + 1;
3098 f44b1f58 2020-02-02 tracey (*line_offsets)[*nlines - 1] = off;
3103 369eef86 2020-08-09 tracey if (fflush(infile) != 0) {
3104 7510f233 2020-08-09 stsp err = got_error_from_errno("fflush");
3105 7510f233 2020-08-09 stsp goto done;
3107 f44b1f58 2020-02-02 tracey rewind(infile);
3109 ae6a6978 2020-08-09 stsp *filesize = len;
3111 7510f233 2020-08-09 stsp if (err) {
3112 ae6a6978 2020-08-09 stsp free(*line_offsets);
3113 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3114 ae6a6978 2020-08-09 stsp *filesize = 0;
3115 ae6a6978 2020-08-09 stsp *nlines = 0;
3117 f44b1f58 2020-02-02 tracey return NULL;
3120 abd2672a 2018-12-23 stsp static const struct got_error *
3121 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
3123 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
3124 48ae06ee 2018-10-18 stsp FILE *f = NULL;
3125 15a94983 2018-12-23 stsp int obj_type;
3127 511a516b 2018-05-19 stsp f = got_opentemp();
3128 48ae06ee 2018-10-18 stsp if (f == NULL) {
3129 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3130 48ae06ee 2018-10-18 stsp goto done;
3132 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
3133 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3134 fb43ecf1 2019-02-11 stsp goto done;
3138 15a94983 2018-12-23 stsp if (s->id1)
3139 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3141 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3143 15a94983 2018-12-23 stsp goto done;
3145 15a94983 2018-12-23 stsp switch (obj_type) {
3146 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3147 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
3148 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3150 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3151 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
3152 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3154 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3155 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3156 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3157 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3159 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3161 3ffacbe1 2020-02-02 tracey goto done;
3162 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3163 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3164 0208f208 2020-05-05 stsp err = write_commit_info(s->id2, s->refs, s->repo, s->f);
3165 f44b1f58 2020-02-02 tracey if (err)
3166 f44b1f58 2020-02-02 tracey goto done;
3167 f44b1f58 2020-02-02 tracey } else {
3168 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3169 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3170 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
3171 f44b1f58 2020-02-02 tracey err = write_commit_info(s->id2, s->refs,
3172 f44b1f58 2020-02-02 tracey s->repo, s->f);
3173 f44b1f58 2020-02-02 tracey if (err)
3174 f44b1f58 2020-02-02 tracey goto done;
3179 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3181 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
3182 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3186 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3189 f44b1f58 2020-02-02 tracey if (err)
3190 f44b1f58 2020-02-02 tracey goto done;
3191 f44b1f58 2020-02-02 tracey err = get_filestream_info(&s->filesize, &s->nlines, &s->line_offsets,
3194 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3195 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3196 48ae06ee 2018-10-18 stsp return err;
3199 f5215bb9 2019-02-22 stsp static void
3200 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3202 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3203 f5215bb9 2019-02-22 stsp update_panels();
3204 f5215bb9 2019-02-22 stsp doupdate();
3207 f44b1f58 2020-02-02 tracey static const struct got_error *
3208 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3210 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3212 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3213 f44b1f58 2020-02-02 tracey return NULL;
3216 f44b1f58 2020-02-02 tracey static const struct got_error *
3217 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3219 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3220 f44b1f58 2020-02-02 tracey int lineno;
3222 f44b1f58 2020-02-02 tracey if (!view->searching) {
3223 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3224 f44b1f58 2020-02-02 tracey return NULL;
3227 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3228 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3229 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3231 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3232 f44b1f58 2020-02-02 tracey } else {
3233 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3234 f44b1f58 2020-02-02 tracey lineno = 1;
3236 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3239 f44b1f58 2020-02-02 tracey while (1) {
3240 f44b1f58 2020-02-02 tracey char *line = NULL;
3241 f44b1f58 2020-02-02 tracey off_t offset;
3242 f44b1f58 2020-02-02 tracey size_t len;
3244 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3245 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3246 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3247 f44b1f58 2020-02-02 tracey free(line);
3251 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3252 f44b1f58 2020-02-02 tracey lineno = 1;
3254 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3257 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3258 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3259 f44b1f58 2020-02-02 tracey free(line);
3260 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3262 f44b1f58 2020-02-02 tracey free(line);
3263 f44b1f58 2020-02-02 tracey line = parse_next_line(s->f, &len);
3264 f44b1f58 2020-02-02 tracey if (line && match_line(line, &view->regex)) {
3265 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3266 f44b1f58 2020-02-02 tracey s->matched_line = lineno;
3267 f44b1f58 2020-02-02 tracey free(line);
3270 f44b1f58 2020-02-02 tracey free(line);
3271 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3272 f44b1f58 2020-02-02 tracey lineno++;
3274 f44b1f58 2020-02-02 tracey lineno--;
3277 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3278 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3279 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3282 f44b1f58 2020-02-02 tracey return NULL;
3285 48ae06ee 2018-10-18 stsp static const struct got_error *
3286 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3287 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
3288 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
3290 48ae06ee 2018-10-18 stsp const struct got_error *err;
3291 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3293 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3294 15a94983 2018-12-23 stsp int type1, type2;
3295 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3297 15a94983 2018-12-23 stsp return err;
3298 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3300 15a94983 2018-12-23 stsp return err;
3302 15a94983 2018-12-23 stsp if (type1 != type2)
3303 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3305 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3306 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3307 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3308 f44b1f58 2020-02-02 tracey s->repo = repo;
3309 f44b1f58 2020-02-02 tracey s->refs = refs;
3310 f44b1f58 2020-02-02 tracey s->id1 = id1;
3311 f44b1f58 2020-02-02 tracey s->id2 = id2;
3313 15a94983 2018-12-23 stsp if (id1) {
3314 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3315 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3316 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3318 5465d566 2020-02-01 tracey s->id1 = NULL;
3320 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3321 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3322 5465d566 2020-02-01 tracey free(s->id1);
3323 5465d566 2020-02-01 tracey s->id1 = NULL;
3324 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3326 5465d566 2020-02-01 tracey s->f = NULL;
3327 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3328 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3329 5465d566 2020-02-01 tracey s->diff_context = 3;
3330 5465d566 2020-02-01 tracey s->log_view = log_view;
3331 5465d566 2020-02-01 tracey s->repo = repo;
3332 5465d566 2020-02-01 tracey s->refs = refs;
3334 f44b1f58 2020-02-02 tracey SIMPLEQ_INIT(&s->colors);
3335 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3336 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3337 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3338 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3340 6d17833f 2019-11-08 stsp return err;
3341 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
3342 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
3343 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
3344 6d17833f 2019-11-08 stsp if (err) {
3345 5465d566 2020-02-01 tracey free_colors(&s->colors);
3346 6d17833f 2019-11-08 stsp return err;
3348 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3349 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3350 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3351 6d17833f 2019-11-08 stsp if (err) {
3352 5465d566 2020-02-01 tracey free_colors(&s->colors);
3353 6d17833f 2019-11-08 stsp return err;
3356 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3357 528c17dd 2020-07-31 stsp "^(commit [0-9a-f]|(blob|file) [-+] |[MDmA] [^ ])",
3358 0208f208 2020-05-05 stsp TOG_COLOR_DIFF_META,
3359 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3360 6d17833f 2019-11-08 stsp if (err) {
3361 5465d566 2020-02-01 tracey free_colors(&s->colors);
3362 6d17833f 2019-11-08 stsp return err;
3365 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3366 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3367 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3368 11b20872 2019-11-08 stsp if (err) {
3369 5465d566 2020-02-01 tracey free_colors(&s->colors);
3370 11b20872 2019-11-08 stsp return err;
3373 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3374 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3375 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3376 11b20872 2019-11-08 stsp if (err) {
3377 5465d566 2020-02-01 tracey free_colors(&s->colors);
3378 11b20872 2019-11-08 stsp return err;
3382 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3383 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3384 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3386 5465d566 2020-02-01 tracey err = create_diff(s);
3387 48ae06ee 2018-10-18 stsp if (err) {
3388 5465d566 2020-02-01 tracey free(s->id1);
3389 5465d566 2020-02-01 tracey s->id1 = NULL;
3390 5465d566 2020-02-01 tracey free(s->id2);
3391 5465d566 2020-02-01 tracey s->id2 = NULL;
3392 48ae06ee 2018-10-18 stsp return err;
3395 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3396 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3397 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3398 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3399 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3401 5dc9f4bc 2018-08-04 stsp return NULL;
3404 e5a0f69f 2018-08-18 stsp static const struct got_error *
3405 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
3407 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3408 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3410 5465d566 2020-02-01 tracey free(s->id1);
3411 5465d566 2020-02-01 tracey s->id1 = NULL;
3412 5465d566 2020-02-01 tracey free(s->id2);
3413 5465d566 2020-02-01 tracey s->id2 = NULL;
3414 5465d566 2020-02-01 tracey if (s->f && fclose(s->f) == EOF)
3415 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3416 5465d566 2020-02-01 tracey free_colors(&s->colors);
3417 f44b1f58 2020-02-02 tracey free(s->line_offsets);
3418 e5a0f69f 2018-08-18 stsp return err;
3421 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3422 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3424 a3404814 2018-09-02 stsp const struct got_error *err;
3425 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3426 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3428 a3404814 2018-09-02 stsp if (s->id1) {
3429 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3431 a3404814 2018-09-02 stsp return err;
3433 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3435 a3404814 2018-09-02 stsp return err;
3437 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
3438 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3439 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3440 a3404814 2018-09-02 stsp free(id_str1);
3441 a3404814 2018-09-02 stsp free(id_str2);
3442 a3404814 2018-09-02 stsp return err;
3444 a3404814 2018-09-02 stsp free(id_str1);
3445 a3404814 2018-09-02 stsp free(id_str2);
3447 f44b1f58 2020-02-02 tracey return draw_file(view, s->f, &s->first_displayed_line, s->nlines,
3448 f44b1f58 2020-02-02 tracey s->selected_line, view->nlines, &s->last_displayed_line, &s->eof,
3449 bddb1296 2019-11-08 stsp header, &s->colors);
3452 15a087fe 2019-02-21 stsp static const struct got_error *
3453 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3454 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3456 d7a04538 2019-02-21 stsp const struct got_error *err;
3457 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3458 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3459 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3461 15a087fe 2019-02-21 stsp free(s->id2);
3462 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3463 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3464 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3466 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3468 d7a04538 2019-02-21 stsp return err;
3469 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3470 15a087fe 2019-02-21 stsp free(s->id1);
3471 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
3472 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3473 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3474 15a087fe 2019-02-21 stsp return NULL;
3477 0cf4efb1 2018-09-29 stsp static const struct got_error *
3478 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3479 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3481 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3482 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3483 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3484 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
3487 e5a0f69f 2018-08-18 stsp switch (ch) {
3489 1e37a5c2 2019-05-12 jcs case KEY_UP:
3490 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
3491 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3493 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3494 a60a9dc4 2019-05-13 jcs case CTRL('b'):
3495 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
3498 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
3499 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3500 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3503 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3504 1e37a5c2 2019-05-12 jcs if (!s->eof)
3505 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3507 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3508 a60a9dc4 2019-05-13 jcs case CTRL('f'):
3510 00ba99a7 2019-05-12 jcs if (s->eof)
3513 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
3514 1e37a5c2 2019-05-12 jcs char *line;
3515 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
3516 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3517 1e37a5c2 2019-05-12 jcs if (line == NULL)
3522 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
3523 1e37a5c2 2019-05-12 jcs s->diff_context--;
3524 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3525 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3529 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3530 1e37a5c2 2019-05-12 jcs s->diff_context++;
3531 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3532 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3537 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3539 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3540 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
3541 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
3542 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3545 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3550 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3554 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3555 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3557 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3558 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3562 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3564 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3566 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3567 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
3568 7c1452c1 2020-03-26 stsp err = trigger_log_thread(s->log_view, 1,
3569 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
3570 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
3571 7c1452c1 2020-03-26 stsp &ls->thread_args.need_commits,
3572 7c1452c1 2020-03-26 stsp &ls->thread_args.commit_loaded);
3576 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3581 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
3582 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3585 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3589 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3590 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3592 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3593 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3599 bcbd79e2 2018-08-19 stsp return err;
3602 4ed7e80c 2018-05-20 stsp static const struct got_error *
3603 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
3605 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
3606 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
3607 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
3608 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3609 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3610 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
3611 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
3613 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
3615 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3617 26ed57b2 2018-05-19 stsp #ifndef PROFILE
3618 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3619 eb6600df 2019-01-04 stsp NULL) == -1)
3620 26ed57b2 2018-05-19 stsp err(1, "pledge");
3623 09b5bff8 2020-02-23 naddy while ((ch = getopt(argc, argv, "r:")) != -1) {
3624 26ed57b2 2018-05-19 stsp switch (ch) {
3625 09b5bff8 2020-02-23 naddy case 'r':
3626 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
3627 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
3628 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
3632 17020d27 2019-03-07 stsp usage_diff();
3633 26ed57b2 2018-05-19 stsp /* NOTREACHED */
3637 26ed57b2 2018-05-19 stsp argc -= optind;
3638 26ed57b2 2018-05-19 stsp argv += optind;
3640 26ed57b2 2018-05-19 stsp if (argc == 0) {
3641 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
3642 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
3643 15a94983 2018-12-23 stsp id_str1 = argv[0];
3644 15a94983 2018-12-23 stsp id_str2 = argv[1];
3646 26ed57b2 2018-05-19 stsp usage_diff();
3648 a273ac94 2020-02-23 naddy cwd = getcwd(NULL, 0);
3649 a273ac94 2020-02-23 naddy if (cwd == NULL)
3650 a273ac94 2020-02-23 naddy return got_error_from_errno("getcwd");
3652 a273ac94 2020-02-23 naddy error = got_worktree_open(&worktree, cwd);
3653 a273ac94 2020-02-23 naddy if (error && error->code != GOT_ERR_NOT_WORKTREE)
3654 a273ac94 2020-02-23 naddy goto done;
3656 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3657 a273ac94 2020-02-23 naddy if (worktree)
3658 a273ac94 2020-02-23 naddy repo_path =
3659 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
3661 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
3663 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3664 a273ac94 2020-02-23 naddy error = got_error_from_errno("strdup");
3665 a273ac94 2020-02-23 naddy goto done;
3668 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3669 eb6600df 2019-01-04 stsp if (error)
3670 eb6600df 2019-01-04 stsp goto done;
3672 a273ac94 2020-02-23 naddy init_curses();
3674 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3675 26ed57b2 2018-05-19 stsp if (error)
3676 26ed57b2 2018-05-19 stsp goto done;
3678 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
3679 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3680 26ed57b2 2018-05-19 stsp if (error)
3681 26ed57b2 2018-05-19 stsp goto done;
3683 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
3684 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3685 26ed57b2 2018-05-19 stsp if (error)
3686 26ed57b2 2018-05-19 stsp goto done;
3688 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3689 8b473291 2019-02-21 stsp if (error)
3690 8b473291 2019-02-21 stsp goto done;
3692 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3693 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3694 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3695 ea5e7bb5 2018-08-01 stsp goto done;
3697 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3698 5dc9f4bc 2018-08-04 stsp if (error)
3699 5dc9f4bc 2018-08-04 stsp goto done;
3700 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3702 c02c541e 2019-03-29 stsp free(repo_path);
3703 a273ac94 2020-02-23 naddy free(cwd);
3705 921be706 2019-06-28 stsp got_repo_close(repo);
3706 a273ac94 2020-02-23 naddy if (worktree)
3707 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
3708 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3709 26ed57b2 2018-05-19 stsp return error;
3712 4ed7e80c 2018-05-20 stsp __dead static void
3713 9f7d7167 2018-04-29 stsp usage_blame(void)
3716 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3717 9f7d7167 2018-04-29 stsp getprogname());
3721 84451b3e 2018-07-10 stsp struct tog_blame_line {
3722 84451b3e 2018-07-10 stsp int annotated;
3723 84451b3e 2018-07-10 stsp struct got_object_id *id;
3726 4ed7e80c 2018-05-20 stsp static const struct got_error *
3727 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3728 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
3729 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
3730 11b20872 2019-11-08 stsp int *last_displayed_line, int *eof, int max_lines,
3731 11b20872 2019-11-08 stsp struct tog_colors *colors)
3733 84451b3e 2018-07-10 stsp const struct got_error *err;
3734 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3735 84451b3e 2018-07-10 stsp char *line;
3736 84451b3e 2018-07-10 stsp size_t len;
3737 84451b3e 2018-07-10 stsp wchar_t *wline;
3738 27a741e5 2019-09-11 stsp int width;
3739 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3740 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3741 ab089a2a 2018-07-12 stsp char *id_str;
3742 11b20872 2019-11-08 stsp struct tog_color *tc;
3744 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
3746 ab089a2a 2018-07-12 stsp return err;
3748 84451b3e 2018-07-10 stsp rewind(f);
3749 f7d12f7e 2018-08-01 stsp werase(view->window);
3751 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3752 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3753 ab089a2a 2018-07-12 stsp free(id_str);
3754 ab089a2a 2018-07-12 stsp return err;
3757 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3758 ab089a2a 2018-07-12 stsp free(line);
3759 2550e4c3 2018-07-13 stsp line = NULL;
3761 1cae65b4 2019-09-22 stsp return err;
3762 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3763 a3404814 2018-09-02 stsp wstandout(view->window);
3764 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3766 11b20872 2019-11-08 stsp wattr_on(view->window,
3767 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3768 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3770 11b20872 2019-11-08 stsp wattr_off(view->window,
3771 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3772 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3773 a3404814 2018-09-02 stsp wstandend(view->window);
3774 2550e4c3 2018-07-13 stsp free(wline);
3775 2550e4c3 2018-07-13 stsp wline = NULL;
3776 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3777 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3779 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3780 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
3781 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
3782 ab089a2a 2018-07-12 stsp free(id_str);
3783 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3785 ab089a2a 2018-07-12 stsp free(id_str);
3786 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3787 3f60a8ef 2018-07-10 stsp free(line);
3788 2550e4c3 2018-07-13 stsp line = NULL;
3790 3f60a8ef 2018-07-10 stsp return err;
3791 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3792 2550e4c3 2018-07-13 stsp free(wline);
3793 2550e4c3 2018-07-13 stsp wline = NULL;
3794 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3795 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3798 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
3799 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
3800 84451b3e 2018-07-10 stsp if (line == NULL) {
3804 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
3805 84451b3e 2018-07-10 stsp free(line);
3809 27a741e5 2019-09-11 stsp if (view->ncols <= 9) {
3810 27a741e5 2019-09-11 stsp width = 9;
3811 27a741e5 2019-09-11 stsp wline = wcsdup(L"");
3812 27a741e5 2019-09-11 stsp if (wline == NULL)
3813 27a741e5 2019-09-11 stsp err = got_error_from_errno("wcsdup");
3815 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line,
3816 27a741e5 2019-09-11 stsp view->ncols - 9, 9);
3817 27a741e5 2019-09-11 stsp width += 9;
3819 84451b3e 2018-07-10 stsp if (err) {
3820 84451b3e 2018-07-10 stsp free(line);
3821 84451b3e 2018-07-10 stsp return err;
3824 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3825 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3827 8d0fe45a 2019-08-12 stsp if (nlines > 0) {
3828 8d0fe45a 2019-08-12 stsp blame_line = &lines[lineno - 1];
3829 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3830 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3831 27a741e5 2019-09-11 stsp !(view->focussed &&
3832 27a741e5 2019-09-11 stsp nprinted == selected_line - 1)) {
3833 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3834 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3835 8d0fe45a 2019-08-12 stsp char *id_str;
3836 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3837 8d0fe45a 2019-08-12 stsp if (err) {
3838 8d0fe45a 2019-08-12 stsp free(line);
3839 8d0fe45a 2019-08-12 stsp free(wline);
3840 8d0fe45a 2019-08-12 stsp return err;
3842 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3844 11b20872 2019-11-08 stsp wattr_on(view->window,
3845 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3846 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3848 11b20872 2019-11-08 stsp wattr_off(view->window,
3849 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3850 8d0fe45a 2019-08-12 stsp free(id_str);
3851 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3853 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3854 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3857 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3858 ee41ec32 2018-07-10 stsp prev_id = NULL;
3861 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3862 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3863 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3865 27a741e5 2019-09-11 stsp waddwstr(view->window, wline);
3866 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
3867 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
3868 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3869 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3870 84451b3e 2018-07-10 stsp free(line);
3871 2550e4c3 2018-07-13 stsp free(wline);
3872 2550e4c3 2018-07-13 stsp wline = NULL;
3874 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3876 1a57306a 2018-09-02 stsp view_vborder(view);
3878 84451b3e 2018-07-10 stsp return NULL;
3881 84451b3e 2018-07-10 stsp static const struct got_error *
3882 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3884 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3885 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3886 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3887 1a76625f 2018-10-22 stsp int errcode;
3889 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3890 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3891 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3893 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3894 1a76625f 2018-10-22 stsp if (errcode)
3895 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3897 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3898 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3899 d68a0a7d 2018-07-10 stsp goto done;
3902 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3903 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3905 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3906 d68a0a7d 2018-07-10 stsp if (line->annotated)
3907 d68a0a7d 2018-07-10 stsp goto done;
3909 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3910 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3911 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3912 84451b3e 2018-07-10 stsp goto done;
3914 84451b3e 2018-07-10 stsp line->annotated = 1;
3916 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3917 1a76625f 2018-10-22 stsp if (errcode)
3918 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3919 84451b3e 2018-07-10 stsp return err;
3922 84451b3e 2018-07-10 stsp static void *
3923 84451b3e 2018-07-10 stsp blame_thread(void *arg)
3925 18430de3 2018-07-10 stsp const struct got_error *err;
3926 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
3927 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
3928 1a76625f 2018-10-22 stsp int errcode;
3930 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
3932 61266923 2020-01-14 stsp return (void *)err;
3934 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
3935 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3936 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
3937 fc06ba56 2019-08-22 stsp err = NULL;
3939 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3940 1a76625f 2018-10-22 stsp if (errcode)
3941 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
3942 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3944 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
3945 c9beca56 2018-07-22 stsp ta->repo = NULL;
3946 c9beca56 2018-07-22 stsp *ta->complete = 1;
3948 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3949 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
3950 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3952 18430de3 2018-07-10 stsp return (void *)err;
3955 245d91c1 2018-07-12 stsp static struct got_object_id *
3956 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3957 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
3959 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
3961 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
3962 8d0fe45a 2019-08-12 stsp return NULL;
3964 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
3965 245d91c1 2018-07-12 stsp if (!line->annotated)
3966 245d91c1 2018-07-12 stsp return NULL;
3968 245d91c1 2018-07-12 stsp return line->id;
3971 b880a918 2018-07-10 stsp static const struct got_error *
3972 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
3974 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
3977 245d91c1 2018-07-12 stsp if (blame->thread) {
3978 1a76625f 2018-10-22 stsp int errcode;
3979 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3980 1a76625f 2018-10-22 stsp if (errcode)
3981 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3982 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
3983 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
3984 1a76625f 2018-10-22 stsp if (errcode)
3985 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
3986 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3987 1a76625f 2018-10-22 stsp if (errcode)
3988 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3989 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3990 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
3991 245d91c1 2018-07-12 stsp err = NULL;
3992 245d91c1 2018-07-12 stsp blame->thread = NULL;
3994 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
3995 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
3996 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
3998 245d91c1 2018-07-12 stsp if (blame->f) {
3999 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
4000 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4001 245d91c1 2018-07-12 stsp blame->f = NULL;
4003 57670559 2018-12-23 stsp if (blame->lines) {
4004 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
4005 57670559 2018-12-23 stsp free(blame->lines[i].id);
4006 57670559 2018-12-23 stsp free(blame->lines);
4007 57670559 2018-12-23 stsp blame->lines = NULL;
4009 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
4010 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
4012 245d91c1 2018-07-12 stsp return err;
4015 245d91c1 2018-07-12 stsp static const struct got_error *
4016 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
4018 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
4019 fc06ba56 2019-08-22 stsp int *done = arg;
4020 fc06ba56 2019-08-22 stsp int errcode;
4022 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4023 fc06ba56 2019-08-22 stsp if (errcode)
4024 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4025 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
4027 fc06ba56 2019-08-22 stsp if (*done)
4028 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
4030 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4031 fc06ba56 2019-08-22 stsp if (errcode)
4032 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4033 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
4035 fc06ba56 2019-08-22 stsp return err;
4038 fc06ba56 2019-08-22 stsp static const struct got_error *
4039 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
4040 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
4041 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
4042 245d91c1 2018-07-12 stsp struct got_repository *repo)
4044 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
4045 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
4046 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
4047 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
4048 15a94983 2018-12-23 stsp int obj_type;
4050 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
4052 15a94983 2018-12-23 stsp return err;
4054 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
4056 84451b3e 2018-07-10 stsp goto done;
4058 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4059 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
4060 84451b3e 2018-07-10 stsp goto done;
4063 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4065 a70480e0 2018-06-23 stsp goto done;
4066 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
4067 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
4068 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
4069 84451b3e 2018-07-10 stsp goto done;
4071 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4072 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
4073 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
4074 84451b3e 2018-07-10 stsp goto done;
4076 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4077 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4078 b02560ec 2019-08-19 stsp blame->nlines--;
4080 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4081 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
4082 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4083 84451b3e 2018-07-10 stsp goto done;
4086 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
4088 bd24772e 2018-07-11 stsp goto done;
4090 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
4091 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
4092 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
4093 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
4094 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
4095 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4096 245d91c1 2018-07-12 stsp goto done;
4098 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
4100 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
4101 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
4102 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
4103 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
4104 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
4105 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_arg = done;
4106 245d91c1 2018-07-12 stsp *blame_complete = 0;
4110 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
4111 27d434c2 2018-09-15 stsp free(obj_id);
4113 245d91c1 2018-07-12 stsp stop_blame(blame);
4114 245d91c1 2018-07-12 stsp return err;
4117 245d91c1 2018-07-12 stsp static const struct got_error *
4118 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
4119 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4120 8b473291 2019-02-21 stsp struct got_repository *repo)
4122 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
4123 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4125 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
4127 c4843652 2019-08-12 stsp s->path = strdup(path);
4128 c4843652 2019-08-12 stsp if (s->path == NULL)
4129 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4131 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4132 c4843652 2019-08-12 stsp if (err) {
4133 c4843652 2019-08-12 stsp free(s->path);
4134 7cbe629d 2018-08-04 stsp return err;
4137 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4138 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4139 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4140 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4141 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4142 fb2756b9 2018-08-04 stsp s->repo = repo;
4143 8b473291 2019-02-21 stsp s->refs = refs;
4144 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4145 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4147 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4148 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4149 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4150 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4152 11b20872 2019-11-08 stsp return err;
4155 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4156 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4157 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4158 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4159 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4161 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
4162 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
4163 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
4164 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
4167 e5a0f69f 2018-08-18 stsp static const struct got_error *
4168 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4170 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4171 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4173 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4174 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4176 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4177 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4178 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4179 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4180 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4183 e5a0f69f 2018-08-18 stsp free(s->path);
4184 11b20872 2019-11-08 stsp free_colors(&s->colors);
4186 e5a0f69f 2018-08-18 stsp return err;
4189 7cbe629d 2018-08-04 stsp static const struct got_error *
4190 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4192 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4194 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4195 6c4c42e0 2019-06-24 stsp return NULL;
4198 6c4c42e0 2019-06-24 stsp static const struct got_error *
4199 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4201 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4202 6c4c42e0 2019-06-24 stsp int lineno;
4204 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4205 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4206 6c4c42e0 2019-06-24 stsp return NULL;
4209 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4210 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4211 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4213 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4215 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4216 6c4c42e0 2019-06-24 stsp lineno = 1;
4218 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4221 6c4c42e0 2019-06-24 stsp while (1) {
4222 6c4c42e0 2019-06-24 stsp char *line = NULL;
4223 6c4c42e0 2019-06-24 stsp off_t offset;
4224 6c4c42e0 2019-06-24 stsp size_t len;
4226 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4227 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4228 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4229 6c4c42e0 2019-06-24 stsp free(line);
4233 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4234 6c4c42e0 2019-06-24 stsp lineno = 1;
4236 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4239 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4240 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4241 6c4c42e0 2019-06-24 stsp free(line);
4242 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4244 6c4c42e0 2019-06-24 stsp free(line);
4245 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
4246 2246482e 2019-06-25 stsp if (line && match_line(line, &view->regex)) {
4247 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4248 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
4249 6c4c42e0 2019-06-24 stsp free(line);
4252 6c4c42e0 2019-06-24 stsp free(line);
4253 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4259 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4260 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4261 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4264 6c4c42e0 2019-06-24 stsp return NULL;
4267 6c4c42e0 2019-06-24 stsp static const struct got_error *
4268 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4270 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4271 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4272 2b380cc8 2018-10-24 stsp int errcode;
4274 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
4275 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4276 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4277 2b380cc8 2018-10-24 stsp if (errcode)
4278 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4280 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4283 51fe7530 2019-08-19 stsp if (s->blame_complete)
4284 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4286 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
4287 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
4288 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
4289 11b20872 2019-11-08 stsp &s->last_displayed_line, &s->eof, view->nlines, &s->colors);
4291 669b5ffa 2018-10-07 stsp view_vborder(view);
4292 e5a0f69f 2018-08-18 stsp return err;
4295 e5a0f69f 2018-08-18 stsp static const struct got_error *
4296 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
4297 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4299 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4300 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4301 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4302 669b5ffa 2018-10-07 stsp int begin_x = 0;
4304 e5a0f69f 2018-08-18 stsp switch (ch) {
4306 1e37a5c2 2019-05-12 jcs s->done = 1;
4309 1e37a5c2 2019-05-12 jcs case KEY_UP:
4310 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4311 1e37a5c2 2019-05-12 jcs s->selected_line--;
4312 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4313 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4314 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4316 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4317 ea025d1d 2020-02-22 naddy case CTRL('b'):
4318 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4319 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
4322 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
4323 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
4324 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
4326 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4329 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4330 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4331 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4332 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4333 1e37a5c2 2019-05-12 jcs s->selected_line++;
4334 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
4335 1e37a5c2 2019-05-12 jcs s->blame.nlines)
4336 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4339 1e37a5c2 2019-05-12 jcs case 'p': {
4340 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4341 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4342 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4343 1e37a5c2 2019-05-12 jcs if (id == NULL)
4345 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
4346 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
4347 15a94983 2018-12-23 stsp struct got_object_qid *pid;
4348 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
4349 1e37a5c2 2019-05-12 jcs int obj_type;
4350 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
4351 1e37a5c2 2019-05-12 jcs s->repo, id);
4354 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
4355 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
4356 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
4357 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4360 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
4361 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
4362 1e37a5c2 2019-05-12 jcs pid->id, s->path);
4363 e5a0f69f 2018-08-18 stsp if (err) {
4364 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
4365 1e37a5c2 2019-05-12 jcs err = NULL;
4366 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4369 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
4371 1e37a5c2 2019-05-12 jcs free(blob_id);
4372 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
4373 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
4374 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4377 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4379 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4381 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
4382 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
4384 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4389 1e37a5c2 2019-05-12 jcs s->done = 1;
4390 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4391 1e37a5c2 2019-05-12 jcs s->done = 0;
4392 1e37a5c2 2019-05-12 jcs if (thread_err)
4394 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4395 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
4396 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4397 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4398 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
4399 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
4404 1e37a5c2 2019-05-12 jcs case 'B': {
4405 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
4406 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
4407 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
4409 1e37a5c2 2019-05-12 jcs s->done = 1;
4410 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4411 1e37a5c2 2019-05-12 jcs s->done = 0;
4412 1e37a5c2 2019-05-12 jcs if (thread_err)
4414 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4415 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
4416 1e37a5c2 2019-05-12 jcs s->blamed_commit =
4417 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
4418 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4419 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4420 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
4421 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
4426 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4427 1e37a5c2 2019-05-12 jcs case '\r': {
4428 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4429 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
4430 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
4431 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4432 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4433 1e37a5c2 2019-05-12 jcs if (id == NULL)
4435 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
4438 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
4439 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
4440 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4441 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4442 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4443 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
4444 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4445 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
4448 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
4449 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
4450 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4452 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4455 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4456 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4459 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
4461 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4464 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
4465 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4467 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
4472 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4473 ea025d1d 2020-02-22 naddy case CTRL('f'):
4475 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4476 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
4477 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
4480 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4481 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
4482 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4483 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4486 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
4487 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
4488 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
4489 1e37a5c2 2019-05-12 jcs view->nlines - 2;
4491 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
4492 1e37a5c2 2019-05-12 jcs s->blame.nlines -
4493 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
4495 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4496 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
4497 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4498 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4504 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
4507 a70480e0 2018-06-23 stsp static const struct got_error *
4508 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
4510 a70480e0 2018-06-23 stsp const struct got_error *error;
4511 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
4512 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4513 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
4514 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4515 0587e10c 2020-07-23 stsp char *link_target = NULL;
4516 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4517 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
4519 e1cd8fed 2018-08-01 stsp struct tog_view *view;
4521 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4523 a70480e0 2018-06-23 stsp #ifndef PROFILE
4524 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4525 8e94dd5b 2019-01-04 stsp NULL) == -1)
4526 a70480e0 2018-06-23 stsp err(1, "pledge");
4529 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4530 a70480e0 2018-06-23 stsp switch (ch) {
4532 a70480e0 2018-06-23 stsp commit_id_str = optarg;
4535 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4536 69069811 2018-08-02 stsp if (repo_path == NULL)
4537 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4541 17020d27 2019-03-07 stsp usage_blame();
4542 a70480e0 2018-06-23 stsp /* NOTREACHED */
4546 a70480e0 2018-06-23 stsp argc -= optind;
4547 a70480e0 2018-06-23 stsp argv += optind;
4549 f135c941 2020-02-20 stsp if (argc != 1)
4550 a70480e0 2018-06-23 stsp usage_blame();
4552 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
4553 6962eb72 2020-02-20 stsp if (cwd == NULL)
4554 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
4556 f135c941 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
4557 f135c941 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4558 f135c941 2020-02-20 stsp goto done;
4560 69069811 2018-08-02 stsp if (repo_path == NULL) {
4561 f135c941 2020-02-20 stsp if (worktree)
4562 eb41ed75 2019-02-05 stsp repo_path =
4563 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4565 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
4567 f135c941 2020-02-20 stsp if (repo_path == NULL) {
4568 f135c941 2020-02-20 stsp error = got_error_from_errno("strdup");
4569 f135c941 2020-02-20 stsp goto done;
4572 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4573 c02c541e 2019-03-29 stsp if (error != NULL)
4574 8e94dd5b 2019-01-04 stsp goto done;
4576 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4577 f135c941 2020-02-20 stsp worktree);
4578 c02c541e 2019-03-29 stsp if (error)
4579 92205607 2019-01-04 stsp goto done;
4581 f135c941 2020-02-20 stsp init_curses();
4583 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4584 eb41ed75 2019-02-05 stsp if (error)
4585 69069811 2018-08-02 stsp goto done;
4587 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
4588 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
4589 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4590 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4591 a70480e0 2018-06-23 stsp if (error != NULL)
4592 66b4983c 2018-06-23 stsp goto done;
4593 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4594 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
4596 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4597 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4599 a19e88aa 2018-06-23 stsp if (error != NULL)
4600 8b473291 2019-02-21 stsp goto done;
4602 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4603 8b473291 2019-02-21 stsp if (error)
4604 a19e88aa 2018-06-23 stsp goto done;
4606 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4607 e1cd8fed 2018-08-01 stsp if (view == NULL) {
4608 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4609 e1cd8fed 2018-08-01 stsp goto done;
4612 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4613 0587e10c 2020-07-23 stsp commit_id, repo);
4614 7cbe629d 2018-08-04 stsp if (error)
4615 7cbe629d 2018-08-04 stsp goto done;
4617 0587e10c 2020-07-23 stsp error = open_blame_view(view, link_target ? link_target : in_repo_path,
4618 0587e10c 2020-07-23 stsp commit_id, &refs, repo);
4619 0587e10c 2020-07-23 stsp if (error)
4620 0587e10c 2020-07-23 stsp goto done;
4621 12314ad4 2019-08-31 stsp if (worktree) {
4622 12314ad4 2019-08-31 stsp /* Release work tree lock. */
4623 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
4624 12314ad4 2019-08-31 stsp worktree = NULL;
4626 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4628 69069811 2018-08-02 stsp free(repo_path);
4629 f135c941 2020-02-20 stsp free(in_repo_path);
4630 0587e10c 2020-07-23 stsp free(link_target);
4631 69069811 2018-08-02 stsp free(cwd);
4632 a70480e0 2018-06-23 stsp free(commit_id);
4633 eb41ed75 2019-02-05 stsp if (worktree)
4634 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
4636 a70480e0 2018-06-23 stsp got_repo_close(repo);
4637 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4638 a70480e0 2018-06-23 stsp return error;
4641 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4642 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
4643 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
4644 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
4645 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
4646 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
4647 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int selected, int limit,
4648 0d6c6ee3 2020-05-20 stsp int isroot, struct tog_colors *colors, struct got_repository *repo)
4650 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4651 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
4652 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
4653 f26dddb7 2019-11-08 stsp struct tog_color *tc;
4654 56e0773d 2019-11-28 stsp int width, n, i, nentries;
4656 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
4658 f7d12f7e 2018-08-01 stsp werase(view->window);
4660 ffd1d5e5 2018-06-23 stsp if (limit == 0)
4661 ffd1d5e5 2018-06-23 stsp return NULL;
4663 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, label, view->ncols, 0);
4665 ffd1d5e5 2018-06-23 stsp return err;
4666 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4667 a3404814 2018-09-02 stsp wstandout(view->window);
4668 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
4670 11b20872 2019-11-08 stsp wattr_on(view->window,
4671 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4672 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4674 11b20872 2019-11-08 stsp wattr_off(view->window,
4675 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4676 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4677 a3404814 2018-09-02 stsp wstandend(view->window);
4678 2550e4c3 2018-07-13 stsp free(wline);
4679 2550e4c3 2018-07-13 stsp wline = NULL;
4680 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4681 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4682 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4683 ffd1d5e5 2018-06-23 stsp return NULL;
4684 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
4686 ce52c690 2018-06-23 stsp return err;
4687 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4688 2550e4c3 2018-07-13 stsp free(wline);
4689 2550e4c3 2018-07-13 stsp wline = NULL;
4690 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4691 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4692 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4693 ffd1d5e5 2018-06-23 stsp return NULL;
4694 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4695 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
4696 a1eca9bb 2018-06-23 stsp return NULL;
4698 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
4699 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(tree);
4700 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
4701 0cf4efb1 2018-09-29 stsp if (view->focussed)
4702 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4703 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
4705 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4706 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
4707 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4708 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4709 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4710 ffd1d5e5 2018-06-23 stsp return NULL;
4714 56e0773d 2019-11-28 stsp te = *first_displayed_entry;
4717 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4718 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4719 0d6c6ee3 2020-05-20 stsp char *line = NULL, *id_str = NULL, *link_target = NULL;
4720 848d6979 2019-08-12 stsp const char *modestr = "";
4721 56e0773d 2019-11-28 stsp mode_t mode;
4723 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4724 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
4726 1d13200f 2018-07-12 stsp if (show_ids) {
4727 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4728 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4730 638f9024 2019-05-13 stsp return got_error_from_errno(
4731 230a42bd 2019-05-11 jcs "got_object_id_str");
4733 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4734 63c5ca5d 2019-08-24 stsp modestr = "$";
4735 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4738 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target,
4739 0d6c6ee3 2020-05-20 stsp te, repo);
4740 0d6c6ee3 2020-05-20 stsp if (err) {
4741 0d6c6ee3 2020-05-20 stsp free(id_str);
4742 0d6c6ee3 2020-05-20 stsp return err;
4744 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4745 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4746 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4748 848d6979 2019-08-12 stsp modestr = "@";
4750 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4751 848d6979 2019-08-12 stsp modestr = "/";
4752 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4753 848d6979 2019-08-12 stsp modestr = "*";
4754 0d6c6ee3 2020-05-20 stsp if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
4755 0d6c6ee3 2020-05-20 stsp got_tree_entry_get_name(te), modestr,
4756 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "",
4757 0d6c6ee3 2020-05-20 stsp link_target ? link_target : "") == -1) {
4758 1d13200f 2018-07-12 stsp free(id_str);
4759 0d6c6ee3 2020-05-20 stsp free(link_target);
4760 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4762 1d13200f 2018-07-12 stsp free(id_str);
4763 0d6c6ee3 2020-05-20 stsp free(link_target);
4764 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4765 ffd1d5e5 2018-06-23 stsp if (err) {
4766 ffd1d5e5 2018-06-23 stsp free(line);
4769 ffd1d5e5 2018-06-23 stsp if (n == selected) {
4770 0cf4efb1 2018-09-29 stsp if (view->focussed)
4771 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4772 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
4774 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
4776 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
4777 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4778 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4780 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
4781 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4782 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4783 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4784 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
4785 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4786 ffd1d5e5 2018-06-23 stsp free(line);
4787 2550e4c3 2018-07-13 stsp free(wline);
4788 2550e4c3 2018-07-13 stsp wline = NULL;
4790 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4791 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
4792 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4796 ffd1d5e5 2018-06-23 stsp return err;
4799 ffd1d5e5 2018-06-23 stsp static void
4800 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
4801 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
4802 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int isroot)
4804 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4807 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
4810 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, 0);
4811 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
4812 ffd1d5e5 2018-06-23 stsp if (!isroot)
4813 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4818 56e0773d 2019-11-28 stsp while (*first_displayed_entry && i < maxscroll) {
4819 56e0773d 2019-11-28 stsp *first_displayed_entry = got_tree_entry_get_prev(tree,
4820 56e0773d 2019-11-28 stsp *first_displayed_entry);
4823 56e0773d 2019-11-28 stsp if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4824 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4827 768394f3 2019-01-24 stsp static int
4828 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4829 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
4830 56e0773d 2019-11-28 stsp struct got_tree_object *tree)
4832 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4833 ffd1d5e5 2018-06-23 stsp int n = 0;
4835 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
4836 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, *first_displayed_entry);
4838 56e0773d 2019-11-28 stsp next = got_object_tree_get_first_entry(tree);
4840 768394f3 2019-01-24 stsp last = last_displayed_entry;
4841 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4842 56e0773d 2019-11-28 stsp last = got_tree_entry_get_next(tree, last);
4843 768394f3 2019-01-24 stsp if (last) {
4844 768394f3 2019-01-24 stsp *first_displayed_entry = next;
4845 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, next);
4851 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4852 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4853 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4855 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4856 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4857 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4859 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4860 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
4861 56e0773d 2019-11-28 stsp + 1 /* slash */;
4863 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
4865 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4866 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4867 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4869 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4870 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4871 d9765a41 2018-06-23 stsp while (pt) {
4872 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
4873 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
4874 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4875 cb2ebc8a 2018-06-23 stsp goto done;
4877 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4878 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4879 cb2ebc8a 2018-06-23 stsp goto done;
4881 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4884 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4885 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4886 ce52c690 2018-06-23 stsp goto done;
4890 ce52c690 2018-06-23 stsp if (err) {
4891 ce52c690 2018-06-23 stsp free(*path);
4892 ce52c690 2018-06-23 stsp *path = NULL;
4894 ce52c690 2018-06-23 stsp return err;
4897 ce52c690 2018-06-23 stsp static const struct got_error *
4898 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4899 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4900 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4901 8b473291 2019-02-21 stsp struct got_repository *repo)
4903 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
4904 ce52c690 2018-06-23 stsp char *path;
4905 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
4907 a0de39f3 2019-08-09 stsp *new_view = NULL;
4909 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
4911 ce52c690 2018-06-23 stsp return err;
4913 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4914 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
4915 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
4916 83ce39e3 2019-08-12 stsp goto done;
4919 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
4920 e5a0f69f 2018-08-18 stsp if (err) {
4921 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
4922 fc06ba56 2019-08-22 stsp err = NULL;
4923 e5a0f69f 2018-08-18 stsp view_close(blame_view);
4925 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
4927 83ce39e3 2019-08-12 stsp free(path);
4928 69efd4c4 2018-07-18 stsp return err;
4931 69efd4c4 2018-07-18 stsp static const struct got_error *
4932 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
4933 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4934 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4935 8b473291 2019-02-21 stsp struct got_repository *repo)
4937 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
4938 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
4939 69efd4c4 2018-07-18 stsp char *path;
4941 a0de39f3 2019-08-09 stsp *new_view = NULL;
4943 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4944 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
4945 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
4947 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
4949 69efd4c4 2018-07-18 stsp return err;
4951 f135c941 2020-02-20 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4953 e5a0f69f 2018-08-18 stsp view_close(log_view);
4955 e5a0f69f 2018-08-18 stsp *new_view = log_view;
4956 cb2ebc8a 2018-06-23 stsp free(path);
4957 cb2ebc8a 2018-06-23 stsp return err;
4960 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4961 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
4962 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4963 8b473291 2019-02-21 stsp struct got_repository *repo)
4965 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4966 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
4967 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4969 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
4971 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
4972 ffd1d5e5 2018-06-23 stsp if (err != NULL)
4973 ffd1d5e5 2018-06-23 stsp goto done;
4975 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4976 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4977 ffd1d5e5 2018-06-23 stsp goto done;
4980 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
4981 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
4982 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
4983 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
4984 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
4985 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4986 6484ec90 2018-09-29 stsp goto done;
4988 8b473291 2019-02-21 stsp s->refs = refs;
4989 fb2756b9 2018-08-04 stsp s->repo = repo;
4991 bddb1296 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4993 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4994 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
4995 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
4996 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
4998 c0b01bdb 2019-11-08 stsp goto done;
4999 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5000 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
5001 c0b01bdb 2019-11-08 stsp if (err) {
5002 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5003 c0b01bdb 2019-11-08 stsp goto done;
5005 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
5006 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
5007 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5008 c0b01bdb 2019-11-08 stsp if (err) {
5009 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5010 c0b01bdb 2019-11-08 stsp goto done;
5013 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
5014 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
5015 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5016 11b20872 2019-11-08 stsp if (err) {
5017 11b20872 2019-11-08 stsp free_colors(&s->colors);
5018 11b20872 2019-11-08 stsp goto done;
5021 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5022 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
5023 c0b01bdb 2019-11-08 stsp if (err) {
5024 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5025 c0b01bdb 2019-11-08 stsp goto done;
5029 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
5030 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
5031 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
5032 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
5033 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
5035 ad80ab7b 2018-08-04 stsp free(commit_id_str);
5036 6484ec90 2018-09-29 stsp if (err) {
5037 fb2756b9 2018-08-04 stsp free(s->tree_label);
5038 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5040 ad80ab7b 2018-08-04 stsp return err;
5043 e5a0f69f 2018-08-18 stsp static const struct got_error *
5044 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
5046 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5048 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5049 fb2756b9 2018-08-04 stsp free(s->tree_label);
5050 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5051 6484ec90 2018-09-29 stsp free(s->commit_id);
5052 6484ec90 2018-09-29 stsp s->commit_id = NULL;
5053 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
5054 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
5055 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
5056 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
5057 ad80ab7b 2018-08-04 stsp free(parent);
5060 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
5061 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
5062 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
5064 7c32bd05 2019-06-22 stsp return NULL;
5067 7c32bd05 2019-06-22 stsp static const struct got_error *
5068 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
5070 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5072 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
5073 7c32bd05 2019-06-22 stsp return NULL;
5076 7c32bd05 2019-06-22 stsp static int
5077 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5079 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
5081 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5085 7c32bd05 2019-06-22 stsp static const struct got_error *
5086 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
5088 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5089 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
5091 7c32bd05 2019-06-22 stsp if (!view->searching) {
5092 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5093 7c32bd05 2019-06-22 stsp return NULL;
5096 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5097 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5098 7c32bd05 2019-06-22 stsp if (s->selected_entry)
5099 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
5100 56e0773d 2019-11-28 stsp s->selected_entry);
5102 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5104 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
5105 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5107 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
5108 56e0773d 2019-11-28 stsp s->selected_entry);
5111 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5112 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5114 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5117 7c32bd05 2019-06-22 stsp while (1) {
5118 56e0773d 2019-11-28 stsp if (te == NULL) {
5119 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
5120 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5121 ac66afb8 2019-06-24 stsp return NULL;
5123 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5124 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5126 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5129 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
5130 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5131 56e0773d 2019-11-28 stsp s->matched_entry = te;
5135 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5136 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5138 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
5141 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5142 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
5143 7c32bd05 2019-06-22 stsp s->selected = 0;
5146 e5a0f69f 2018-08-18 stsp return NULL;
5149 ad80ab7b 2018-08-04 stsp static const struct got_error *
5150 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
5152 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
5153 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5154 e5a0f69f 2018-08-18 stsp char *parent_path;
5156 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5158 e5a0f69f 2018-08-18 stsp return err;
5160 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
5161 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
5162 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
5163 56e0773d 2019-11-28 stsp s->tree, s->selected, view->nlines, s->tree == s->root,
5164 0d6c6ee3 2020-05-20 stsp &s->colors, s->repo);
5165 e5a0f69f 2018-08-18 stsp free(parent_path);
5167 669b5ffa 2018-10-07 stsp view_vborder(view);
5168 e5a0f69f 2018-08-18 stsp return err;
5171 e5a0f69f 2018-08-18 stsp static const struct got_error *
5172 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
5173 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
5175 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5176 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
5177 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
5178 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
5180 e5a0f69f 2018-08-18 stsp switch (ch) {
5182 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
5185 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
5187 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5188 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5189 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
5190 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
5191 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
5192 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5193 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5195 1e37a5c2 2019-05-12 jcs return err;
5196 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
5198 1e37a5c2 2019-05-12 jcs view_close(log_view);
5201 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
5202 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
5204 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5207 1e37a5c2 2019-05-12 jcs case KEY_UP:
5208 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5209 1e37a5c2 2019-05-12 jcs s->selected--;
5210 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
5213 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
5215 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
5216 56e0773d 2019-11-28 stsp s->tree, s->tree == s->root);
5218 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5219 ea025d1d 2020-02-22 naddy case CTRL('b'):
5220 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
5221 56e0773d 2019-11-28 stsp MAX(0, view->nlines - 4 - s->selected), s->tree,
5222 1e37a5c2 2019-05-12 jcs s->tree == s->root);
5223 1e37a5c2 2019-05-12 jcs s->selected = 0;
5224 56e0773d 2019-11-28 stsp if (got_object_tree_get_first_entry(s->tree) ==
5225 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
5226 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
5229 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5230 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5231 1e37a5c2 2019-05-12 jcs s->selected++;
5234 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5236 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5238 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
5239 56e0773d 2019-11-28 stsp s->last_displayed_entry, s->tree);
5241 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5242 ea025d1d 2020-02-22 naddy case CTRL('f'):
5243 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5245 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5246 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5247 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5250 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
5251 56e0773d 2019-11-28 stsp view->nlines, s->last_displayed_entry, s->tree);
5252 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
5253 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
5254 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
5255 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
5257 1e37a5c2 2019-05-12 jcs ndisplayed++;
5258 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5259 1e37a5c2 2019-05-12 jcs } while (te);
5260 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
5263 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5265 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5266 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5267 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5268 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5269 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5271 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5272 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5274 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5275 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5276 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5277 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
5278 1e37a5c2 2019-05-12 jcs s->selected_entry =
5279 1e37a5c2 2019-05-12 jcs parent->selected_entry;
5280 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
5281 1e37a5c2 2019-05-12 jcs free(parent);
5282 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
5283 56e0773d 2019-11-28 stsp s->selected_entry))) {
5284 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
5285 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
5286 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
5289 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
5290 941e9f74 2019-05-21 stsp if (err) {
5291 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
5294 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
5295 56e0773d 2019-11-28 stsp s->selected_entry))) {
5296 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
5297 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
5298 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
5300 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
5301 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
5302 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
5305 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
5306 669b5ffa 2018-10-07 stsp err = view_close_child(view);
5308 669b5ffa 2018-10-07 stsp return err;
5309 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
5310 669b5ffa 2018-10-07 stsp if (err) {
5311 1e37a5c2 2019-05-12 jcs view_close(blame_view);
5314 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
5315 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
5317 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
5320 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5321 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
5322 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5328 ffd1d5e5 2018-06-23 stsp return err;
5331 ffd1d5e5 2018-06-23 stsp __dead static void
5332 ffd1d5e5 2018-06-23 stsp usage_tree(void)
5335 55cccc34 2020-02-20 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5336 ffd1d5e5 2018-06-23 stsp getprogname());
5340 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5341 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
5343 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
5344 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
5345 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
5346 8b473291 2019-02-21 stsp struct got_reflist_head refs;
5347 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5348 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5349 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
5350 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
5351 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
5353 5221c383 2018-08-01 stsp struct tog_view *view;
5355 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
5357 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
5358 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
5359 d188b9a6 2019-01-04 stsp NULL) == -1)
5360 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
5363 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5364 ffd1d5e5 2018-06-23 stsp switch (ch) {
5366 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
5369 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
5370 74283ab8 2020-02-07 stsp if (repo_path == NULL)
5371 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
5375 17020d27 2019-03-07 stsp usage_tree();
5376 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
5380 ffd1d5e5 2018-06-23 stsp argc -= optind;
5381 ffd1d5e5 2018-06-23 stsp argv += optind;
5383 55cccc34 2020-02-20 stsp if (argc > 1)
5384 74283ab8 2020-02-07 stsp usage_tree();
5386 55cccc34 2020-02-20 stsp cwd = getcwd(NULL, 0);
5387 55cccc34 2020-02-20 stsp if (cwd == NULL)
5388 55cccc34 2020-02-20 stsp return got_error_from_errno("getcwd");
5390 55cccc34 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
5391 55cccc34 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5392 55cccc34 2020-02-20 stsp goto done;
5394 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
5395 55cccc34 2020-02-20 stsp if (worktree)
5396 52185f70 2019-02-05 stsp repo_path =
5397 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5399 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
5401 55cccc34 2020-02-20 stsp if (repo_path == NULL) {
5402 55cccc34 2020-02-20 stsp error = got_error_from_errno("strdup");
5403 55cccc34 2020-02-20 stsp goto done;
5406 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5407 c02c541e 2019-03-29 stsp if (error != NULL)
5408 52185f70 2019-02-05 stsp goto done;
5410 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5411 55cccc34 2020-02-20 stsp repo, worktree);
5412 55cccc34 2020-02-20 stsp if (error)
5413 55cccc34 2020-02-20 stsp goto done;
5415 55cccc34 2020-02-20 stsp init_curses();
5417 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5418 c02c541e 2019-03-29 stsp if (error)
5419 52185f70 2019-02-05 stsp goto done;
5421 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5422 71a27632 2020-01-15 stsp commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5423 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5424 55cccc34 2020-02-20 stsp if (error)
5425 ffd1d5e5 2018-06-23 stsp goto done;
5427 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5428 55cccc34 2020-02-20 stsp if (error)
5429 ffd1d5e5 2018-06-23 stsp goto done;
5431 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
5432 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
5433 55cccc34 2020-02-20 stsp if (error)
5434 8b473291 2019-02-21 stsp goto done;
5436 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5437 8b473291 2019-02-21 stsp if (error)
5438 ffd1d5e5 2018-06-23 stsp goto done;
5440 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5441 5221c383 2018-08-01 stsp if (view == NULL) {
5442 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5443 5221c383 2018-08-01 stsp goto done;
5445 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
5446 ad80ab7b 2018-08-04 stsp if (error)
5447 ad80ab7b 2018-08-04 stsp goto done;
5448 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
5449 55cccc34 2020-02-20 stsp error = tree_view_walk_path(&view->state.tree, commit_id,
5450 55cccc34 2020-02-20 stsp in_repo_path, repo);
5451 55cccc34 2020-02-20 stsp if (error)
5452 55cccc34 2020-02-20 stsp goto done;
5455 55cccc34 2020-02-20 stsp if (worktree) {
5456 55cccc34 2020-02-20 stsp /* Release work tree lock. */
5457 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
5458 55cccc34 2020-02-20 stsp worktree = NULL;
5460 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5462 52185f70 2019-02-05 stsp free(repo_path);
5463 e4a0e26d 2020-02-20 stsp free(cwd);
5464 ffd1d5e5 2018-06-23 stsp free(commit_id);
5465 ffd1d5e5 2018-06-23 stsp if (commit)
5466 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
5468 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
5470 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
5471 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5472 ffd1d5e5 2018-06-23 stsp return error;
5475 ce5b7c56 2019-07-09 stsp static void
5476 ce5b7c56 2019-07-09 stsp list_commands(void)
5480 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
5481 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
5482 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
5483 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->name);
5485 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
5488 4ed7e80c 2018-05-20 stsp __dead static void
5489 ce5b7c56 2019-07-09 stsp usage(int hflag)
5491 ee85c5e8 2020-02-29 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] [command] "
5492 ee85c5e8 2020-02-29 stsp "[arg ...]\n", getprogname());
5493 ee85c5e8 2020-02-29 stsp if (hflag) {
5494 ee85c5e8 2020-02-29 stsp fprintf(stderr, "lazy usage: %s path\n", getprogname());
5495 ce5b7c56 2019-07-09 stsp list_commands();
5500 c2301be8 2018-04-30 stsp static char **
5501 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
5503 ee85c5e8 2020-02-29 stsp va_list ap;
5504 c2301be8 2018-04-30 stsp char **argv;
5507 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
5509 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
5510 c2301be8 2018-04-30 stsp if (argv == NULL)
5511 c2301be8 2018-04-30 stsp err(1, "calloc");
5512 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
5513 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
5514 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
5515 e10c916e 2019-09-15 hiltjo err(1, "strdup");
5518 ee85c5e8 2020-02-29 stsp va_end(ap);
5519 c2301be8 2018-04-30 stsp return argv;
5523 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
5524 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
5525 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
5526 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
5527 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
5529 ee85c5e8 2020-02-29 stsp static const struct got_error *
5530 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
5532 ee85c5e8 2020-02-29 stsp const struct got_error *error = NULL;
5533 ee85c5e8 2020-02-29 stsp struct tog_cmd *cmd = NULL;
5534 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
5535 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
5536 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
5537 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5538 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
5540 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
5541 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
5542 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
5544 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
5545 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5546 ee85c5e8 2020-02-29 stsp goto done;
5548 ee85c5e8 2020-02-29 stsp if (worktree)
5549 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
5551 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
5552 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
5553 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
5554 ee85c5e8 2020-02-29 stsp goto done;
5557 ee85c5e8 2020-02-29 stsp error = got_repo_open(&repo, repo_path, NULL);
5558 ee85c5e8 2020-02-29 stsp if (error != NULL)
5559 ee85c5e8 2020-02-29 stsp goto done;
5561 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5562 ee85c5e8 2020-02-29 stsp repo, worktree);
5563 ee85c5e8 2020-02-29 stsp if (error)
5564 ee85c5e8 2020-02-29 stsp goto done;
5566 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
5567 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
5568 ee85c5e8 2020-02-29 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5569 ee85c5e8 2020-02-29 stsp if (error)
5570 ee85c5e8 2020-02-29 stsp goto done;
5572 ee85c5e8 2020-02-29 stsp if (worktree) {
5573 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5574 ee85c5e8 2020-02-29 stsp worktree = NULL;
5577 ee85c5e8 2020-02-29 stsp error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
5578 ee85c5e8 2020-02-29 stsp if (error) {
5579 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
5580 ee85c5e8 2020-02-29 stsp goto done;
5581 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
5582 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
5584 ee85c5e8 2020-02-29 stsp /* not reached */
5587 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5588 ee85c5e8 2020-02-29 stsp repo = NULL;
5590 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
5591 ee85c5e8 2020-02-29 stsp if (error)
5592 ee85c5e8 2020-02-29 stsp goto done;
5594 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
5596 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
5597 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
5600 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5601 ee85c5e8 2020-02-29 stsp if (worktree)
5602 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5604 ee85c5e8 2020-02-29 stsp free(commit_id_str);
5605 ee85c5e8 2020-02-29 stsp free(commit_id);
5606 ee85c5e8 2020-02-29 stsp free(cwd);
5607 ee85c5e8 2020-02-29 stsp free(repo_path);
5608 ee85c5e8 2020-02-29 stsp free(in_repo_path);
5609 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
5611 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
5612 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
5613 ee85c5e8 2020-02-29 stsp free(cmd_argv);
5615 ee85c5e8 2020-02-29 stsp return error;
5619 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
5621 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
5622 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
5623 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
5624 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
5625 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
5626 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
5627 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
5630 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
5632 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5633 9f7d7167 2018-04-29 stsp switch (ch) {
5635 9f7d7167 2018-04-29 stsp hflag = 1;
5638 53ccebc2 2019-07-30 stsp Vflag = 1;
5641 ce5b7c56 2019-07-09 stsp usage(hflag);
5642 9f7d7167 2018-04-29 stsp /* NOTREACHED */
5646 9f7d7167 2018-04-29 stsp argc -= optind;
5647 9f7d7167 2018-04-29 stsp argv += optind;
5648 9f7d7167 2018-04-29 stsp optind = 0;
5649 c2301be8 2018-04-30 stsp optreset = 1;
5651 53ccebc2 2019-07-30 stsp if (Vflag) {
5652 53ccebc2 2019-07-30 stsp got_version_print_str();
5656 c2301be8 2018-04-30 stsp if (argc == 0) {
5657 f29d3e89 2018-06-23 stsp if (hflag)
5658 ce5b7c56 2019-07-09 stsp usage(hflag);
5659 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
5660 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
5662 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
5666 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
5667 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
5668 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
5669 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
5670 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
5676 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
5677 ee85c5e8 2020-02-29 stsp if (argc != 1)
5679 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
5680 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
5682 ee85c5e8 2020-02-29 stsp if (hflag)
5683 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
5685 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5689 a2f4a359 2020-02-28 stsp if (cmd_argv) {
5691 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
5692 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
5693 a2f4a359 2020-02-28 stsp free(cmd_argv);
5696 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
5697 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
