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 6879ba42 2020-10-01 naddy __dead static void usage(int, 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;
1166 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
1169 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1170 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1172 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1173 8b473291 2019-02-21 stsp name += 5;
1174 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1176 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1177 8b473291 2019-02-21 stsp name += 6;
1178 79cc719f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
1179 8b473291 2019-02-21 stsp name += 8;
1180 79cc719f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
1181 79cc719f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
1184 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
1187 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1188 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
1189 5d844a1e 2019-08-13 stsp if (err) {
1190 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
1191 48cae60d 2020-09-22 stsp free(ref_id);
1194 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1195 5d844a1e 2019-08-13 stsp err = NULL;
1196 5d844a1e 2019-08-13 stsp tag = NULL;
1199 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1200 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
1201 48cae60d 2020-09-22 stsp free(ref_id);
1203 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1204 52b5abe1 2019-08-13 stsp if (cmp != 0)
1206 8b473291 2019-02-21 stsp s = *refs_str;
1207 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1208 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1209 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1211 8b473291 2019-02-21 stsp *refs_str = NULL;
1217 8b473291 2019-02-21 stsp return err;
1220 963b370f 2018-05-20 stsp static const struct got_error *
1221 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1222 27a741e5 2019-09-11 stsp int col_tab_align)
1224 5813d178 2019-03-09 stsp char *smallerthan, *at;
1226 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1227 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1228 5813d178 2019-03-09 stsp author = smallerthan + 1;
1229 5813d178 2019-03-09 stsp at = strchr(author, '@');
1231 5813d178 2019-03-09 stsp *at = '\0';
1232 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1235 5813d178 2019-03-09 stsp static const struct got_error *
1236 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1237 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1238 11b20872 2019-11-08 stsp const size_t date_display_cols, int author_display_cols,
1239 11b20872 2019-11-08 stsp struct tog_colors *colors)
1241 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1242 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1243 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1244 5813d178 2019-03-09 stsp char *author = NULL;
1245 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1246 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1247 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1248 bb737323 2018-05-20 stsp int col, limit;
1249 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1250 ccb26ccd 2018-11-05 stsp struct tm tm;
1251 45d799e2 2018-12-23 stsp time_t committer_time;
1252 11b20872 2019-11-08 stsp struct tog_color *tc;
1254 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1255 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1256 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1257 6db9f7f6 2019-12-10 stsp if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1258 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1259 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1261 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1262 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1264 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1265 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_DATE);
1267 11b20872 2019-11-08 stsp wattr_on(view->window,
1268 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1269 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1271 11b20872 2019-11-08 stsp wattr_off(view->window,
1272 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1273 27a741e5 2019-09-11 stsp col = limit;
1274 b39d25c7 2018-07-10 stsp if (col > avail)
1275 b39d25c7 2018-07-10 stsp goto done;
1277 6570a66d 2019-11-08 stsp if (avail >= 120) {
1278 6570a66d 2019-11-08 stsp char *id_str;
1279 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1281 6570a66d 2019-11-08 stsp goto done;
1282 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1284 11b20872 2019-11-08 stsp wattr_on(view->window,
1285 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1286 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1288 11b20872 2019-11-08 stsp wattr_off(view->window,
1289 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1290 6570a66d 2019-11-08 stsp free(id_str);
1292 6570a66d 2019-11-08 stsp if (col > avail)
1293 6570a66d 2019-11-08 stsp goto done;
1296 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1297 5813d178 2019-03-09 stsp if (author == NULL) {
1298 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1299 80ddbec8 2018-04-29 stsp goto done;
1301 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1303 bb737323 2018-05-20 stsp goto done;
1304 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_AUTHOR);
1306 11b20872 2019-11-08 stsp wattr_on(view->window,
1307 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1308 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1310 11b20872 2019-11-08 stsp wattr_off(view->window,
1311 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1312 bb737323 2018-05-20 stsp col += author_width;
1313 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1314 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1316 bb737323 2018-05-20 stsp author_width++;
1318 9c2eaf34 2018-05-20 stsp if (col > avail)
1319 9c2eaf34 2018-05-20 stsp goto done;
1321 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1323 6d9fbc00 2018-04-29 stsp goto done;
1324 bb737323 2018-05-20 stsp logmsg = logmsg0;
1325 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1327 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1328 bb737323 2018-05-20 stsp if (newline)
1329 bb737323 2018-05-20 stsp *newline = '\0';
1330 bb737323 2018-05-20 stsp limit = avail - col;
1331 dee2c213 2019-11-13 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1333 bb737323 2018-05-20 stsp goto done;
1334 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1335 bb737323 2018-05-20 stsp col += logmsg_width;
1336 27a741e5 2019-09-11 stsp while (col < avail) {
1337 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1341 80ddbec8 2018-04-29 stsp free(logmsg0);
1342 bb737323 2018-05-20 stsp free(wlogmsg);
1343 5813d178 2019-03-09 stsp free(author);
1344 bb737323 2018-05-20 stsp free(wauthor);
1345 80ddbec8 2018-04-29 stsp free(line);
1346 80ddbec8 2018-04-29 stsp return err;
1349 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1350 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1351 899d86c2 2018-05-10 stsp struct got_object_id *id)
1353 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1355 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1356 80ddbec8 2018-04-29 stsp if (entry == NULL)
1357 899d86c2 2018-05-10 stsp return NULL;
1359 899d86c2 2018-05-10 stsp entry->id = id;
1360 99db9666 2018-05-07 stsp entry->commit = commit;
1361 899d86c2 2018-05-10 stsp return entry;
1364 99db9666 2018-05-07 stsp static void
1365 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1367 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1369 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1370 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1371 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1372 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1373 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1374 99db9666 2018-05-07 stsp free(entry);
1377 99db9666 2018-05-07 stsp static void
1378 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1380 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1381 99db9666 2018-05-07 stsp pop_commit(commits);
1384 c4972b91 2018-05-07 stsp static const struct got_error *
1385 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1386 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1388 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1389 13add988 2019-10-15 stsp regmatch_t regmatch;
1390 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1392 13add988 2019-10-15 stsp *have_match = 0;
1394 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1396 13add988 2019-10-15 stsp return err;
1398 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1400 13add988 2019-10-15 stsp goto done;
1402 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1403 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1404 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1405 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1406 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1407 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1408 13add988 2019-10-15 stsp *have_match = 1;
1410 13add988 2019-10-15 stsp free(id_str);
1411 13add988 2019-10-15 stsp free(logmsg);
1412 13add988 2019-10-15 stsp return err;
1415 13add988 2019-10-15 stsp static const struct got_error *
1416 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1417 13add988 2019-10-15 stsp int minqueue, struct got_repository *repo, const char *path,
1418 13add988 2019-10-15 stsp int *searching, int *search_next_done, regex_t *regex)
1420 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1421 7c1452c1 2020-03-26 stsp int nqueued = 0;
1424 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1425 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1426 1a76625f 2018-10-22 stsp * while updating the display.
1428 13add988 2019-10-15 stsp while (nqueued < minqueue ||
1429 13add988 2019-10-15 stsp (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1430 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1431 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1432 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1433 1a76625f 2018-10-22 stsp int errcode;
1435 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1436 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1439 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1442 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1443 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1444 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1448 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1449 1a76625f 2018-10-22 stsp if (errcode) {
1450 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1451 13add988 2019-10-15 stsp "pthread_mutex_lock");
1455 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1456 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1457 ecb28ae0 2018-07-16 stsp nqueued++;
1458 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1460 13add988 2019-10-15 stsp if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1461 7c1452c1 2020-03-26 stsp int have_match;
1462 13add988 2019-10-15 stsp err = match_commit(&have_match, id, commit, regex);
1465 7c1452c1 2020-03-26 stsp if (have_match)
1466 8f4ed634 2020-03-26 stsp *search_next_done = TOG_SEARCH_HAVE_MORE;
1469 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1470 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1471 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1472 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1477 9ba79e04 2018-06-11 stsp return err;
1480 0553a4e3 2018-04-30 stsp static const struct got_error *
1481 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1482 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1483 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1484 11b20872 2019-11-08 stsp struct got_reflist_head *refs, const char *path, int commits_needed,
1485 11b20872 2019-11-08 stsp struct tog_colors *colors)
1487 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1488 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1489 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1490 60493ae3 2019-06-20 stsp int width;
1491 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1492 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1493 8b473291 2019-02-21 stsp char *refs_str = NULL;
1494 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1495 11b20872 2019-11-08 stsp struct tog_color *tc;
1496 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1498 e0d42f60 2018-07-22 stsp entry = first;
1499 e0d42f60 2018-07-22 stsp ncommits = 0;
1500 e0d42f60 2018-07-22 stsp while (entry) {
1501 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1502 e0d42f60 2018-07-22 stsp *selected = entry;
1505 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1506 e0d42f60 2018-07-22 stsp ncommits++;
1509 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1510 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1512 ecb28ae0 2018-07-16 stsp return err;
1513 8b473291 2019-02-21 stsp if (refs) {
1514 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, (*selected)->id,
1517 8b473291 2019-02-21 stsp goto done;
1521 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1522 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1524 8f4ed634 2020-03-26 stsp if (commits_needed > 0) {
1525 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1526 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1527 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
1528 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
1529 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1530 8f4ed634 2020-03-26 stsp goto done;
1533 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
1535 f9686aa5 2020-03-27 stsp if (view->searching) {
1536 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
1537 f9686aa5 2020-03-27 stsp search_str = "no more matches";
1538 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1539 f9686aa5 2020-03-27 stsp search_str = "no matches found";
1540 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
1541 f9686aa5 2020-03-27 stsp search_str = "searching...";
1544 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1545 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1546 f9686aa5 2020-03-27 stsp search_str ? search_str :
1547 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
1548 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1549 8f4ed634 2020-03-26 stsp goto done;
1553 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1554 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1555 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1556 1a76625f 2018-10-22 stsp path, 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 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1562 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1563 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1564 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1565 1a76625f 2018-10-22 stsp header = NULL;
1566 1a76625f 2018-10-22 stsp goto done;
1568 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1570 1a76625f 2018-10-22 stsp goto done;
1572 2814baeb 2018-08-01 stsp werase(view->window);
1574 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1575 a3404814 2018-09-02 stsp wstandout(view->window);
1576 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1578 11b20872 2019-11-08 stsp wattr_on(view->window,
1579 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1580 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1582 11b20872 2019-11-08 stsp wattr_off(view->window,
1583 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1584 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1585 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1588 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1589 a3404814 2018-09-02 stsp wstandend(view->window);
1590 ecb28ae0 2018-07-16 stsp free(wline);
1591 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1592 1a76625f 2018-10-22 stsp goto done;
1594 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1595 899d86c2 2018-05-10 stsp entry = first;
1596 5813d178 2019-03-09 stsp ncommits = 0;
1597 5813d178 2019-03-09 stsp while (entry) {
1598 5813d178 2019-03-09 stsp char *author;
1599 5813d178 2019-03-09 stsp wchar_t *wauthor;
1600 5813d178 2019-03-09 stsp int width;
1601 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1603 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1604 5813d178 2019-03-09 stsp if (author == NULL) {
1605 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1606 5813d178 2019-03-09 stsp goto done;
1608 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1609 27a741e5 2019-09-11 stsp date_display_cols);
1610 5813d178 2019-03-09 stsp if (author_cols < width)
1611 5813d178 2019-03-09 stsp author_cols = width;
1612 5813d178 2019-03-09 stsp free(wauthor);
1613 5813d178 2019-03-09 stsp free(author);
1614 7ca04879 2019-10-19 stsp ncommits++;
1615 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1618 5813d178 2019-03-09 stsp entry = first;
1619 899d86c2 2018-05-10 stsp *last = first;
1620 867c6645 2018-07-10 stsp ncommits = 0;
1621 899d86c2 2018-05-10 stsp while (entry) {
1622 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1624 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1625 2814baeb 2018-08-01 stsp wstandout(view->window);
1626 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1627 11b20872 2019-11-08 stsp date_display_cols, author_cols, colors);
1628 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1629 2814baeb 2018-08-01 stsp wstandend(view->window);
1631 60493ae3 2019-06-20 stsp goto done;
1632 0553a4e3 2018-04-30 stsp ncommits++;
1633 899d86c2 2018-05-10 stsp *last = entry;
1634 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1637 1a57306a 2018-09-02 stsp view_vborder(view);
1639 1a76625f 2018-10-22 stsp free(id_str);
1640 8b473291 2019-02-21 stsp free(refs_str);
1641 1a76625f 2018-10-22 stsp free(ncommits_str);
1642 1a76625f 2018-10-22 stsp free(header);
1643 80ddbec8 2018-04-29 stsp return err;
1646 07b55e75 2018-05-10 stsp static void
1647 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1648 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1649 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1651 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1652 07b55e75 2018-05-10 stsp int nscrolled = 0;
1654 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1655 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1658 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1659 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1660 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1661 07b55e75 2018-05-10 stsp if (entry) {
1662 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1663 07b55e75 2018-05-10 stsp nscrolled++;
1668 aa075928 2018-05-10 stsp static const struct got_error *
1669 7c1452c1 2020-03-26 stsp trigger_log_thread(struct tog_view *log_view, int wait,
1670 7c1452c1 2020-03-26 stsp int *commits_needed, int *log_complete,
1671 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1673 5e224a3e 2019-02-22 stsp int errcode;
1675 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1677 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1678 5e224a3e 2019-02-22 stsp if (*log_complete)
1681 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1682 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1683 7aafa0d1 2019-02-22 stsp if (errcode)
1684 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1685 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1688 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
1689 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
1691 7c1452c1 2020-03-26 stsp if (!wait)
1694 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1695 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1696 7c1452c1 2020-03-26 stsp update_panels();
1697 7c1452c1 2020-03-26 stsp doupdate();
1699 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
1700 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(commit_loaded, &tog_mutex);
1701 82954512 2020-02-03 stsp if (errcode)
1702 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1703 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1705 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1706 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1707 7c1452c1 2020-03-26 stsp update_panels();
1708 7c1452c1 2020-03-26 stsp doupdate();
1711 5e224a3e 2019-02-22 stsp return NULL;
1714 5e224a3e 2019-02-22 stsp static const struct got_error *
1715 7c1452c1 2020-03-26 stsp scroll_down(struct tog_view *log_view,
1716 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1717 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1718 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1719 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1721 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1722 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1723 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
1725 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1726 5e224a3e 2019-02-22 stsp return NULL;
1728 7c1452c1 2020-03-26 stsp ncommits_needed = (*last_displayed_entry)->idx + 1 + maxscroll;
1729 7c1452c1 2020-03-26 stsp if (commits->ncommits < ncommits_needed && !*log_complete) {
1731 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
1733 7c1452c1 2020-03-26 stsp (*commits_needed) += maxscroll;
1734 7c1452c1 2020-03-26 stsp err = trigger_log_thread(log_view, 1, commits_needed,
1735 7c1452c1 2020-03-26 stsp log_complete, need_commits, commit_loaded);
1737 5e224a3e 2019-02-22 stsp return err;
1741 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1742 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1745 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1747 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1748 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1750 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1751 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1753 dd0a52c1 2018-05-20 stsp return err;
1756 cd0acaa7 2018-05-20 stsp static const struct got_error *
1757 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1758 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1759 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1760 8b473291 2019-02-21 stsp struct got_repository *repo)
1762 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1763 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1764 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1766 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1767 15a94983 2018-12-23 stsp if (diff_view == NULL)
1768 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1770 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1771 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1772 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1773 e5a0f69f 2018-08-18 stsp if (err == NULL)
1774 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1775 cd0acaa7 2018-05-20 stsp return err;
1778 80ddbec8 2018-04-29 stsp static const struct got_error *
1779 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1780 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1782 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1784 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1785 941e9f74 2019-05-21 stsp if (parent == NULL)
1786 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1788 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1789 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1790 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1791 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1792 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1793 941e9f74 2019-05-21 stsp s->tree = subtree;
1794 941e9f74 2019-05-21 stsp s->selected = 0;
1795 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1796 941e9f74 2019-05-21 stsp return NULL;
1799 941e9f74 2019-05-21 stsp static const struct got_error *
1800 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
1801 55cccc34 2020-02-20 stsp struct got_object_id *commit_id,
1802 55cccc34 2020-02-20 stsp const char *path, struct got_repository *repo)
1804 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1805 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
1806 941e9f74 2019-05-21 stsp const char *p;
1807 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
1809 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1811 941e9f74 2019-05-21 stsp while (*p) {
1812 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
1813 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1814 56e0773d 2019-11-28 stsp char *te_name;
1816 33cbf02b 2020-01-12 stsp while (p[0] == '/')
1819 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1820 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1821 941e9f74 2019-05-21 stsp if (slash == NULL)
1822 33cbf02b 2020-01-12 stsp te_name = strdup(p);
1824 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
1825 56e0773d 2019-11-28 stsp if (te_name == NULL) {
1826 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
1829 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
1830 56e0773d 2019-11-28 stsp if (te == NULL) {
1831 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1832 56e0773d 2019-11-28 stsp free(te_name);
1835 56e0773d 2019-11-28 stsp free(te_name);
1836 56e0773d 2019-11-28 stsp s->selected_entry = te;
1837 56e0773d 2019-11-28 stsp s->selected = got_tree_entry_get_index(te);
1838 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1839 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1841 56e0773d 2019-11-28 stsp if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry))) {
1842 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1843 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1844 67409a31 2019-05-24 stsp s->selected = 0;
1848 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1849 941e9f74 2019-05-21 stsp if (slash)
1850 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1852 941e9f74 2019-05-21 stsp subpath = strdup(path);
1853 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1854 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1858 55cccc34 2020-02-20 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
1863 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1864 941e9f74 2019-05-21 stsp free(tree_id);
1868 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1869 941e9f74 2019-05-21 stsp if (err) {
1870 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1873 941e9f74 2019-05-21 stsp if (slash == NULL)
1875 941e9f74 2019-05-21 stsp free(subpath);
1876 941e9f74 2019-05-21 stsp subpath = NULL;
1877 941e9f74 2019-05-21 stsp p = slash;
1880 941e9f74 2019-05-21 stsp free(subpath);
1881 1a76625f 2018-10-22 stsp return err;
1884 61266923 2020-01-14 stsp static const struct got_error *
1885 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1886 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
1887 55cccc34 2020-02-20 stsp struct got_reflist_head *refs, struct got_repository *repo)
1889 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
1890 55cccc34 2020-02-20 stsp struct got_tree_object *tree;
1891 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
1892 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
1894 55cccc34 2020-02-20 stsp err = got_object_open_as_tree(&tree, repo,
1895 55cccc34 2020-02-20 stsp got_object_commit_get_tree_id(entry->commit));
1897 55cccc34 2020-02-20 stsp return err;
1899 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1900 55cccc34 2020-02-20 stsp if (tree_view == NULL)
1901 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
1903 55cccc34 2020-02-20 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1904 55cccc34 2020-02-20 stsp if (err) {
1905 55cccc34 2020-02-20 stsp got_object_tree_close(tree);
1906 55cccc34 2020-02-20 stsp return err;
1908 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
1910 55cccc34 2020-02-20 stsp *new_view = tree_view;
1912 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
1913 55cccc34 2020-02-20 stsp return NULL;
1915 55cccc34 2020-02-20 stsp return tree_view_walk_path(s, entry->id, path, repo);
1918 55cccc34 2020-02-20 stsp static const struct got_error *
1919 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
1921 61266923 2020-01-14 stsp sigset_t sigset;
1922 61266923 2020-01-14 stsp int errcode;
1924 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
1925 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
1927 61266923 2020-01-14 stsp /* tog handles SIGWINCH and SIGCONT */
1928 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
1929 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1930 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
1931 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1933 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
1934 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
1935 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1937 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1938 61266923 2020-01-14 stsp if (errcode)
1939 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
1941 61266923 2020-01-14 stsp return NULL;
1944 1a76625f 2018-10-22 stsp static void *
1945 1a76625f 2018-10-22 stsp log_thread(void *arg)
1947 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1948 1a76625f 2018-10-22 stsp int errcode = 0;
1949 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1950 1a76625f 2018-10-22 stsp int done = 0;
1952 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
1954 61266923 2020-01-14 stsp return (void *)err;
1956 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1957 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1958 13add988 2019-10-15 stsp a->in_repo_path, a->searching, a->search_next_done,
1959 13add988 2019-10-15 stsp a->regex);
1960 1a76625f 2018-10-22 stsp if (err) {
1961 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1962 1a76625f 2018-10-22 stsp return (void *)err;
1963 1a76625f 2018-10-22 stsp err = NULL;
1965 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1966 1a76625f 2018-10-22 stsp a->commits_needed--;
1968 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1969 3abe8080 2019-04-10 stsp if (errcode) {
1970 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1971 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1973 3abe8080 2019-04-10 stsp } else if (*a->quit)
1975 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1976 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1977 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1978 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1981 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
1982 7c1452c1 2020-03-26 stsp if (errcode) {
1983 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1984 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
1985 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
1990 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1992 7c1452c1 2020-03-26 stsp if (a->commits_needed == 0) {
1993 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
1994 7c1452c1 2020-03-26 stsp &tog_mutex);
1995 7c1452c1 2020-03-26 stsp if (errcode)
1996 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1997 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
2001 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2002 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2003 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2004 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2006 3abe8080 2019-04-10 stsp a->log_complete = 1;
2007 1a76625f 2018-10-22 stsp return (void *)err;
2010 1a76625f 2018-10-22 stsp static const struct got_error *
2011 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2013 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2014 1a76625f 2018-10-22 stsp int errcode;
2016 1a76625f 2018-10-22 stsp if (s->thread) {
2017 1a76625f 2018-10-22 stsp s->quit = 1;
2018 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2019 1a76625f 2018-10-22 stsp if (errcode)
2020 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2021 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2022 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&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_unlock");
2026 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
2027 1a76625f 2018-10-22 stsp if (errcode)
2028 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2029 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2030 1a76625f 2018-10-22 stsp if (errcode)
2031 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2032 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2033 1a76625f 2018-10-22 stsp s->thread = NULL;
2036 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2037 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2038 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
2040 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2041 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
2042 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2045 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2046 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2047 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2050 9343a5fb 2018-06-23 stsp return err;
2053 9343a5fb 2018-06-23 stsp static const struct got_error *
2054 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2056 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2057 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2059 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2060 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2061 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2062 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2063 1a76625f 2018-10-22 stsp free(s->start_id);
2064 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2065 1a76625f 2018-10-22 stsp return err;
2068 1a76625f 2018-10-22 stsp static const struct got_error *
2069 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2071 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2073 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2074 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2075 60493ae3 2019-06-20 stsp return NULL;
2078 60493ae3 2019-06-20 stsp static const struct got_error *
2079 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2081 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2082 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2083 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2085 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2086 f9686aa5 2020-03-27 stsp show_log_view(view);
2087 f9686aa5 2020-03-27 stsp update_panels();
2088 f9686aa5 2020-03-27 stsp doupdate();
2090 96e2b566 2019-07-08 stsp if (s->search_entry) {
2091 13add988 2019-10-15 stsp int errcode, ch;
2092 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2093 13add988 2019-10-15 stsp if (errcode)
2094 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2095 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2096 13add988 2019-10-15 stsp ch = wgetch(view->window);
2097 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2098 13add988 2019-10-15 stsp if (errcode)
2099 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2100 13add988 2019-10-15 stsp "pthread_mutex_lock");
2101 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2102 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2103 678cbce5 2019-07-28 stsp return NULL;
2105 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2106 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2108 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2109 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2110 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2111 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2112 8f4ed634 2020-03-26 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2114 8f4ed634 2020-03-26 stsp entry = TAILQ_PREV(s->matched_entry,
2115 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2117 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2118 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
2120 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2123 60493ae3 2019-06-20 stsp while (1) {
2124 13add988 2019-10-15 stsp int have_match = 0;
2126 60493ae3 2019-06-20 stsp if (entry == NULL) {
2127 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2128 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2129 f9967bca 2020-03-27 stsp view->search_next_done =
2130 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2131 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2132 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2133 f801134a 2019-06-25 stsp return NULL;
2136 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2137 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2138 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2140 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2141 7c1452c1 2020-03-26 stsp return trigger_log_thread(view, 0,
2142 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
2143 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
2144 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2145 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2148 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2149 13add988 2019-10-15 stsp &view->regex);
2152 13add988 2019-10-15 stsp if (have_match) {
2153 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2154 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2158 96e2b566 2019-07-08 stsp s->search_entry = entry;
2159 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2160 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2162 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2165 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2166 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2167 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2168 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2170 60493ae3 2019-06-20 stsp return err;
2173 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2174 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2176 60493ae3 2019-06-20 stsp return err;
2181 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2183 60493ae3 2019-06-20 stsp return NULL;
2186 60493ae3 2019-06-20 stsp static const struct got_error *
2187 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2188 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
2189 f135c941 2020-02-20 stsp const char *head_ref_name, const char *in_repo_path,
2190 b672a97a 2020-01-27 stsp int log_branches)
2192 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2193 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2194 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2195 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2196 1a76625f 2018-10-22 stsp int errcode;
2198 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2199 f135c941 2020-02-20 stsp free(s->in_repo_path);
2200 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2201 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2202 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2205 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2206 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2207 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2209 8b473291 2019-02-21 stsp s->refs = refs;
2210 fb2756b9 2018-08-04 stsp s->repo = repo;
2211 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
2212 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2213 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2214 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2215 5036bf37 2018-09-24 stsp goto done;
2217 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2219 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
2220 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2221 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2222 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2224 11b20872 2019-11-08 stsp goto done;
2225 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2226 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2227 11b20872 2019-11-08 stsp if (err) {
2228 11b20872 2019-11-08 stsp free_colors(&s->colors);
2229 11b20872 2019-11-08 stsp goto done;
2231 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2232 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2233 11b20872 2019-11-08 stsp if (err) {
2234 11b20872 2019-11-08 stsp free_colors(&s->colors);
2235 11b20872 2019-11-08 stsp goto done;
2239 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2240 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2241 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2242 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2243 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2245 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2247 1a76625f 2018-10-22 stsp goto done;
2248 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2249 b672a97a 2020-01-27 stsp !s->log_branches);
2251 1a76625f 2018-10-22 stsp goto done;
2252 c5b78334 2020-01-12 stsp err = got_commit_graph_iter_start(thread_graph,
2253 c5b78334 2020-01-12 stsp s->start_id, s->repo, NULL, NULL);
2255 c5b78334 2020-01-12 stsp goto done;
2257 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2258 1a76625f 2018-10-22 stsp if (errcode) {
2259 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2260 1a76625f 2018-10-22 stsp goto done;
2262 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2263 7c1452c1 2020-03-26 stsp if (errcode) {
2264 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
2265 7c1452c1 2020-03-26 stsp goto done;
2268 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2269 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2270 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2271 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2272 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2273 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2274 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2275 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2276 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2277 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2278 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2279 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2280 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2283 1a76625f 2018-10-22 stsp close_log_view(view);
2284 ba4f502b 2018-08-04 stsp return err;
2287 e5a0f69f 2018-08-18 stsp static const struct got_error *
2288 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2290 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2292 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2293 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2294 2b380cc8 2018-10-24 stsp &s->thread_args);
2295 2b380cc8 2018-10-24 stsp if (errcode)
2296 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2299 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
2300 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
2301 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
2302 11b20872 2019-11-08 stsp s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2305 e5a0f69f 2018-08-18 stsp static const struct got_error *
2306 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2307 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2309 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2310 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2311 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
2312 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2313 669b5ffa 2018-10-07 stsp int begin_x = 0;
2314 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
2316 e5a0f69f 2018-08-18 stsp switch (ch) {
2318 1e37a5c2 2019-05-12 jcs s->quit = 1;
2321 1e37a5c2 2019-05-12 jcs case KEY_UP:
2324 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2326 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2327 1e37a5c2 2019-05-12 jcs s->selected--;
2329 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
2330 1144d21a 2019-06-21 stsp &s->commits);
2332 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2333 a4292ac5 2019-05-12 jcs case CTRL('b'):
2334 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2336 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
2337 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
2338 1e37a5c2 2019-05-12 jcs s->selected = 0;
2341 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
2342 1831ac02 2020-03-23 naddy view->nlines - 1, &s->commits);
2345 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2348 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2350 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2351 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2352 1e37a5c2 2019-05-12 jcs s->selected++;
2355 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
2356 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
2357 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
2358 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2359 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2360 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2362 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2363 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2364 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2365 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2366 1e37a5c2 2019-05-12 jcs if (first == NULL)
2368 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
2369 1831ac02 2020-03-23 naddy view->nlines - 1, &s->last_displayed_entry,
2370 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
2371 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2372 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2373 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2376 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2377 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2378 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2379 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2380 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2381 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2383 1e37a5c2 2019-05-12 jcs err = NULL;
2386 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2387 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2388 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2389 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2390 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2392 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2395 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2397 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2398 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2399 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2400 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2401 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2404 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2405 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2407 1e37a5c2 2019-05-12 jcs return err;
2408 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2410 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2413 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2414 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2416 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2419 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2421 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2422 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2423 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2424 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2427 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2428 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2430 1e37a5c2 2019-05-12 jcs return err;
2431 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2433 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2436 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2437 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2439 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2441 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2442 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
2444 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
2445 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
2446 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
2448 1e37a5c2 2019-05-12 jcs return err;
2449 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
2450 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
2451 1e37a5c2 2019-05-12 jcs if (lv == NULL)
2452 638f9024 2019-05-13 stsp return got_error_from_errno(
2453 1e37a5c2 2019-05-12 jcs "view_open");
2454 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
2455 f135c941 2020-02-20 stsp s->repo, s->head_ref_name, parent_path,
2456 b672a97a 2020-01-27 stsp s->log_branches);
2458 1e37a5c2 2019-05-12 jcs return err;;
2459 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2460 1e37a5c2 2019-05-12 jcs *new_view = lv;
2462 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
2463 1e37a5c2 2019-05-12 jcs *focus_view = lv;
2465 1e37a5c2 2019-05-12 jcs return NULL;
2468 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2469 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2471 d01904d4 2019-06-25 stsp return err;
2472 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2473 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2474 d01904d4 2019-06-25 stsp if (lv == NULL)
2475 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2476 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&start_id, NULL,
2477 71a27632 2020-01-15 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2478 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2479 ef129c5e 2019-08-03 stsp if (err) {
2480 ef129c5e 2019-08-03 stsp view_close(lv);
2481 d01904d4 2019-06-25 stsp return err;
2483 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2484 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2485 e6b23735 2019-10-04 stsp free(start_id);
2486 e6b23735 2019-10-04 stsp view_close(lv);
2487 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2489 e6b23735 2019-10-04 stsp got_ref_list_free(s->refs);
2490 e6b23735 2019-10-04 stsp err = got_ref_list(s->refs, s->repo, NULL,
2491 e6b23735 2019-10-04 stsp got_ref_cmp_by_name, NULL);
2492 e6b23735 2019-10-04 stsp if (err) {
2493 d01904d4 2019-06-25 stsp free(start_id);
2494 ef129c5e 2019-08-03 stsp view_close(lv);
2495 50284065 2019-10-04 stsp return err;
2497 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2498 f135c941 2020-02-20 stsp s->head_ref_name, in_repo_path, s->log_branches);
2499 ef129c5e 2019-08-03 stsp if (err) {
2500 ef129c5e 2019-08-03 stsp free(start_id);
2501 b672a97a 2020-01-27 stsp view_close(lv);
2502 b672a97a 2020-01-27 stsp return err;;
2504 b672a97a 2020-01-27 stsp *dead_view = view;
2505 b672a97a 2020-01-27 stsp *new_view = lv;
2508 b672a97a 2020-01-27 stsp s->log_branches = !s->log_branches;
2509 b672a97a 2020-01-27 stsp err = stop_log_thread(s);
2511 b672a97a 2020-01-27 stsp return err;
2512 b672a97a 2020-01-27 stsp lv = view_open(view->nlines, view->ncols,
2513 b672a97a 2020-01-27 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2514 b672a97a 2020-01-27 stsp if (lv == NULL)
2515 b672a97a 2020-01-27 stsp return got_error_from_errno("view_open");
2516 b672a97a 2020-01-27 stsp err = open_log_view(lv, s->start_id, s->refs, s->repo,
2517 f135c941 2020-02-20 stsp s->head_ref_name, s->in_repo_path, s->log_branches);
2518 b672a97a 2020-01-27 stsp if (err) {
2519 ef129c5e 2019-08-03 stsp view_close(lv);
2520 d01904d4 2019-06-25 stsp return err;;
2522 d01904d4 2019-06-25 stsp *dead_view = view;
2523 d01904d4 2019-06-25 stsp *new_view = lv;
2529 80ddbec8 2018-04-29 stsp return err;
2532 4ed7e80c 2018-05-20 stsp static const struct got_error *
2533 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2535 c2db6724 2019-01-04 stsp const struct got_error *error;
2537 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2538 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2539 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2541 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2542 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2544 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2545 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2547 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2548 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2550 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2551 c2db6724 2019-01-04 stsp if (error != NULL)
2552 c2db6724 2019-01-04 stsp return error;
2554 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2555 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2557 c2db6724 2019-01-04 stsp return NULL;
2560 a915003a 2019-02-05 stsp static void
2561 a915003a 2019-02-05 stsp init_curses(void)
2563 a915003a 2019-02-05 stsp initscr();
2565 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2568 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2569 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2570 a915003a 2019-02-05 stsp curs_set(0);
2571 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2572 6d17833f 2019-11-08 stsp start_color();
2573 6d17833f 2019-11-08 stsp use_default_colors();
2575 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2576 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2577 61266923 2020-01-14 stsp signal(SIGCONT, tog_sigcont);
2580 c2db6724 2019-01-04 stsp static const struct got_error *
2581 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2582 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2584 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2586 f135c941 2020-02-20 stsp if (argc == 0) {
2587 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2588 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2589 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2590 f135c941 2020-02-20 stsp return NULL;
2593 f135c941 2020-02-20 stsp if (worktree) {
2594 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2595 f135c941 2020-02-20 stsp char *wt_path, *p;
2597 f135c941 2020-02-20 stsp err = got_worktree_resolve_path(&wt_path, worktree, argv[0]);
2599 f135c941 2020-02-20 stsp return err;
2601 f135c941 2020-02-20 stsp if (asprintf(&p, "%s%s%s", prefix,
2602 f135c941 2020-02-20 stsp (strcmp(prefix, "/") != 0) ? "/" : "", wt_path) == -1) {
2603 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2604 f135c941 2020-02-20 stsp free(wt_path);
2605 f135c941 2020-02-20 stsp return err;
2607 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, p, 0);
2609 f135c941 2020-02-20 stsp free(wt_path);
2611 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, argv[0], 1);
2613 f135c941 2020-02-20 stsp return err;
2616 f135c941 2020-02-20 stsp static const struct got_error *
2617 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2619 80ddbec8 2018-04-29 stsp const struct got_error *error;
2620 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2621 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2622 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2623 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2624 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2625 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2626 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2627 04cc582a 2018-08-01 stsp struct tog_view *view;
2629 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2631 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2632 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2633 c2db6724 2019-01-04 stsp NULL) == -1)
2634 80ddbec8 2018-04-29 stsp err(1, "pledge");
2637 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2638 80ddbec8 2018-04-29 stsp switch (ch) {
2640 b672a97a 2020-01-27 stsp log_branches = 1;
2643 80ddbec8 2018-04-29 stsp start_commit = optarg;
2646 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2647 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2648 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2652 17020d27 2019-03-07 stsp usage_log();
2653 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2657 80ddbec8 2018-04-29 stsp argc -= optind;
2658 80ddbec8 2018-04-29 stsp argv += optind;
2660 f135c941 2020-02-20 stsp if (argc > 1)
2661 f135c941 2020-02-20 stsp usage_log();
2663 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2664 6962eb72 2020-02-20 stsp if (cwd == NULL)
2665 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
2667 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2668 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2669 963f97a1 2019-03-18 stsp goto done;
2671 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2672 a1fbf39a 2019-08-11 stsp if (worktree)
2673 6962eb72 2020-02-20 stsp repo_path =
2674 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2676 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2678 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2679 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2680 963f97a1 2019-03-18 stsp goto done;
2683 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2684 80ddbec8 2018-04-29 stsp if (error != NULL)
2685 ecb28ae0 2018-07-16 stsp goto done;
2687 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2688 f135c941 2020-02-20 stsp repo, worktree);
2689 f135c941 2020-02-20 stsp if (error)
2690 f135c941 2020-02-20 stsp goto done;
2692 f135c941 2020-02-20 stsp init_curses();
2694 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2695 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2696 c02c541e 2019-03-29 stsp if (error)
2697 c02c541e 2019-03-29 stsp goto done;
2699 15a94983 2018-12-23 stsp if (start_commit == NULL)
2700 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, worktree ?
2701 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2702 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2704 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, start_commit,
2705 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2706 80ddbec8 2018-04-29 stsp if (error != NULL)
2707 8b473291 2019-02-21 stsp goto done;
2709 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2710 8b473291 2019-02-21 stsp if (error)
2711 ecb28ae0 2018-07-16 stsp goto done;
2713 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2714 04cc582a 2018-08-01 stsp if (view == NULL) {
2715 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2716 04cc582a 2018-08-01 stsp goto done;
2718 2fc00ff4 2019-08-31 stsp if (worktree) {
2719 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2720 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2721 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2722 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2723 2fc00ff4 2019-08-31 stsp goto done;
2726 2fc00ff4 2019-08-31 stsp error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2727 f135c941 2020-02-20 stsp in_repo_path, log_branches);
2728 ba4f502b 2018-08-04 stsp if (error)
2729 ba4f502b 2018-08-04 stsp goto done;
2730 2fc00ff4 2019-08-31 stsp if (worktree) {
2731 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2732 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2733 2fc00ff4 2019-08-31 stsp worktree = NULL;
2735 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2737 f135c941 2020-02-20 stsp free(in_repo_path);
2738 ecb28ae0 2018-07-16 stsp free(repo_path);
2739 ecb28ae0 2018-07-16 stsp free(cwd);
2740 899d86c2 2018-05-10 stsp free(start_id);
2741 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2743 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2744 ec142235 2019-03-07 stsp if (worktree)
2745 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2746 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2747 80ddbec8 2018-04-29 stsp return error;
2750 4ed7e80c 2018-05-20 stsp __dead static void
2751 9f7d7167 2018-04-29 stsp usage_diff(void)
2754 09b5bff8 2020-02-23 naddy fprintf(stderr, "usage: %s diff [-r repository-path] object1 object2\n",
2755 9f7d7167 2018-04-29 stsp getprogname());
2759 b304db33 2018-05-20 stsp static char *
2760 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2762 b304db33 2018-05-20 stsp char *line;
2763 b304db33 2018-05-20 stsp size_t linelen;
2764 b304db33 2018-05-20 stsp size_t lineno;
2765 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2767 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2769 b304db33 2018-05-20 stsp *len = linelen;
2770 b304db33 2018-05-20 stsp return line;
2773 6d17833f 2019-11-08 stsp static int
2774 6d17833f 2019-11-08 stsp match_line(const char *line, regex_t *regex)
2776 6d17833f 2019-11-08 stsp regmatch_t regmatch;
2778 6d17833f 2019-11-08 stsp return regexec(regex, line, 1, ®match, 0) == 0;
2781 f26dddb7 2019-11-08 stsp struct tog_color *
2782 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
2784 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
2786 6d17833f 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
2787 6d17833f 2019-11-08 stsp if (match_line(line, &tc->regex))
2788 6d17833f 2019-11-08 stsp return tc;
2791 6d17833f 2019-11-08 stsp return NULL;
2794 4ed7e80c 2018-05-20 stsp static const struct got_error *
2795 f44b1f58 2020-02-02 tracey draw_file(struct tog_view *view, FILE *f, int *first_displayed_line, int nlines,
2796 f44b1f58 2020-02-02 tracey int selected_line, int max_lines, int *last_displayed_line, int *eof,
2797 f44b1f58 2020-02-02 tracey char *header, struct tog_colors *colors)
2799 61e69b96 2018-05-20 stsp const struct got_error *err;
2800 f44b1f58 2020-02-02 tracey int lineno = 0, nprinted = 0;
2801 b304db33 2018-05-20 stsp char *line;
2802 f26dddb7 2019-11-08 stsp struct tog_color *tc;
2803 b304db33 2018-05-20 stsp size_t len;
2804 61e69b96 2018-05-20 stsp wchar_t *wline;
2805 e0b650dd 2018-05-20 stsp int width;
2807 26ed57b2 2018-05-19 stsp rewind(f);
2808 f7d12f7e 2018-08-01 stsp werase(view->window);
2810 a3404814 2018-09-02 stsp if (header) {
2811 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
2812 a3404814 2018-09-02 stsp if (err) {
2813 a3404814 2018-09-02 stsp return err;
2816 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2817 a3404814 2018-09-02 stsp wstandout(view->window);
2818 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2819 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2820 a3404814 2018-09-02 stsp wstandend(view->window);
2821 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2822 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2824 a3404814 2018-09-02 stsp if (max_lines <= 1)
2825 a3404814 2018-09-02 stsp return NULL;
2826 a3404814 2018-09-02 stsp max_lines--;
2830 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2831 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2832 26ed57b2 2018-05-19 stsp if (line == NULL) {
2836 f44b1f58 2020-02-02 tracey if (++lineno < *first_displayed_line) {
2837 26ed57b2 2018-05-19 stsp free(line);
2841 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2842 61e69b96 2018-05-20 stsp if (err) {
2843 61e69b96 2018-05-20 stsp free(line);
2844 61e69b96 2018-05-20 stsp return err;
2847 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
2849 f26dddb7 2019-11-08 stsp wattr_on(view->window,
2850 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2851 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2853 6d17833f 2019-11-08 stsp wattr_off(view->window,
2854 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2855 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2856 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2857 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2858 f44b1f58 2020-02-02 tracey *first_displayed_line = lineno;
2859 26ed57b2 2018-05-19 stsp free(line);
2860 2550e4c3 2018-07-13 stsp free(wline);
2861 2550e4c3 2018-07-13 stsp wline = NULL;
2863 f44b1f58 2020-02-02 tracey *last_displayed_line = lineno;
2865 1a57306a 2018-09-02 stsp view_vborder(view);
2867 c3e9aa98 2019-05-13 jcs if (*eof) {
2868 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2869 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2870 c3e9aa98 2019-05-13 jcs nprinted++;
2873 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2875 c3e9aa98 2019-05-13 jcs return err;
2878 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2879 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2880 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2883 26ed57b2 2018-05-19 stsp return NULL;
2886 abd2672a 2018-12-23 stsp static char *
2887 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2889 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2890 09867e48 2019-08-13 stsp char *p, *s;
2892 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2893 09867e48 2019-08-13 stsp if (tm == NULL)
2894 09867e48 2019-08-13 stsp return NULL;
2895 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2896 09867e48 2019-08-13 stsp if (s == NULL)
2897 09867e48 2019-08-13 stsp return NULL;
2898 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2900 abd2672a 2018-12-23 stsp *p = '\0';
2904 4ed7e80c 2018-05-20 stsp static const struct got_error *
2905 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
2906 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
2908 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
2909 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2910 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2911 0208f208 2020-05-05 stsp struct got_object_qid *qid;
2913 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2914 0208f208 2020-05-05 stsp if (qid != NULL) {
2915 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
2916 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
2919 0208f208 2020-05-05 stsp return err;
2921 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
2922 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
2926 0208f208 2020-05-05 stsp if (tree_id1) {
2927 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2929 0208f208 2020-05-05 stsp goto done;
2932 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
2933 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2935 0208f208 2020-05-05 stsp goto done;
2937 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
2938 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
2940 0208f208 2020-05-05 stsp if (tree1)
2941 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
2942 0208f208 2020-05-05 stsp if (tree2)
2943 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
2944 0208f208 2020-05-05 stsp return err;
2947 0208f208 2020-05-05 stsp static const struct got_error *
2948 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2949 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2951 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2952 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
2953 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2954 5943eee2 2019-08-13 stsp char *id_str = NULL, *logmsg = NULL;
2955 45d799e2 2018-12-23 stsp time_t committer_time;
2956 45d799e2 2018-12-23 stsp const char *author, *committer;
2957 8b473291 2019-02-21 stsp char *refs_str = NULL;
2958 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
2959 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
2961 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
2963 8b473291 2019-02-21 stsp if (refs) {
2964 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
2966 8b473291 2019-02-21 stsp return err;
2969 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2971 abd2672a 2018-12-23 stsp return err;
2973 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2974 15a94983 2018-12-23 stsp if (err) {
2975 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2976 15a94983 2018-12-23 stsp goto done;
2979 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2980 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2981 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2982 abd2672a 2018-12-23 stsp goto done;
2984 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2985 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2986 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2987 abd2672a 2018-12-23 stsp goto done;
2989 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2990 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
2991 09867e48 2019-08-13 stsp if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2992 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2993 abd2672a 2018-12-23 stsp goto done;
2995 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2996 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2997 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2998 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2999 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3000 abd2672a 2018-12-23 stsp goto done;
3002 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
3004 5943eee2 2019-08-13 stsp goto done;
3005 5943eee2 2019-08-13 stsp if (fprintf(outfile, "%s\n", logmsg) < 0) {
3006 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3007 abd2672a 2018-12-23 stsp goto done;
3009 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3011 0208f208 2020-05-05 stsp goto done;
3012 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3013 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3014 0208f208 2020-05-05 stsp fprintf(outfile, "%c %s\n", cp->status, pe->path);
3015 0208f208 2020-05-05 stsp free((char *)pe->path);
3016 0208f208 2020-05-05 stsp free(pe->data);
3018 0208f208 2020-05-05 stsp fputc('\n', outfile);
3020 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3021 abd2672a 2018-12-23 stsp free(id_str);
3022 5943eee2 2019-08-13 stsp free(logmsg);
3023 8b473291 2019-02-21 stsp free(refs_str);
3024 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3025 abd2672a 2018-12-23 stsp return err;
3028 f44b1f58 2020-02-02 tracey const struct got_error *
3029 f44b1f58 2020-02-02 tracey get_filestream_info(size_t *filesize, int *nlines, off_t **line_offsets,
3030 f44b1f58 2020-02-02 tracey FILE *infile)
3032 7510f233 2020-08-09 stsp const struct got_error *err = NULL;
3033 ae6a6978 2020-08-09 stsp size_t len, remain;
3034 ae6a6978 2020-08-09 stsp char buf[32768];
3036 ae6a6978 2020-08-09 stsp size_t nalloc = 0;
3037 f44b1f58 2020-02-02 tracey off_t off = 0;
3039 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3040 ae6a6978 2020-08-09 stsp *filesize = 0;
3041 ae6a6978 2020-08-09 stsp *nlines = 0;
3043 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_END) == -1)
3044 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
3045 f44b1f58 2020-02-02 tracey len = ftell(infile) + 1;
3046 f44b1f58 2020-02-02 tracey if (ferror(infile))
3047 f44b1f58 2020-02-02 tracey return got_error_from_errno("ftell");
3048 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_SET) == -1)
3049 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
3051 f44b1f58 2020-02-02 tracey if (len == 0)
3052 f44b1f58 2020-02-02 tracey return NULL;
3054 ae6a6978 2020-08-09 stsp remain = len;
3055 ae6a6978 2020-08-09 stsp while (remain > 0) {
3056 ae6a6978 2020-08-09 stsp size_t r, n = MIN(remain, sizeof(buf));
3057 ae6a6978 2020-08-09 stsp r = fread(buf, 1, n, infile);
3058 ae6a6978 2020-08-09 stsp if (r == 0) {
3059 ae6a6978 2020-08-09 stsp if (ferror(infile)) {
3060 ae6a6978 2020-08-09 stsp err = got_error_from_errno("fread");
3061 ae6a6978 2020-08-09 stsp goto done;
3066 ae6a6978 2020-08-09 stsp remain -= r;
3068 f44b1f58 2020-02-02 tracey if (*line_offsets == NULL) {
3069 f44b1f58 2020-02-02 tracey /* Have some data but perhaps no '\n'. */
3070 ae6a6978 2020-08-09 stsp *nlines = 1;
3071 ae6a6978 2020-08-09 stsp nalloc = len / 40; /* 40-char average line length */
3072 ae6a6978 2020-08-09 stsp *line_offsets = calloc(nalloc, sizeof(**line_offsets));
3073 369eef86 2020-08-09 tracey if (*line_offsets == NULL) {
3074 7510f233 2020-08-09 stsp err = got_error_from_errno("calloc");
3075 7510f233 2020-08-09 stsp goto done;
3077 f44b1f58 2020-02-02 tracey /* Skip forward over end of first line. */
3078 f44b1f58 2020-02-02 tracey while (i < len) {
3079 f44b1f58 2020-02-02 tracey if (buf[i] == '\n')
3085 f44b1f58 2020-02-02 tracey /* Scan '\n' offsets in remaining chunk of data. */
3086 ae6a6978 2020-08-09 stsp while (i < r) {
3087 f44b1f58 2020-02-02 tracey if (buf[i] != '\n') {
3089 f44b1f58 2020-02-02 tracey continue;
3091 f44b1f58 2020-02-02 tracey (*nlines)++;
3092 ae6a6978 2020-08-09 stsp if (nalloc < *nlines) {
3093 ae6a6978 2020-08-09 stsp size_t nallocnew = *nlines + (remain / 40);
3094 f44b1f58 2020-02-02 tracey off_t *o = recallocarray(*line_offsets,
3095 ae6a6978 2020-08-09 stsp nalloc, nallocnew, sizeof(**line_offsets));
3096 f44b1f58 2020-02-02 tracey if (o == NULL) {
3097 7510f233 2020-08-09 stsp err = got_error_from_errno(
3098 f44b1f58 2020-02-02 tracey "recallocarray");
3099 7510f233 2020-08-09 stsp goto done;
3101 f44b1f58 2020-02-02 tracey *line_offsets = o;
3102 ae6a6978 2020-08-09 stsp nalloc = nallocnew;
3104 f44b1f58 2020-02-02 tracey off = i + 1;
3105 f44b1f58 2020-02-02 tracey (*line_offsets)[*nlines - 1] = off;
3110 369eef86 2020-08-09 tracey if (fflush(infile) != 0) {
3111 7510f233 2020-08-09 stsp err = got_error_from_errno("fflush");
3112 7510f233 2020-08-09 stsp goto done;
3114 f44b1f58 2020-02-02 tracey rewind(infile);
3116 ae6a6978 2020-08-09 stsp *filesize = len;
3118 7510f233 2020-08-09 stsp if (err) {
3119 ae6a6978 2020-08-09 stsp free(*line_offsets);
3120 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3121 ae6a6978 2020-08-09 stsp *filesize = 0;
3122 ae6a6978 2020-08-09 stsp *nlines = 0;
3124 f44b1f58 2020-02-02 tracey return NULL;
3127 abd2672a 2018-12-23 stsp static const struct got_error *
3128 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
3130 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
3131 48ae06ee 2018-10-18 stsp FILE *f = NULL;
3132 15a94983 2018-12-23 stsp int obj_type;
3134 511a516b 2018-05-19 stsp f = got_opentemp();
3135 48ae06ee 2018-10-18 stsp if (f == NULL) {
3136 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3137 48ae06ee 2018-10-18 stsp goto done;
3139 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
3140 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3141 fb43ecf1 2019-02-11 stsp goto done;
3145 15a94983 2018-12-23 stsp if (s->id1)
3146 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3148 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3150 15a94983 2018-12-23 stsp goto done;
3152 15a94983 2018-12-23 stsp switch (obj_type) {
3153 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3154 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
3155 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3157 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3158 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
3159 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3161 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3162 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3163 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3164 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3166 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3168 3ffacbe1 2020-02-02 tracey goto done;
3169 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3170 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3171 0208f208 2020-05-05 stsp err = write_commit_info(s->id2, s->refs, s->repo, s->f);
3172 f44b1f58 2020-02-02 tracey if (err)
3173 f44b1f58 2020-02-02 tracey goto done;
3174 f44b1f58 2020-02-02 tracey } else {
3175 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3176 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3177 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
3178 f44b1f58 2020-02-02 tracey err = write_commit_info(s->id2, s->refs,
3179 f44b1f58 2020-02-02 tracey s->repo, s->f);
3180 f44b1f58 2020-02-02 tracey if (err)
3181 f44b1f58 2020-02-02 tracey goto done;
3186 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3188 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
3189 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3193 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3196 f44b1f58 2020-02-02 tracey if (err)
3197 f44b1f58 2020-02-02 tracey goto done;
3198 f44b1f58 2020-02-02 tracey err = get_filestream_info(&s->filesize, &s->nlines, &s->line_offsets,
3201 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3202 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3203 48ae06ee 2018-10-18 stsp return err;
3206 f5215bb9 2019-02-22 stsp static void
3207 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3209 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3210 f5215bb9 2019-02-22 stsp update_panels();
3211 f5215bb9 2019-02-22 stsp doupdate();
3214 f44b1f58 2020-02-02 tracey static const struct got_error *
3215 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3217 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3219 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3220 f44b1f58 2020-02-02 tracey return NULL;
3223 f44b1f58 2020-02-02 tracey static const struct got_error *
3224 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3226 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3227 f44b1f58 2020-02-02 tracey int lineno;
3229 f44b1f58 2020-02-02 tracey if (!view->searching) {
3230 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3231 f44b1f58 2020-02-02 tracey return NULL;
3234 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3235 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3236 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3238 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3239 f44b1f58 2020-02-02 tracey } else {
3240 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3241 f44b1f58 2020-02-02 tracey lineno = 1;
3243 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3246 f44b1f58 2020-02-02 tracey while (1) {
3247 f44b1f58 2020-02-02 tracey char *line = NULL;
3248 f44b1f58 2020-02-02 tracey off_t offset;
3249 f44b1f58 2020-02-02 tracey size_t len;
3251 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3252 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3253 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3254 f44b1f58 2020-02-02 tracey free(line);
3258 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3259 f44b1f58 2020-02-02 tracey lineno = 1;
3261 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3264 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3265 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3266 f44b1f58 2020-02-02 tracey free(line);
3267 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3269 f44b1f58 2020-02-02 tracey free(line);
3270 f44b1f58 2020-02-02 tracey line = parse_next_line(s->f, &len);
3271 f44b1f58 2020-02-02 tracey if (line && match_line(line, &view->regex)) {
3272 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3273 f44b1f58 2020-02-02 tracey s->matched_line = lineno;
3274 f44b1f58 2020-02-02 tracey free(line);
3277 f44b1f58 2020-02-02 tracey free(line);
3278 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3279 f44b1f58 2020-02-02 tracey lineno++;
3281 f44b1f58 2020-02-02 tracey lineno--;
3284 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3285 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3286 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3289 f44b1f58 2020-02-02 tracey return NULL;
3292 48ae06ee 2018-10-18 stsp static const struct got_error *
3293 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3294 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
3295 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
3297 48ae06ee 2018-10-18 stsp const struct got_error *err;
3298 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3300 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3301 15a94983 2018-12-23 stsp int type1, type2;
3302 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3304 15a94983 2018-12-23 stsp return err;
3305 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3307 15a94983 2018-12-23 stsp return err;
3309 15a94983 2018-12-23 stsp if (type1 != type2)
3310 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3312 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3313 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3314 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3315 f44b1f58 2020-02-02 tracey s->repo = repo;
3316 f44b1f58 2020-02-02 tracey s->refs = refs;
3317 f44b1f58 2020-02-02 tracey s->id1 = id1;
3318 f44b1f58 2020-02-02 tracey s->id2 = id2;
3320 15a94983 2018-12-23 stsp if (id1) {
3321 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3322 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3323 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3325 5465d566 2020-02-01 tracey s->id1 = NULL;
3327 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3328 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3329 5465d566 2020-02-01 tracey free(s->id1);
3330 5465d566 2020-02-01 tracey s->id1 = NULL;
3331 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3333 5465d566 2020-02-01 tracey s->f = NULL;
3334 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3335 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3336 5465d566 2020-02-01 tracey s->diff_context = 3;
3337 5465d566 2020-02-01 tracey s->log_view = log_view;
3338 5465d566 2020-02-01 tracey s->repo = repo;
3339 5465d566 2020-02-01 tracey s->refs = refs;
3341 f44b1f58 2020-02-02 tracey SIMPLEQ_INIT(&s->colors);
3342 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3343 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3344 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3345 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3347 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_PLUS,
3350 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
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;
3355 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3356 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3357 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3358 6d17833f 2019-11-08 stsp if (err) {
3359 5465d566 2020-02-01 tracey free_colors(&s->colors);
3360 6d17833f 2019-11-08 stsp return err;
3363 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3364 528c17dd 2020-07-31 stsp "^(commit [0-9a-f]|(blob|file) [-+] |[MDmA] [^ ])",
3365 0208f208 2020-05-05 stsp TOG_COLOR_DIFF_META,
3366 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3367 6d17833f 2019-11-08 stsp if (err) {
3368 5465d566 2020-02-01 tracey free_colors(&s->colors);
3369 6d17833f 2019-11-08 stsp return err;
3372 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3373 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3374 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3375 11b20872 2019-11-08 stsp if (err) {
3376 5465d566 2020-02-01 tracey free_colors(&s->colors);
3377 11b20872 2019-11-08 stsp return err;
3380 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3381 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3382 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3383 11b20872 2019-11-08 stsp if (err) {
3384 5465d566 2020-02-01 tracey free_colors(&s->colors);
3385 11b20872 2019-11-08 stsp return err;
3389 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3390 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3391 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3393 5465d566 2020-02-01 tracey err = create_diff(s);
3394 48ae06ee 2018-10-18 stsp if (err) {
3395 5465d566 2020-02-01 tracey free(s->id1);
3396 5465d566 2020-02-01 tracey s->id1 = NULL;
3397 5465d566 2020-02-01 tracey free(s->id2);
3398 5465d566 2020-02-01 tracey s->id2 = NULL;
3399 48ae06ee 2018-10-18 stsp return err;
3402 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3403 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3404 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3405 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3406 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3408 5dc9f4bc 2018-08-04 stsp return NULL;
3411 e5a0f69f 2018-08-18 stsp static const struct got_error *
3412 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
3414 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3415 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3417 5465d566 2020-02-01 tracey free(s->id1);
3418 5465d566 2020-02-01 tracey s->id1 = NULL;
3419 5465d566 2020-02-01 tracey free(s->id2);
3420 5465d566 2020-02-01 tracey s->id2 = NULL;
3421 5465d566 2020-02-01 tracey if (s->f && fclose(s->f) == EOF)
3422 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3423 5465d566 2020-02-01 tracey free_colors(&s->colors);
3424 f44b1f58 2020-02-02 tracey free(s->line_offsets);
3425 e5a0f69f 2018-08-18 stsp return err;
3428 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3429 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3431 a3404814 2018-09-02 stsp const struct got_error *err;
3432 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3433 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3435 a3404814 2018-09-02 stsp if (s->id1) {
3436 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3438 a3404814 2018-09-02 stsp return err;
3440 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3442 a3404814 2018-09-02 stsp return err;
3444 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
3445 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3446 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3447 a3404814 2018-09-02 stsp free(id_str1);
3448 a3404814 2018-09-02 stsp free(id_str2);
3449 a3404814 2018-09-02 stsp return err;
3451 a3404814 2018-09-02 stsp free(id_str1);
3452 a3404814 2018-09-02 stsp free(id_str2);
3454 f44b1f58 2020-02-02 tracey return draw_file(view, s->f, &s->first_displayed_line, s->nlines,
3455 f44b1f58 2020-02-02 tracey s->selected_line, view->nlines, &s->last_displayed_line, &s->eof,
3456 bddb1296 2019-11-08 stsp header, &s->colors);
3459 15a087fe 2019-02-21 stsp static const struct got_error *
3460 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3461 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3463 d7a04538 2019-02-21 stsp const struct got_error *err;
3464 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3465 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3466 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3468 15a087fe 2019-02-21 stsp free(s->id2);
3469 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3470 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3471 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3473 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3475 d7a04538 2019-02-21 stsp return err;
3476 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3477 15a087fe 2019-02-21 stsp free(s->id1);
3478 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
3479 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3480 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3481 15a087fe 2019-02-21 stsp return NULL;
3484 0cf4efb1 2018-09-29 stsp static const struct got_error *
3485 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3486 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3488 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3489 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3490 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3491 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
3494 e5a0f69f 2018-08-18 stsp switch (ch) {
3496 1e37a5c2 2019-05-12 jcs case KEY_UP:
3497 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
3498 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3500 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3501 a60a9dc4 2019-05-13 jcs case CTRL('b'):
3502 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
3505 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
3506 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3507 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3510 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3511 1e37a5c2 2019-05-12 jcs if (!s->eof)
3512 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3514 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3515 a60a9dc4 2019-05-13 jcs case CTRL('f'):
3517 00ba99a7 2019-05-12 jcs if (s->eof)
3520 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
3521 1e37a5c2 2019-05-12 jcs char *line;
3522 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
3523 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3524 1e37a5c2 2019-05-12 jcs if (line == NULL)
3529 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
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);
3536 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3537 1e37a5c2 2019-05-12 jcs s->diff_context++;
3538 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3539 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3544 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3546 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3547 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
3548 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
3549 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3552 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3557 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3561 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3562 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3564 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3565 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3569 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3571 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3573 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3574 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
3575 7c1452c1 2020-03-26 stsp err = trigger_log_thread(s->log_view, 1,
3576 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
3577 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
3578 7c1452c1 2020-03-26 stsp &ls->thread_args.need_commits,
3579 7c1452c1 2020-03-26 stsp &ls->thread_args.commit_loaded);
3583 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3588 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
3589 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3592 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3596 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3597 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3599 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3600 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3606 bcbd79e2 2018-08-19 stsp return err;
3609 4ed7e80c 2018-05-20 stsp static const struct got_error *
3610 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
3612 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
3613 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
3614 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
3615 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3616 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3617 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
3618 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
3620 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
3622 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3624 26ed57b2 2018-05-19 stsp #ifndef PROFILE
3625 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3626 eb6600df 2019-01-04 stsp NULL) == -1)
3627 26ed57b2 2018-05-19 stsp err(1, "pledge");
3630 09b5bff8 2020-02-23 naddy while ((ch = getopt(argc, argv, "r:")) != -1) {
3631 26ed57b2 2018-05-19 stsp switch (ch) {
3632 09b5bff8 2020-02-23 naddy case 'r':
3633 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
3634 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
3635 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
3639 17020d27 2019-03-07 stsp usage_diff();
3640 26ed57b2 2018-05-19 stsp /* NOTREACHED */
3644 26ed57b2 2018-05-19 stsp argc -= optind;
3645 26ed57b2 2018-05-19 stsp argv += optind;
3647 26ed57b2 2018-05-19 stsp if (argc == 0) {
3648 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
3649 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
3650 15a94983 2018-12-23 stsp id_str1 = argv[0];
3651 15a94983 2018-12-23 stsp id_str2 = argv[1];
3653 26ed57b2 2018-05-19 stsp usage_diff();
3655 a273ac94 2020-02-23 naddy cwd = getcwd(NULL, 0);
3656 a273ac94 2020-02-23 naddy if (cwd == NULL)
3657 a273ac94 2020-02-23 naddy return got_error_from_errno("getcwd");
3659 a273ac94 2020-02-23 naddy error = got_worktree_open(&worktree, cwd);
3660 a273ac94 2020-02-23 naddy if (error && error->code != GOT_ERR_NOT_WORKTREE)
3661 a273ac94 2020-02-23 naddy goto done;
3663 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3664 a273ac94 2020-02-23 naddy if (worktree)
3665 a273ac94 2020-02-23 naddy repo_path =
3666 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
3668 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
3670 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3671 a273ac94 2020-02-23 naddy error = got_error_from_errno("strdup");
3672 a273ac94 2020-02-23 naddy goto done;
3675 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3676 eb6600df 2019-01-04 stsp if (error)
3677 eb6600df 2019-01-04 stsp goto done;
3679 a273ac94 2020-02-23 naddy init_curses();
3681 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3682 26ed57b2 2018-05-19 stsp if (error)
3683 26ed57b2 2018-05-19 stsp goto done;
3685 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
3686 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3687 26ed57b2 2018-05-19 stsp if (error)
3688 26ed57b2 2018-05-19 stsp goto done;
3690 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
3691 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3692 26ed57b2 2018-05-19 stsp if (error)
3693 26ed57b2 2018-05-19 stsp goto done;
3695 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3696 8b473291 2019-02-21 stsp if (error)
3697 8b473291 2019-02-21 stsp goto done;
3699 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3700 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3701 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3702 ea5e7bb5 2018-08-01 stsp goto done;
3704 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3705 5dc9f4bc 2018-08-04 stsp if (error)
3706 5dc9f4bc 2018-08-04 stsp goto done;
3707 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3709 c02c541e 2019-03-29 stsp free(repo_path);
3710 a273ac94 2020-02-23 naddy free(cwd);
3712 921be706 2019-06-28 stsp got_repo_close(repo);
3713 a273ac94 2020-02-23 naddy if (worktree)
3714 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
3715 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3716 26ed57b2 2018-05-19 stsp return error;
3719 4ed7e80c 2018-05-20 stsp __dead static void
3720 9f7d7167 2018-04-29 stsp usage_blame(void)
3723 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3724 9f7d7167 2018-04-29 stsp getprogname());
3728 84451b3e 2018-07-10 stsp struct tog_blame_line {
3729 84451b3e 2018-07-10 stsp int annotated;
3730 84451b3e 2018-07-10 stsp struct got_object_id *id;
3733 4ed7e80c 2018-05-20 stsp static const struct got_error *
3734 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3735 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
3736 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
3737 11b20872 2019-11-08 stsp int *last_displayed_line, int *eof, int max_lines,
3738 11b20872 2019-11-08 stsp struct tog_colors *colors)
3740 84451b3e 2018-07-10 stsp const struct got_error *err;
3741 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3742 84451b3e 2018-07-10 stsp char *line;
3743 84451b3e 2018-07-10 stsp size_t len;
3744 84451b3e 2018-07-10 stsp wchar_t *wline;
3745 27a741e5 2019-09-11 stsp int width;
3746 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3747 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3748 ab089a2a 2018-07-12 stsp char *id_str;
3749 11b20872 2019-11-08 stsp struct tog_color *tc;
3751 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
3753 ab089a2a 2018-07-12 stsp return err;
3755 84451b3e 2018-07-10 stsp rewind(f);
3756 f7d12f7e 2018-08-01 stsp werase(view->window);
3758 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3759 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3760 ab089a2a 2018-07-12 stsp free(id_str);
3761 ab089a2a 2018-07-12 stsp return err;
3764 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3765 ab089a2a 2018-07-12 stsp free(line);
3766 2550e4c3 2018-07-13 stsp line = NULL;
3768 1cae65b4 2019-09-22 stsp return err;
3769 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3770 a3404814 2018-09-02 stsp wstandout(view->window);
3771 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3773 11b20872 2019-11-08 stsp wattr_on(view->window,
3774 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3775 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3777 11b20872 2019-11-08 stsp wattr_off(view->window,
3778 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3779 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3780 a3404814 2018-09-02 stsp wstandend(view->window);
3781 2550e4c3 2018-07-13 stsp free(wline);
3782 2550e4c3 2018-07-13 stsp wline = NULL;
3783 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3784 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3786 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3787 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
3788 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
3789 ab089a2a 2018-07-12 stsp free(id_str);
3790 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3792 ab089a2a 2018-07-12 stsp free(id_str);
3793 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3794 3f60a8ef 2018-07-10 stsp free(line);
3795 2550e4c3 2018-07-13 stsp line = NULL;
3797 3f60a8ef 2018-07-10 stsp return err;
3798 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3799 2550e4c3 2018-07-13 stsp free(wline);
3800 2550e4c3 2018-07-13 stsp wline = NULL;
3801 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3802 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3805 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
3806 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
3807 84451b3e 2018-07-10 stsp if (line == NULL) {
3811 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
3812 84451b3e 2018-07-10 stsp free(line);
3816 27a741e5 2019-09-11 stsp if (view->ncols <= 9) {
3817 27a741e5 2019-09-11 stsp width = 9;
3818 27a741e5 2019-09-11 stsp wline = wcsdup(L"");
3819 27a741e5 2019-09-11 stsp if (wline == NULL)
3820 27a741e5 2019-09-11 stsp err = got_error_from_errno("wcsdup");
3822 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line,
3823 27a741e5 2019-09-11 stsp view->ncols - 9, 9);
3824 27a741e5 2019-09-11 stsp width += 9;
3826 84451b3e 2018-07-10 stsp if (err) {
3827 84451b3e 2018-07-10 stsp free(line);
3828 84451b3e 2018-07-10 stsp return err;
3831 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3832 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3834 8d0fe45a 2019-08-12 stsp if (nlines > 0) {
3835 8d0fe45a 2019-08-12 stsp blame_line = &lines[lineno - 1];
3836 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3837 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3838 27a741e5 2019-09-11 stsp !(view->focussed &&
3839 27a741e5 2019-09-11 stsp nprinted == selected_line - 1)) {
3840 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3841 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3842 8d0fe45a 2019-08-12 stsp char *id_str;
3843 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3844 8d0fe45a 2019-08-12 stsp if (err) {
3845 8d0fe45a 2019-08-12 stsp free(line);
3846 8d0fe45a 2019-08-12 stsp free(wline);
3847 8d0fe45a 2019-08-12 stsp return err;
3849 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3851 11b20872 2019-11-08 stsp wattr_on(view->window,
3852 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3853 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3855 11b20872 2019-11-08 stsp wattr_off(view->window,
3856 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3857 8d0fe45a 2019-08-12 stsp free(id_str);
3858 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3860 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3861 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3864 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3865 ee41ec32 2018-07-10 stsp prev_id = NULL;
3868 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3869 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3870 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3872 27a741e5 2019-09-11 stsp waddwstr(view->window, wline);
3873 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
3874 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
3875 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3876 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3877 84451b3e 2018-07-10 stsp free(line);
3878 2550e4c3 2018-07-13 stsp free(wline);
3879 2550e4c3 2018-07-13 stsp wline = NULL;
3881 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3883 1a57306a 2018-09-02 stsp view_vborder(view);
3885 84451b3e 2018-07-10 stsp return NULL;
3888 84451b3e 2018-07-10 stsp static const struct got_error *
3889 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3891 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3892 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3893 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3894 1a76625f 2018-10-22 stsp int errcode;
3896 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3897 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3898 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3900 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3901 1a76625f 2018-10-22 stsp if (errcode)
3902 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3904 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3905 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3906 d68a0a7d 2018-07-10 stsp goto done;
3909 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3910 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3912 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3913 d68a0a7d 2018-07-10 stsp if (line->annotated)
3914 d68a0a7d 2018-07-10 stsp goto done;
3916 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3917 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3918 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3919 84451b3e 2018-07-10 stsp goto done;
3921 84451b3e 2018-07-10 stsp line->annotated = 1;
3923 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3924 1a76625f 2018-10-22 stsp if (errcode)
3925 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3926 84451b3e 2018-07-10 stsp return err;
3929 84451b3e 2018-07-10 stsp static void *
3930 84451b3e 2018-07-10 stsp blame_thread(void *arg)
3932 18430de3 2018-07-10 stsp const struct got_error *err;
3933 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
3934 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
3935 1a76625f 2018-10-22 stsp int errcode;
3937 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
3939 61266923 2020-01-14 stsp return (void *)err;
3941 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
3942 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3943 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
3944 fc06ba56 2019-08-22 stsp err = NULL;
3946 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3947 1a76625f 2018-10-22 stsp if (errcode)
3948 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
3949 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3951 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
3952 c9beca56 2018-07-22 stsp ta->repo = NULL;
3953 c9beca56 2018-07-22 stsp *ta->complete = 1;
3955 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3956 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
3957 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3959 18430de3 2018-07-10 stsp return (void *)err;
3962 245d91c1 2018-07-12 stsp static struct got_object_id *
3963 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3964 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
3966 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
3968 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
3969 8d0fe45a 2019-08-12 stsp return NULL;
3971 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
3972 245d91c1 2018-07-12 stsp if (!line->annotated)
3973 245d91c1 2018-07-12 stsp return NULL;
3975 245d91c1 2018-07-12 stsp return line->id;
3978 b880a918 2018-07-10 stsp static const struct got_error *
3979 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
3981 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
3984 245d91c1 2018-07-12 stsp if (blame->thread) {
3985 1a76625f 2018-10-22 stsp int errcode;
3986 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&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_unlock");
3990 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
3991 1a76625f 2018-10-22 stsp if (errcode)
3992 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
3993 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3994 1a76625f 2018-10-22 stsp if (errcode)
3995 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3996 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3997 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
3998 245d91c1 2018-07-12 stsp err = NULL;
3999 245d91c1 2018-07-12 stsp blame->thread = NULL;
4001 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
4002 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
4003 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
4005 245d91c1 2018-07-12 stsp if (blame->f) {
4006 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
4007 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4008 245d91c1 2018-07-12 stsp blame->f = NULL;
4010 57670559 2018-12-23 stsp if (blame->lines) {
4011 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
4012 57670559 2018-12-23 stsp free(blame->lines[i].id);
4013 57670559 2018-12-23 stsp free(blame->lines);
4014 57670559 2018-12-23 stsp blame->lines = NULL;
4016 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
4017 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
4019 245d91c1 2018-07-12 stsp return err;
4022 245d91c1 2018-07-12 stsp static const struct got_error *
4023 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
4025 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
4026 fc06ba56 2019-08-22 stsp int *done = arg;
4027 fc06ba56 2019-08-22 stsp int errcode;
4029 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4030 fc06ba56 2019-08-22 stsp if (errcode)
4031 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4032 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
4034 fc06ba56 2019-08-22 stsp if (*done)
4035 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
4037 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4038 fc06ba56 2019-08-22 stsp if (errcode)
4039 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4040 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
4042 fc06ba56 2019-08-22 stsp return err;
4045 fc06ba56 2019-08-22 stsp static const struct got_error *
4046 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
4047 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
4048 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
4049 245d91c1 2018-07-12 stsp struct got_repository *repo)
4051 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
4052 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
4053 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
4054 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
4055 15a94983 2018-12-23 stsp int obj_type;
4057 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
4059 15a94983 2018-12-23 stsp return err;
4061 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
4063 84451b3e 2018-07-10 stsp goto done;
4065 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4066 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
4067 84451b3e 2018-07-10 stsp goto done;
4070 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4072 a70480e0 2018-06-23 stsp goto done;
4073 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
4074 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
4075 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
4076 84451b3e 2018-07-10 stsp goto done;
4078 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4079 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
4080 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
4081 84451b3e 2018-07-10 stsp goto done;
4083 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4084 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4085 b02560ec 2019-08-19 stsp blame->nlines--;
4087 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4088 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
4089 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4090 84451b3e 2018-07-10 stsp goto done;
4093 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
4095 bd24772e 2018-07-11 stsp goto done;
4097 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
4098 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
4099 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
4100 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
4101 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
4102 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4103 245d91c1 2018-07-12 stsp goto done;
4105 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
4107 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
4108 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
4109 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
4110 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
4111 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
4112 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_arg = done;
4113 245d91c1 2018-07-12 stsp *blame_complete = 0;
4117 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
4118 27d434c2 2018-09-15 stsp free(obj_id);
4120 245d91c1 2018-07-12 stsp stop_blame(blame);
4121 245d91c1 2018-07-12 stsp return err;
4124 245d91c1 2018-07-12 stsp static const struct got_error *
4125 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
4126 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4127 8b473291 2019-02-21 stsp struct got_repository *repo)
4129 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
4130 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4132 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
4134 c4843652 2019-08-12 stsp s->path = strdup(path);
4135 c4843652 2019-08-12 stsp if (s->path == NULL)
4136 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4138 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4139 c4843652 2019-08-12 stsp if (err) {
4140 c4843652 2019-08-12 stsp free(s->path);
4141 7cbe629d 2018-08-04 stsp return err;
4144 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4145 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4146 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4147 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4148 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4149 fb2756b9 2018-08-04 stsp s->repo = repo;
4150 8b473291 2019-02-21 stsp s->refs = refs;
4151 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4152 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4154 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4155 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4156 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4157 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4159 11b20872 2019-11-08 stsp return err;
4162 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4163 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4164 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4165 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4166 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4168 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
4169 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
4170 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
4171 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
4174 e5a0f69f 2018-08-18 stsp static const struct got_error *
4175 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4177 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4178 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4180 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4181 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4183 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4184 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4185 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4186 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4187 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4190 e5a0f69f 2018-08-18 stsp free(s->path);
4191 11b20872 2019-11-08 stsp free_colors(&s->colors);
4193 e5a0f69f 2018-08-18 stsp return err;
4196 7cbe629d 2018-08-04 stsp static const struct got_error *
4197 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4199 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4201 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4202 6c4c42e0 2019-06-24 stsp return NULL;
4205 6c4c42e0 2019-06-24 stsp static const struct got_error *
4206 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4208 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4209 6c4c42e0 2019-06-24 stsp int lineno;
4211 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4212 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4213 6c4c42e0 2019-06-24 stsp return NULL;
4216 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4217 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4218 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4220 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4222 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4223 6c4c42e0 2019-06-24 stsp lineno = 1;
4225 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4228 6c4c42e0 2019-06-24 stsp while (1) {
4229 6c4c42e0 2019-06-24 stsp char *line = NULL;
4230 6c4c42e0 2019-06-24 stsp off_t offset;
4231 6c4c42e0 2019-06-24 stsp size_t len;
4233 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4234 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4235 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4236 6c4c42e0 2019-06-24 stsp free(line);
4240 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4241 6c4c42e0 2019-06-24 stsp lineno = 1;
4243 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4246 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4247 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4248 6c4c42e0 2019-06-24 stsp free(line);
4249 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4251 6c4c42e0 2019-06-24 stsp free(line);
4252 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
4253 2246482e 2019-06-25 stsp if (line && match_line(line, &view->regex)) {
4254 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4255 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
4256 6c4c42e0 2019-06-24 stsp free(line);
4259 6c4c42e0 2019-06-24 stsp free(line);
4260 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4266 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4267 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4268 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4271 6c4c42e0 2019-06-24 stsp return NULL;
4274 6c4c42e0 2019-06-24 stsp static const struct got_error *
4275 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4277 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4278 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4279 2b380cc8 2018-10-24 stsp int errcode;
4281 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
4282 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4283 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4284 2b380cc8 2018-10-24 stsp if (errcode)
4285 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4287 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4290 51fe7530 2019-08-19 stsp if (s->blame_complete)
4291 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4293 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
4294 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
4295 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
4296 11b20872 2019-11-08 stsp &s->last_displayed_line, &s->eof, view->nlines, &s->colors);
4298 669b5ffa 2018-10-07 stsp view_vborder(view);
4299 e5a0f69f 2018-08-18 stsp return err;
4302 e5a0f69f 2018-08-18 stsp static const struct got_error *
4303 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
4304 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4306 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4307 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4308 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4309 669b5ffa 2018-10-07 stsp int begin_x = 0;
4311 e5a0f69f 2018-08-18 stsp switch (ch) {
4313 1e37a5c2 2019-05-12 jcs s->done = 1;
4316 1e37a5c2 2019-05-12 jcs case KEY_UP:
4317 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4318 1e37a5c2 2019-05-12 jcs s->selected_line--;
4319 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4320 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4321 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4323 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4324 ea025d1d 2020-02-22 naddy case CTRL('b'):
4325 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4326 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
4329 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
4330 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
4331 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
4333 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4336 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4337 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4338 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4339 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4340 1e37a5c2 2019-05-12 jcs s->selected_line++;
4341 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
4342 1e37a5c2 2019-05-12 jcs s->blame.nlines)
4343 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4346 1e37a5c2 2019-05-12 jcs case 'p': {
4347 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4348 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4349 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4350 1e37a5c2 2019-05-12 jcs if (id == NULL)
4352 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
4353 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
4354 15a94983 2018-12-23 stsp struct got_object_qid *pid;
4355 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
4356 1e37a5c2 2019-05-12 jcs int obj_type;
4357 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
4358 1e37a5c2 2019-05-12 jcs s->repo, id);
4361 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
4362 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
4363 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
4364 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4367 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
4368 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
4369 1e37a5c2 2019-05-12 jcs pid->id, s->path);
4370 e5a0f69f 2018-08-18 stsp if (err) {
4371 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
4372 1e37a5c2 2019-05-12 jcs err = NULL;
4373 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4376 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
4378 1e37a5c2 2019-05-12 jcs free(blob_id);
4379 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
4380 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
4381 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4384 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4386 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4388 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
4389 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
4391 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4396 1e37a5c2 2019-05-12 jcs s->done = 1;
4397 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4398 1e37a5c2 2019-05-12 jcs s->done = 0;
4399 1e37a5c2 2019-05-12 jcs if (thread_err)
4401 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4402 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
4403 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4404 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4405 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
4406 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
4411 1e37a5c2 2019-05-12 jcs case 'B': {
4412 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
4413 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
4414 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
4416 1e37a5c2 2019-05-12 jcs s->done = 1;
4417 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4418 1e37a5c2 2019-05-12 jcs s->done = 0;
4419 1e37a5c2 2019-05-12 jcs if (thread_err)
4421 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4422 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
4423 1e37a5c2 2019-05-12 jcs s->blamed_commit =
4424 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
4425 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4426 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4427 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
4428 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
4433 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4434 1e37a5c2 2019-05-12 jcs case '\r': {
4435 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4436 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
4437 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
4438 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4439 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4440 1e37a5c2 2019-05-12 jcs if (id == NULL)
4442 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
4445 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
4446 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
4447 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4448 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4449 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4450 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
4451 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4452 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
4455 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
4456 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
4457 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4459 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4462 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4463 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4466 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
4468 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4471 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
4472 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4474 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
4479 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4480 ea025d1d 2020-02-22 naddy case CTRL('f'):
4482 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4483 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
4484 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
4487 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4488 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
4489 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4490 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4493 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
4494 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
4495 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
4496 1e37a5c2 2019-05-12 jcs view->nlines - 2;
4498 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
4499 1e37a5c2 2019-05-12 jcs s->blame.nlines -
4500 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
4502 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4503 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
4504 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4505 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4511 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
4514 a70480e0 2018-06-23 stsp static const struct got_error *
4515 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
4517 a70480e0 2018-06-23 stsp const struct got_error *error;
4518 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
4519 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4520 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
4521 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4522 0587e10c 2020-07-23 stsp char *link_target = NULL;
4523 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4524 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
4526 e1cd8fed 2018-08-01 stsp struct tog_view *view;
4528 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4530 a70480e0 2018-06-23 stsp #ifndef PROFILE
4531 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4532 8e94dd5b 2019-01-04 stsp NULL) == -1)
4533 a70480e0 2018-06-23 stsp err(1, "pledge");
4536 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4537 a70480e0 2018-06-23 stsp switch (ch) {
4539 a70480e0 2018-06-23 stsp commit_id_str = optarg;
4542 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4543 69069811 2018-08-02 stsp if (repo_path == NULL)
4544 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4548 17020d27 2019-03-07 stsp usage_blame();
4549 a70480e0 2018-06-23 stsp /* NOTREACHED */
4553 a70480e0 2018-06-23 stsp argc -= optind;
4554 a70480e0 2018-06-23 stsp argv += optind;
4556 f135c941 2020-02-20 stsp if (argc != 1)
4557 a70480e0 2018-06-23 stsp usage_blame();
4559 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
4560 6962eb72 2020-02-20 stsp if (cwd == NULL)
4561 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
4563 f135c941 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
4564 f135c941 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4565 f135c941 2020-02-20 stsp goto done;
4567 69069811 2018-08-02 stsp if (repo_path == NULL) {
4568 f135c941 2020-02-20 stsp if (worktree)
4569 eb41ed75 2019-02-05 stsp repo_path =
4570 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4572 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
4574 f135c941 2020-02-20 stsp if (repo_path == NULL) {
4575 f135c941 2020-02-20 stsp error = got_error_from_errno("strdup");
4576 f135c941 2020-02-20 stsp goto done;
4579 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4580 c02c541e 2019-03-29 stsp if (error != NULL)
4581 8e94dd5b 2019-01-04 stsp goto done;
4583 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4584 f135c941 2020-02-20 stsp worktree);
4585 c02c541e 2019-03-29 stsp if (error)
4586 92205607 2019-01-04 stsp goto done;
4588 f135c941 2020-02-20 stsp init_curses();
4590 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4591 eb41ed75 2019-02-05 stsp if (error)
4592 69069811 2018-08-02 stsp goto done;
4594 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
4595 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
4596 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4597 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4598 a70480e0 2018-06-23 stsp if (error != NULL)
4599 66b4983c 2018-06-23 stsp goto done;
4600 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4601 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
4603 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4604 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4606 a19e88aa 2018-06-23 stsp if (error != NULL)
4607 8b473291 2019-02-21 stsp goto done;
4609 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4610 8b473291 2019-02-21 stsp if (error)
4611 a19e88aa 2018-06-23 stsp goto done;
4613 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4614 e1cd8fed 2018-08-01 stsp if (view == NULL) {
4615 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4616 e1cd8fed 2018-08-01 stsp goto done;
4619 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4620 0587e10c 2020-07-23 stsp commit_id, repo);
4621 7cbe629d 2018-08-04 stsp if (error)
4622 7cbe629d 2018-08-04 stsp goto done;
4624 0587e10c 2020-07-23 stsp error = open_blame_view(view, link_target ? link_target : in_repo_path,
4625 0587e10c 2020-07-23 stsp commit_id, &refs, repo);
4626 0587e10c 2020-07-23 stsp if (error)
4627 0587e10c 2020-07-23 stsp goto done;
4628 12314ad4 2019-08-31 stsp if (worktree) {
4629 12314ad4 2019-08-31 stsp /* Release work tree lock. */
4630 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
4631 12314ad4 2019-08-31 stsp worktree = NULL;
4633 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4635 69069811 2018-08-02 stsp free(repo_path);
4636 f135c941 2020-02-20 stsp free(in_repo_path);
4637 0587e10c 2020-07-23 stsp free(link_target);
4638 69069811 2018-08-02 stsp free(cwd);
4639 a70480e0 2018-06-23 stsp free(commit_id);
4640 eb41ed75 2019-02-05 stsp if (worktree)
4641 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
4643 a70480e0 2018-06-23 stsp got_repo_close(repo);
4644 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4645 a70480e0 2018-06-23 stsp return error;
4648 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4649 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
4650 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
4651 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
4652 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
4653 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
4654 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int selected, int limit,
4655 0d6c6ee3 2020-05-20 stsp int isroot, struct tog_colors *colors, struct got_repository *repo)
4657 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4658 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
4659 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
4660 f26dddb7 2019-11-08 stsp struct tog_color *tc;
4661 56e0773d 2019-11-28 stsp int width, n, i, nentries;
4663 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
4665 f7d12f7e 2018-08-01 stsp werase(view->window);
4667 ffd1d5e5 2018-06-23 stsp if (limit == 0)
4668 ffd1d5e5 2018-06-23 stsp return NULL;
4670 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, label, view->ncols, 0);
4672 ffd1d5e5 2018-06-23 stsp return err;
4673 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4674 a3404814 2018-09-02 stsp wstandout(view->window);
4675 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
4677 11b20872 2019-11-08 stsp wattr_on(view->window,
4678 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4679 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4681 11b20872 2019-11-08 stsp wattr_off(view->window,
4682 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4683 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4684 a3404814 2018-09-02 stsp wstandend(view->window);
4685 2550e4c3 2018-07-13 stsp free(wline);
4686 2550e4c3 2018-07-13 stsp wline = NULL;
4687 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4688 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4689 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4690 ffd1d5e5 2018-06-23 stsp return NULL;
4691 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
4693 ce52c690 2018-06-23 stsp return err;
4694 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4695 2550e4c3 2018-07-13 stsp free(wline);
4696 2550e4c3 2018-07-13 stsp wline = NULL;
4697 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4698 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4699 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4700 ffd1d5e5 2018-06-23 stsp return NULL;
4701 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4702 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
4703 a1eca9bb 2018-06-23 stsp return NULL;
4705 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
4706 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(tree);
4707 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
4708 0cf4efb1 2018-09-29 stsp if (view->focussed)
4709 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4710 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
4712 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4713 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
4714 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4715 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4716 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4717 ffd1d5e5 2018-06-23 stsp return NULL;
4721 56e0773d 2019-11-28 stsp te = *first_displayed_entry;
4724 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4725 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4726 0d6c6ee3 2020-05-20 stsp char *line = NULL, *id_str = NULL, *link_target = NULL;
4727 848d6979 2019-08-12 stsp const char *modestr = "";
4728 56e0773d 2019-11-28 stsp mode_t mode;
4730 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4731 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
4733 1d13200f 2018-07-12 stsp if (show_ids) {
4734 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4735 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4737 638f9024 2019-05-13 stsp return got_error_from_errno(
4738 230a42bd 2019-05-11 jcs "got_object_id_str");
4740 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4741 63c5ca5d 2019-08-24 stsp modestr = "$";
4742 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4745 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target,
4746 0d6c6ee3 2020-05-20 stsp te, repo);
4747 0d6c6ee3 2020-05-20 stsp if (err) {
4748 0d6c6ee3 2020-05-20 stsp free(id_str);
4749 0d6c6ee3 2020-05-20 stsp return err;
4751 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4752 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4753 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4755 848d6979 2019-08-12 stsp modestr = "@";
4757 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4758 848d6979 2019-08-12 stsp modestr = "/";
4759 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4760 848d6979 2019-08-12 stsp modestr = "*";
4761 0d6c6ee3 2020-05-20 stsp if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
4762 0d6c6ee3 2020-05-20 stsp got_tree_entry_get_name(te), modestr,
4763 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "",
4764 0d6c6ee3 2020-05-20 stsp link_target ? link_target : "") == -1) {
4765 1d13200f 2018-07-12 stsp free(id_str);
4766 0d6c6ee3 2020-05-20 stsp free(link_target);
4767 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4769 1d13200f 2018-07-12 stsp free(id_str);
4770 0d6c6ee3 2020-05-20 stsp free(link_target);
4771 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4772 ffd1d5e5 2018-06-23 stsp if (err) {
4773 ffd1d5e5 2018-06-23 stsp free(line);
4776 ffd1d5e5 2018-06-23 stsp if (n == selected) {
4777 0cf4efb1 2018-09-29 stsp if (view->focussed)
4778 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4779 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
4781 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
4783 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
4784 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4785 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4787 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
4788 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4789 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4790 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4791 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
4792 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4793 ffd1d5e5 2018-06-23 stsp free(line);
4794 2550e4c3 2018-07-13 stsp free(wline);
4795 2550e4c3 2018-07-13 stsp wline = NULL;
4797 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4798 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
4799 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4803 ffd1d5e5 2018-06-23 stsp return err;
4806 ffd1d5e5 2018-06-23 stsp static void
4807 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
4808 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
4809 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int isroot)
4811 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4814 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
4817 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, 0);
4818 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
4819 ffd1d5e5 2018-06-23 stsp if (!isroot)
4820 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4825 56e0773d 2019-11-28 stsp while (*first_displayed_entry && i < maxscroll) {
4826 56e0773d 2019-11-28 stsp *first_displayed_entry = got_tree_entry_get_prev(tree,
4827 56e0773d 2019-11-28 stsp *first_displayed_entry);
4830 56e0773d 2019-11-28 stsp if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4831 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4834 768394f3 2019-01-24 stsp static int
4835 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4836 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
4837 56e0773d 2019-11-28 stsp struct got_tree_object *tree)
4839 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4840 ffd1d5e5 2018-06-23 stsp int n = 0;
4842 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
4843 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, *first_displayed_entry);
4845 56e0773d 2019-11-28 stsp next = got_object_tree_get_first_entry(tree);
4847 768394f3 2019-01-24 stsp last = last_displayed_entry;
4848 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4849 56e0773d 2019-11-28 stsp last = got_tree_entry_get_next(tree, last);
4850 768394f3 2019-01-24 stsp if (last) {
4851 768394f3 2019-01-24 stsp *first_displayed_entry = next;
4852 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, next);
4858 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4859 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4860 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4862 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4863 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4864 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4866 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4867 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
4868 56e0773d 2019-11-28 stsp + 1 /* slash */;
4870 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
4872 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4873 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4874 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4876 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4877 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4878 d9765a41 2018-06-23 stsp while (pt) {
4879 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
4880 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
4881 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4882 cb2ebc8a 2018-06-23 stsp goto done;
4884 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4885 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4886 cb2ebc8a 2018-06-23 stsp goto done;
4888 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4891 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4892 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4893 ce52c690 2018-06-23 stsp goto done;
4897 ce52c690 2018-06-23 stsp if (err) {
4898 ce52c690 2018-06-23 stsp free(*path);
4899 ce52c690 2018-06-23 stsp *path = NULL;
4901 ce52c690 2018-06-23 stsp return err;
4904 ce52c690 2018-06-23 stsp static const struct got_error *
4905 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4906 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4907 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4908 8b473291 2019-02-21 stsp struct got_repository *repo)
4910 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
4911 ce52c690 2018-06-23 stsp char *path;
4912 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
4914 a0de39f3 2019-08-09 stsp *new_view = NULL;
4916 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
4918 ce52c690 2018-06-23 stsp return err;
4920 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4921 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
4922 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
4923 83ce39e3 2019-08-12 stsp goto done;
4926 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
4927 e5a0f69f 2018-08-18 stsp if (err) {
4928 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
4929 fc06ba56 2019-08-22 stsp err = NULL;
4930 e5a0f69f 2018-08-18 stsp view_close(blame_view);
4932 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
4934 83ce39e3 2019-08-12 stsp free(path);
4935 69efd4c4 2018-07-18 stsp return err;
4938 69efd4c4 2018-07-18 stsp static const struct got_error *
4939 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
4940 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4941 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4942 8b473291 2019-02-21 stsp struct got_repository *repo)
4944 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
4945 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
4946 69efd4c4 2018-07-18 stsp char *path;
4948 a0de39f3 2019-08-09 stsp *new_view = NULL;
4950 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4951 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
4952 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
4954 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
4956 69efd4c4 2018-07-18 stsp return err;
4958 f135c941 2020-02-20 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4960 e5a0f69f 2018-08-18 stsp view_close(log_view);
4962 e5a0f69f 2018-08-18 stsp *new_view = log_view;
4963 cb2ebc8a 2018-06-23 stsp free(path);
4964 cb2ebc8a 2018-06-23 stsp return err;
4967 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4968 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
4969 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4970 8b473291 2019-02-21 stsp struct got_repository *repo)
4972 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4973 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
4974 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4976 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
4978 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
4979 ffd1d5e5 2018-06-23 stsp if (err != NULL)
4980 ffd1d5e5 2018-06-23 stsp goto done;
4982 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4983 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4984 ffd1d5e5 2018-06-23 stsp goto done;
4987 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
4988 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
4989 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
4990 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
4991 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
4992 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4993 6484ec90 2018-09-29 stsp goto done;
4995 8b473291 2019-02-21 stsp s->refs = refs;
4996 fb2756b9 2018-08-04 stsp s->repo = repo;
4998 bddb1296 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
5000 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5001 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
5002 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
5003 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
5005 c0b01bdb 2019-11-08 stsp goto done;
5006 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5007 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
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;
5012 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
5013 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
5014 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5015 c0b01bdb 2019-11-08 stsp if (err) {
5016 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5017 c0b01bdb 2019-11-08 stsp goto done;
5020 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
5021 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
5022 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5023 11b20872 2019-11-08 stsp if (err) {
5024 11b20872 2019-11-08 stsp free_colors(&s->colors);
5025 11b20872 2019-11-08 stsp goto done;
5028 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5029 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
5030 c0b01bdb 2019-11-08 stsp if (err) {
5031 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5032 c0b01bdb 2019-11-08 stsp goto done;
5036 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
5037 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
5038 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
5039 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
5040 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
5042 ad80ab7b 2018-08-04 stsp free(commit_id_str);
5043 6484ec90 2018-09-29 stsp if (err) {
5044 fb2756b9 2018-08-04 stsp free(s->tree_label);
5045 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5047 ad80ab7b 2018-08-04 stsp return err;
5050 e5a0f69f 2018-08-18 stsp static const struct got_error *
5051 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
5053 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5055 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5056 fb2756b9 2018-08-04 stsp free(s->tree_label);
5057 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5058 6484ec90 2018-09-29 stsp free(s->commit_id);
5059 6484ec90 2018-09-29 stsp s->commit_id = NULL;
5060 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
5061 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
5062 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
5063 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
5064 ad80ab7b 2018-08-04 stsp free(parent);
5067 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
5068 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
5069 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
5071 7c32bd05 2019-06-22 stsp return NULL;
5074 7c32bd05 2019-06-22 stsp static const struct got_error *
5075 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
5077 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5079 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
5080 7c32bd05 2019-06-22 stsp return NULL;
5083 7c32bd05 2019-06-22 stsp static int
5084 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5086 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
5088 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5092 7c32bd05 2019-06-22 stsp static const struct got_error *
5093 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
5095 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5096 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
5098 7c32bd05 2019-06-22 stsp if (!view->searching) {
5099 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5100 7c32bd05 2019-06-22 stsp return NULL;
5103 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5104 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5105 7c32bd05 2019-06-22 stsp if (s->selected_entry)
5106 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
5107 56e0773d 2019-11-28 stsp s->selected_entry);
5109 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5111 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
5112 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5114 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
5115 56e0773d 2019-11-28 stsp s->selected_entry);
5118 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5119 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5121 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5124 7c32bd05 2019-06-22 stsp while (1) {
5125 56e0773d 2019-11-28 stsp if (te == NULL) {
5126 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
5127 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5128 ac66afb8 2019-06-24 stsp return NULL;
5130 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5131 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5133 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5136 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
5137 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5138 56e0773d 2019-11-28 stsp s->matched_entry = te;
5142 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5143 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5145 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
5148 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5149 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
5150 7c32bd05 2019-06-22 stsp s->selected = 0;
5153 e5a0f69f 2018-08-18 stsp return NULL;
5156 ad80ab7b 2018-08-04 stsp static const struct got_error *
5157 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
5159 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
5160 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5161 e5a0f69f 2018-08-18 stsp char *parent_path;
5163 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5165 e5a0f69f 2018-08-18 stsp return err;
5167 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
5168 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
5169 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
5170 56e0773d 2019-11-28 stsp s->tree, s->selected, view->nlines, s->tree == s->root,
5171 0d6c6ee3 2020-05-20 stsp &s->colors, s->repo);
5172 e5a0f69f 2018-08-18 stsp free(parent_path);
5174 669b5ffa 2018-10-07 stsp view_vborder(view);
5175 e5a0f69f 2018-08-18 stsp return err;
5178 e5a0f69f 2018-08-18 stsp static const struct got_error *
5179 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
5180 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
5182 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5183 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
5184 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
5185 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
5187 e5a0f69f 2018-08-18 stsp switch (ch) {
5189 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
5192 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
5194 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5195 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5196 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
5197 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
5198 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
5199 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5200 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5202 1e37a5c2 2019-05-12 jcs return err;
5203 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
5205 1e37a5c2 2019-05-12 jcs view_close(log_view);
5208 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
5209 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
5211 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5214 1e37a5c2 2019-05-12 jcs case KEY_UP:
5215 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5216 1e37a5c2 2019-05-12 jcs s->selected--;
5217 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
5220 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
5222 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
5223 56e0773d 2019-11-28 stsp s->tree, s->tree == s->root);
5225 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5226 ea025d1d 2020-02-22 naddy case CTRL('b'):
5227 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
5228 56e0773d 2019-11-28 stsp MAX(0, view->nlines - 4 - s->selected), s->tree,
5229 1e37a5c2 2019-05-12 jcs s->tree == s->root);
5230 1e37a5c2 2019-05-12 jcs s->selected = 0;
5231 56e0773d 2019-11-28 stsp if (got_object_tree_get_first_entry(s->tree) ==
5232 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
5233 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
5236 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5237 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5238 1e37a5c2 2019-05-12 jcs s->selected++;
5241 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5243 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5245 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
5246 56e0773d 2019-11-28 stsp s->last_displayed_entry, s->tree);
5248 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5249 ea025d1d 2020-02-22 naddy case CTRL('f'):
5250 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5252 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5253 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5254 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5257 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
5258 56e0773d 2019-11-28 stsp view->nlines, s->last_displayed_entry, s->tree);
5259 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
5260 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
5261 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
5262 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
5264 1e37a5c2 2019-05-12 jcs ndisplayed++;
5265 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5266 1e37a5c2 2019-05-12 jcs } while (te);
5267 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
5270 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5272 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5273 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5274 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5275 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5276 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5278 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5279 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5281 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5282 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5283 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5284 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
5285 1e37a5c2 2019-05-12 jcs s->selected_entry =
5286 1e37a5c2 2019-05-12 jcs parent->selected_entry;
5287 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
5288 1e37a5c2 2019-05-12 jcs free(parent);
5289 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
5290 56e0773d 2019-11-28 stsp s->selected_entry))) {
5291 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
5292 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
5293 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
5296 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
5297 941e9f74 2019-05-21 stsp if (err) {
5298 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
5301 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
5302 56e0773d 2019-11-28 stsp s->selected_entry))) {
5303 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
5304 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
5305 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
5307 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
5308 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
5309 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
5312 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
5313 669b5ffa 2018-10-07 stsp err = view_close_child(view);
5315 669b5ffa 2018-10-07 stsp return err;
5316 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
5317 669b5ffa 2018-10-07 stsp if (err) {
5318 1e37a5c2 2019-05-12 jcs view_close(blame_view);
5321 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
5322 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
5324 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
5327 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5328 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
5329 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5335 ffd1d5e5 2018-06-23 stsp return err;
5338 ffd1d5e5 2018-06-23 stsp __dead static void
5339 ffd1d5e5 2018-06-23 stsp usage_tree(void)
5342 55cccc34 2020-02-20 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5343 ffd1d5e5 2018-06-23 stsp getprogname());
5347 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5348 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
5350 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
5351 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
5352 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
5353 8b473291 2019-02-21 stsp struct got_reflist_head refs;
5354 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5355 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5356 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
5357 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
5358 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
5360 5221c383 2018-08-01 stsp struct tog_view *view;
5362 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
5364 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
5365 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
5366 d188b9a6 2019-01-04 stsp NULL) == -1)
5367 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
5370 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5371 ffd1d5e5 2018-06-23 stsp switch (ch) {
5373 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
5376 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
5377 74283ab8 2020-02-07 stsp if (repo_path == NULL)
5378 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
5382 17020d27 2019-03-07 stsp usage_tree();
5383 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
5387 ffd1d5e5 2018-06-23 stsp argc -= optind;
5388 ffd1d5e5 2018-06-23 stsp argv += optind;
5390 55cccc34 2020-02-20 stsp if (argc > 1)
5391 74283ab8 2020-02-07 stsp usage_tree();
5393 55cccc34 2020-02-20 stsp cwd = getcwd(NULL, 0);
5394 55cccc34 2020-02-20 stsp if (cwd == NULL)
5395 55cccc34 2020-02-20 stsp return got_error_from_errno("getcwd");
5397 55cccc34 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
5398 55cccc34 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5399 55cccc34 2020-02-20 stsp goto done;
5401 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
5402 55cccc34 2020-02-20 stsp if (worktree)
5403 52185f70 2019-02-05 stsp repo_path =
5404 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5406 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
5408 55cccc34 2020-02-20 stsp if (repo_path == NULL) {
5409 55cccc34 2020-02-20 stsp error = got_error_from_errno("strdup");
5410 55cccc34 2020-02-20 stsp goto done;
5413 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5414 c02c541e 2019-03-29 stsp if (error != NULL)
5415 52185f70 2019-02-05 stsp goto done;
5417 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5418 55cccc34 2020-02-20 stsp repo, worktree);
5419 55cccc34 2020-02-20 stsp if (error)
5420 55cccc34 2020-02-20 stsp goto done;
5422 55cccc34 2020-02-20 stsp init_curses();
5424 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5425 c02c541e 2019-03-29 stsp if (error)
5426 52185f70 2019-02-05 stsp goto done;
5428 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5429 71a27632 2020-01-15 stsp commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5430 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5431 55cccc34 2020-02-20 stsp if (error)
5432 ffd1d5e5 2018-06-23 stsp goto done;
5434 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5435 55cccc34 2020-02-20 stsp if (error)
5436 ffd1d5e5 2018-06-23 stsp goto done;
5438 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
5439 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
5440 55cccc34 2020-02-20 stsp if (error)
5441 8b473291 2019-02-21 stsp goto done;
5443 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5444 8b473291 2019-02-21 stsp if (error)
5445 ffd1d5e5 2018-06-23 stsp goto done;
5447 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5448 5221c383 2018-08-01 stsp if (view == NULL) {
5449 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5450 5221c383 2018-08-01 stsp goto done;
5452 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
5453 ad80ab7b 2018-08-04 stsp if (error)
5454 ad80ab7b 2018-08-04 stsp goto done;
5455 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
5456 55cccc34 2020-02-20 stsp error = tree_view_walk_path(&view->state.tree, commit_id,
5457 55cccc34 2020-02-20 stsp in_repo_path, repo);
5458 55cccc34 2020-02-20 stsp if (error)
5459 55cccc34 2020-02-20 stsp goto done;
5462 55cccc34 2020-02-20 stsp if (worktree) {
5463 55cccc34 2020-02-20 stsp /* Release work tree lock. */
5464 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
5465 55cccc34 2020-02-20 stsp worktree = NULL;
5467 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5469 52185f70 2019-02-05 stsp free(repo_path);
5470 e4a0e26d 2020-02-20 stsp free(cwd);
5471 ffd1d5e5 2018-06-23 stsp free(commit_id);
5472 ffd1d5e5 2018-06-23 stsp if (commit)
5473 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
5475 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
5477 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
5478 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5479 ffd1d5e5 2018-06-23 stsp return error;
5482 ce5b7c56 2019-07-09 stsp static void
5483 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
5487 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
5488 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
5489 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
5490 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->name);
5492 6879ba42 2020-10-01 naddy fputc('\n', fp);
5495 4ed7e80c 2018-05-20 stsp __dead static void
5496 6879ba42 2020-10-01 naddy usage(int hflag, int status)
5498 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
5500 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
5501 6879ba42 2020-10-01 naddy getprogname());
5502 6879ba42 2020-10-01 naddy if (hflag) {
5503 6879ba42 2020-10-01 naddy fprintf(fp, "lazy usage: %s path\n", getprogname());
5504 6879ba42 2020-10-01 naddy list_commands(fp);
5506 6879ba42 2020-10-01 naddy exit(status);
5509 c2301be8 2018-04-30 stsp static char **
5510 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
5512 ee85c5e8 2020-02-29 stsp va_list ap;
5513 c2301be8 2018-04-30 stsp char **argv;
5516 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
5518 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
5519 c2301be8 2018-04-30 stsp if (argv == NULL)
5520 c2301be8 2018-04-30 stsp err(1, "calloc");
5521 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
5522 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
5523 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
5524 e10c916e 2019-09-15 hiltjo err(1, "strdup");
5527 ee85c5e8 2020-02-29 stsp va_end(ap);
5528 c2301be8 2018-04-30 stsp return argv;
5532 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
5533 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
5534 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
5535 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
5536 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
5538 ee85c5e8 2020-02-29 stsp static const struct got_error *
5539 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
5541 ee85c5e8 2020-02-29 stsp const struct got_error *error = NULL;
5542 ee85c5e8 2020-02-29 stsp struct tog_cmd *cmd = NULL;
5543 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
5544 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
5545 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
5546 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5547 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
5549 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
5550 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
5551 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
5553 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
5554 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5555 ee85c5e8 2020-02-29 stsp goto done;
5557 ee85c5e8 2020-02-29 stsp if (worktree)
5558 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
5560 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
5561 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
5562 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
5563 ee85c5e8 2020-02-29 stsp goto done;
5566 ee85c5e8 2020-02-29 stsp error = got_repo_open(&repo, repo_path, NULL);
5567 ee85c5e8 2020-02-29 stsp if (error != NULL)
5568 ee85c5e8 2020-02-29 stsp goto done;
5570 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5571 ee85c5e8 2020-02-29 stsp repo, worktree);
5572 ee85c5e8 2020-02-29 stsp if (error)
5573 ee85c5e8 2020-02-29 stsp goto done;
5575 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
5576 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
5577 ee85c5e8 2020-02-29 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5578 ee85c5e8 2020-02-29 stsp if (error)
5579 ee85c5e8 2020-02-29 stsp goto done;
5581 ee85c5e8 2020-02-29 stsp if (worktree) {
5582 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5583 ee85c5e8 2020-02-29 stsp worktree = NULL;
5586 ee85c5e8 2020-02-29 stsp error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
5587 ee85c5e8 2020-02-29 stsp if (error) {
5588 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
5589 ee85c5e8 2020-02-29 stsp goto done;
5590 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
5591 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
5592 6879ba42 2020-10-01 naddy usage(1, 1);
5593 ee85c5e8 2020-02-29 stsp /* not reached */
5596 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5597 ee85c5e8 2020-02-29 stsp repo = NULL;
5599 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
5600 ee85c5e8 2020-02-29 stsp if (error)
5601 ee85c5e8 2020-02-29 stsp goto done;
5603 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
5605 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
5606 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
5609 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5610 ee85c5e8 2020-02-29 stsp if (worktree)
5611 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5613 ee85c5e8 2020-02-29 stsp free(commit_id_str);
5614 ee85c5e8 2020-02-29 stsp free(commit_id);
5615 ee85c5e8 2020-02-29 stsp free(cwd);
5616 ee85c5e8 2020-02-29 stsp free(repo_path);
5617 ee85c5e8 2020-02-29 stsp free(in_repo_path);
5618 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
5620 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
5621 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
5622 ee85c5e8 2020-02-29 stsp free(cmd_argv);
5624 ee85c5e8 2020-02-29 stsp return error;
5628 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
5630 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
5631 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
5632 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
5633 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
5634 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
5635 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
5636 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
5639 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
5641 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5642 9f7d7167 2018-04-29 stsp switch (ch) {
5644 9f7d7167 2018-04-29 stsp hflag = 1;
5647 53ccebc2 2019-07-30 stsp Vflag = 1;
5650 6879ba42 2020-10-01 naddy usage(hflag, 1);
5651 9f7d7167 2018-04-29 stsp /* NOTREACHED */
5655 9f7d7167 2018-04-29 stsp argc -= optind;
5656 9f7d7167 2018-04-29 stsp argv += optind;
5657 9814e6a3 2020-09-27 naddy optind = 1;
5658 c2301be8 2018-04-30 stsp optreset = 1;
5660 53ccebc2 2019-07-30 stsp if (Vflag) {
5661 53ccebc2 2019-07-30 stsp got_version_print_str();
5662 6879ba42 2020-10-01 naddy return 0;
5665 c2301be8 2018-04-30 stsp if (argc == 0) {
5666 f29d3e89 2018-06-23 stsp if (hflag)
5667 6879ba42 2020-10-01 naddy usage(hflag, 0);
5668 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
5669 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
5671 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
5675 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
5676 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
5677 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
5678 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
5679 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
5685 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
5686 ee85c5e8 2020-02-29 stsp if (argc != 1)
5687 6879ba42 2020-10-01 naddy usage(0, 1);
5688 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
5689 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
5691 ee85c5e8 2020-02-29 stsp if (hflag)
5692 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
5694 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5698 b46c1e04 2020-09-20 naddy putchar('\n');
5699 a2f4a359 2020-02-28 stsp if (cmd_argv) {
5701 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
5702 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
5703 a2f4a359 2020-02-28 stsp free(cmd_argv);
5706 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
5707 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
