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 <limits.h>
37 61e69b96 2018-05-20 stsp #include <wchar.h>
38 788c352e 2018-06-16 stsp #include <time.h>
39 84451b3e 2018-07-10 stsp #include <pthread.h>
40 5036bf37 2018-09-24 stsp #include <libgen.h>
41 60493ae3 2019-06-20 stsp #include <regex.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 9f7d7167 2018-04-29 stsp #include "got_error.h"
45 80ddbec8 2018-04-29 stsp #include "got_object.h"
46 80ddbec8 2018-04-29 stsp #include "got_reference.h"
47 80ddbec8 2018-04-29 stsp #include "got_repository.h"
48 80ddbec8 2018-04-29 stsp #include "got_diff.h"
49 511a516b 2018-05-19 stsp #include "got_opentemp.h"
50 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
51 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
52 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
53 a70480e0 2018-06-23 stsp #include "got_blame.h"
54 c2db6724 2019-01-04 stsp #include "got_privsep.h"
55 1dd54920 2019-05-11 stsp #include "got_path.h"
56 b7165be3 2019-02-05 stsp #include "got_worktree.h"
59 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
66 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
68 9f7d7167 2018-04-29 stsp #ifndef nitems
69 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
72 9f7d7167 2018-04-29 stsp struct tog_cmd {
73 c2301be8 2018-04-30 stsp const char *name;
74 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
75 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
78 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
79 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
82 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
83 6458efa5 2020-11-24 stsp __dead static void usage_ref(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 *[]);
89 6458efa5 2020-11-24 stsp static const struct got_error* cmd_ref(int, char *[]);
91 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
92 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
93 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
94 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
95 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
96 6458efa5 2020-11-24 stsp { "ref", cmd_ref, usage_ref },
99 d6b05b5b 2018-08-04 stsp enum tog_view_type {
100 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
101 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
102 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
103 6458efa5 2020-11-24 stsp TOG_VIEW_TREE,
104 6458efa5 2020-11-24 stsp TOG_VIEW_REF,
107 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
109 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
110 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
111 ba4f502b 2018-08-04 stsp struct got_object_id *id;
112 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
115 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
116 ba4f502b 2018-08-04 stsp struct commit_queue {
117 ba4f502b 2018-08-04 stsp int ncommits;
118 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
121 f26dddb7 2019-11-08 stsp struct tog_color {
122 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tog_color) entry;
123 6d17833f 2019-11-08 stsp regex_t regex;
124 6d17833f 2019-11-08 stsp short colorpair;
126 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tog_colors, tog_color);
128 d9dff0e5 2020-12-26 stsp static struct got_reflist_head tog_refs = TAILQ_HEAD_INITIALIZER(tog_refs);
129 51a10b52 2020-12-26 stsp static struct got_reflist_object_id_map *tog_refs_idmap;
131 11b20872 2019-11-08 stsp static const struct got_error *
132 51a10b52 2020-12-26 stsp tog_load_refs(struct got_repository *repo)
134 51a10b52 2020-12-26 stsp const struct got_error *err;
136 51a10b52 2020-12-26 stsp err = got_ref_list(&tog_refs, repo, NULL, got_ref_cmp_by_name, NULL);
138 51a10b52 2020-12-26 stsp return err;
140 51a10b52 2020-12-26 stsp return got_reflist_object_id_map_create(&tog_refs_idmap, &tog_refs,
144 51a10b52 2020-12-26 stsp static void
145 51a10b52 2020-12-26 stsp tog_free_refs(void)
147 51a10b52 2020-12-26 stsp if (tog_refs_idmap) {
148 f193b038 2020-12-26 stsp got_reflist_object_id_map_free(tog_refs_idmap);
149 51a10b52 2020-12-26 stsp tog_refs_idmap = NULL;
151 51a10b52 2020-12-26 stsp got_ref_list_free(&tog_refs);
154 51a10b52 2020-12-26 stsp static const struct got_error *
155 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
156 11b20872 2019-11-08 stsp int idx, short color)
158 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
159 11b20872 2019-11-08 stsp struct tog_color *tc;
160 11b20872 2019-11-08 stsp int regerr = 0;
162 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
163 11b20872 2019-11-08 stsp return NULL;
165 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
167 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
168 11b20872 2019-11-08 stsp if (tc == NULL)
169 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
170 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
171 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
172 11b20872 2019-11-08 stsp if (regerr) {
173 11b20872 2019-11-08 stsp static char regerr_msg[512];
174 11b20872 2019-11-08 stsp static char err_msg[512];
175 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
176 11b20872 2019-11-08 stsp sizeof(regerr_msg));
177 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
178 11b20872 2019-11-08 stsp regerr_msg);
179 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
181 11b20872 2019-11-08 stsp return err;
183 11b20872 2019-11-08 stsp tc->colorpair = idx;
184 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(colors, tc, entry);
185 11b20872 2019-11-08 stsp return NULL;
188 11b20872 2019-11-08 stsp static void
189 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
191 11b20872 2019-11-08 stsp struct tog_color *tc;
193 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(colors)) {
194 dbdddfee 2021-06-23 naddy tc = STAILQ_FIRST(colors);
195 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(colors, entry);
196 11b20872 2019-11-08 stsp regfree(&tc->regex);
201 11b20872 2019-11-08 stsp struct tog_color *
202 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
204 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
206 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(tc, colors, entry) {
207 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
211 11b20872 2019-11-08 stsp return NULL;
215 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
217 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
218 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
219 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
220 11b20872 2019-11-08 stsp return COLOR_CYAN;
221 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
222 11b20872 2019-11-08 stsp return COLOR_YELLOW;
223 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
224 11b20872 2019-11-08 stsp return COLOR_GREEN;
225 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
226 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
227 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
228 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
229 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
230 91b8c405 2020-01-25 stsp return COLOR_CYAN;
231 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
232 11b20872 2019-11-08 stsp return COLOR_GREEN;
233 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
234 11b20872 2019-11-08 stsp return COLOR_GREEN;
235 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
236 11b20872 2019-11-08 stsp return COLOR_CYAN;
237 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
238 11b20872 2019-11-08 stsp return COLOR_YELLOW;
239 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_HEADS") == 0)
240 6458efa5 2020-11-24 stsp return COLOR_GREEN;
241 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_TAGS") == 0)
242 6458efa5 2020-11-24 stsp return COLOR_MAGENTA;
243 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_REMOTES") == 0)
244 6458efa5 2020-11-24 stsp return COLOR_YELLOW;
250 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
252 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
254 11b20872 2019-11-08 stsp if (val == NULL)
255 11b20872 2019-11-08 stsp return default_color_value(envvar);
257 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
258 11b20872 2019-11-08 stsp return COLOR_BLACK;
259 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
260 11b20872 2019-11-08 stsp return COLOR_RED;
261 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
262 11b20872 2019-11-08 stsp return COLOR_GREEN;
263 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
264 11b20872 2019-11-08 stsp return COLOR_YELLOW;
265 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
266 11b20872 2019-11-08 stsp return COLOR_BLUE;
267 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
268 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
269 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
270 11b20872 2019-11-08 stsp return COLOR_CYAN;
271 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
272 11b20872 2019-11-08 stsp return COLOR_WHITE;
273 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
276 11b20872 2019-11-08 stsp return default_color_value(envvar);
280 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
281 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
282 3dbaef42 2020-11-24 stsp const char *label1, *label2;
284 15a087fe 2019-02-21 stsp int first_displayed_line;
285 15a087fe 2019-02-21 stsp int last_displayed_line;
287 15a087fe 2019-02-21 stsp int diff_context;
288 3dbaef42 2020-11-24 stsp int ignore_whitespace;
289 64453f7e 2020-11-21 stsp int force_text_diff;
290 15a087fe 2019-02-21 stsp struct got_repository *repo;
291 bddb1296 2019-11-08 stsp struct tog_colors colors;
292 fe621944 2020-11-10 stsp size_t nlines;
293 f44b1f58 2020-02-02 tracey off_t *line_offsets;
294 f44b1f58 2020-02-02 tracey int matched_line;
295 f44b1f58 2020-02-02 tracey int selected_line;
297 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
298 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
301 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
303 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
304 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
305 7c1452c1 2020-03-26 stsp pthread_cond_t commit_loaded;
306 1a76625f 2018-10-22 stsp int commits_needed;
307 fb280deb 2021-08-30 stsp int load_all;
308 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
309 1a76625f 2018-10-22 stsp struct commit_queue *commits;
310 1a76625f 2018-10-22 stsp const char *in_repo_path;
311 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
312 1a76625f 2018-10-22 stsp struct got_repository *repo;
313 1a76625f 2018-10-22 stsp int log_complete;
314 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
315 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
316 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
317 13add988 2019-10-15 stsp int *searching;
318 13add988 2019-10-15 stsp int *search_next_done;
319 13add988 2019-10-15 stsp regex_t *regex;
322 1a76625f 2018-10-22 stsp struct tog_log_view_state {
323 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
324 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
325 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
326 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
327 b01e7d3b 2018-08-04 stsp int selected;
328 b01e7d3b 2018-08-04 stsp char *in_repo_path;
329 9cd7cbd1 2020-12-07 stsp char *head_ref_name;
330 b672a97a 2020-01-27 stsp int log_branches;
331 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
332 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
333 1a76625f 2018-10-22 stsp sig_atomic_t quit;
334 1a76625f 2018-10-22 stsp pthread_t thread;
335 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
336 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
337 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
338 11b20872 2019-11-08 stsp struct tog_colors colors;
341 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
342 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
343 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
344 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
345 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
346 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
347 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
348 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
349 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
350 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
351 bf30f154 2020-12-07 naddy #define TOG_COLOR_DATE 11
352 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_HEADS 12
353 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_TAGS 13
354 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_REMOTES 14
356 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
357 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
358 e9424729 2018-08-04 stsp int nlines;
360 e9424729 2018-08-04 stsp struct tog_view *view;
361 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
365 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
366 e9424729 2018-08-04 stsp const char *path;
367 e9424729 2018-08-04 stsp struct got_repository *repo;
368 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
369 e9424729 2018-08-04 stsp int *complete;
370 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
371 fc06ba56 2019-08-22 stsp void *cancel_arg;
374 e9424729 2018-08-04 stsp struct tog_blame {
376 be659d10 2020-11-18 stsp off_t filesize;
377 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
378 6fcac457 2018-11-19 stsp int nlines;
379 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
380 e9424729 2018-08-04 stsp pthread_t thread;
381 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
382 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
383 e9424729 2018-08-04 stsp const char *path;
386 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
387 7cbe629d 2018-08-04 stsp int first_displayed_line;
388 7cbe629d 2018-08-04 stsp int last_displayed_line;
389 7cbe629d 2018-08-04 stsp int selected_line;
390 7cbe629d 2018-08-04 stsp int blame_complete;
393 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
394 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
395 e5a0f69f 2018-08-18 stsp char *path;
396 7cbe629d 2018-08-04 stsp struct got_repository *repo;
397 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
398 e9424729 2018-08-04 stsp struct tog_blame blame;
399 6c4c42e0 2019-06-24 stsp int matched_line;
400 11b20872 2019-11-08 stsp struct tog_colors colors;
403 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
404 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
405 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
406 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
407 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
408 ad80ab7b 2018-08-04 stsp int selected;
411 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
413 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
414 ad80ab7b 2018-08-04 stsp char *tree_label;
415 bc573f3b 2021-07-10 stsp struct got_object_id *commit_id;/* commit which this tree belongs to */
416 bc573f3b 2021-07-10 stsp struct got_tree_object *root; /* the commit's root tree entry */
417 bc573f3b 2021-07-10 stsp struct got_tree_object *tree; /* currently displayed (sub-)tree */
418 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
419 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
420 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
421 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
422 bc573f3b 2021-07-10 stsp struct tog_parent_trees parents; /* parent trees of current sub-tree */
423 9cd7cbd1 2020-12-07 stsp char *head_ref_name;
424 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
425 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
426 6458efa5 2020-11-24 stsp struct tog_colors colors;
429 6458efa5 2020-11-24 stsp struct tog_reflist_entry {
430 6458efa5 2020-11-24 stsp TAILQ_ENTRY(tog_reflist_entry) entry;
431 6458efa5 2020-11-24 stsp struct got_reference *ref;
435 6458efa5 2020-11-24 stsp TAILQ_HEAD(tog_reflist_head, tog_reflist_entry);
437 6458efa5 2020-11-24 stsp struct tog_ref_view_state {
438 dae613fa 2020-12-26 stsp struct tog_reflist_head refs;
439 6458efa5 2020-11-24 stsp struct tog_reflist_entry *first_displayed_entry;
440 6458efa5 2020-11-24 stsp struct tog_reflist_entry *last_displayed_entry;
441 6458efa5 2020-11-24 stsp struct tog_reflist_entry *selected_entry;
442 6458efa5 2020-11-24 stsp int nrefs, ndisplayed, selected, show_ids;
443 6458efa5 2020-11-24 stsp struct got_repository *repo;
444 6458efa5 2020-11-24 stsp struct tog_reflist_entry *matched_entry;
445 bddb1296 2019-11-08 stsp struct tog_colors colors;
449 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
451 e78dc838 2020-12-04 stsp * The 'Tab' key switches focus between a parent view and its child view.
452 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
453 669b5ffa 2018-10-07 stsp * there is enough screen estate.
455 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
456 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
458 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
459 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
460 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
462 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
463 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
465 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
467 cc3c9aac 2018-08-01 stsp struct tog_view {
468 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
469 26ed57b2 2018-05-19 stsp WINDOW *window;
470 26ed57b2 2018-05-19 stsp PANEL *panel;
471 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
472 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
473 e78dc838 2020-12-04 stsp int focussed; /* Only set on one parent or child view at a time. */
475 669b5ffa 2018-10-07 stsp struct tog_view *parent;
476 669b5ffa 2018-10-07 stsp struct tog_view *child;
479 e78dc838 2020-12-04 stsp * This flag is initially set on parent views when a new child view
480 e78dc838 2020-12-04 stsp * is created. It gets toggled when the 'Tab' key switches focus
481 e78dc838 2020-12-04 stsp * between parent and child.
482 e78dc838 2020-12-04 stsp * The flag indicates whether focus should be passed on to our child
483 e78dc838 2020-12-04 stsp * view if this parent view gets picked for focus after another parent
484 e78dc838 2020-12-04 stsp * view was closed. This prevents child views from losing focus in such
485 e78dc838 2020-12-04 stsp * situations.
487 e78dc838 2020-12-04 stsp int focus_child;
489 5dc9f4bc 2018-08-04 stsp /* type-specific state */
490 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
492 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
493 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
494 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
495 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
496 6458efa5 2020-11-24 stsp struct tog_ref_view_state ref;
499 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
500 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
501 e78dc838 2020-12-04 stsp struct tog_view *, int);
502 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
504 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
505 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
506 c0c4acc8 2021-01-24 stsp int search_started;
507 60493ae3 2019-06-20 stsp int searching;
508 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
509 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
510 60493ae3 2019-06-20 stsp int search_next_done;
511 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_HAVE_MORE 1
512 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_NO_MORE 2
513 f9967bca 2020-03-27 stsp #define TOG_SEARCH_HAVE_NONE 3
514 1803e47f 2019-06-22 stsp regex_t regex;
515 41605754 2020-11-12 stsp regmatch_t regmatch;
518 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
519 3dbaef42 2020-11-24 stsp struct got_object_id *, struct got_object_id *,
520 3dbaef42 2020-11-24 stsp const char *, const char *, int, int, int, struct tog_view *,
521 78756c87 2020-11-24 stsp struct got_repository *);
522 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
523 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
524 e78dc838 2020-12-04 stsp struct tog_view *, int);
525 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
526 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
527 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
529 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
530 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *,
531 78756c87 2020-11-24 stsp const char *, const char *, int);
532 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
533 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
534 e78dc838 2020-12-04 stsp struct tog_view *, int);
535 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
536 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
537 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
539 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
540 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *);
541 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
542 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
543 e78dc838 2020-12-04 stsp struct tog_view *, int);
544 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
545 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
546 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
548 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
549 bc573f3b 2021-07-10 stsp struct got_object_id *, const char *, struct got_repository *);
550 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
551 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
552 e78dc838 2020-12-04 stsp struct tog_view *, int);
553 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
554 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
555 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
557 6458efa5 2020-11-24 stsp static const struct got_error *open_ref_view(struct tog_view *,
558 6458efa5 2020-11-24 stsp struct got_repository *);
559 6458efa5 2020-11-24 stsp static const struct got_error *show_ref_view(struct tog_view *);
560 6458efa5 2020-11-24 stsp static const struct got_error *input_ref_view(struct tog_view **,
561 e78dc838 2020-12-04 stsp struct tog_view *, int);
562 6458efa5 2020-11-24 stsp static const struct got_error *close_ref_view(struct tog_view *);
563 6458efa5 2020-11-24 stsp static const struct got_error *search_start_ref_view(struct tog_view *);
564 6458efa5 2020-11-24 stsp static const struct got_error *search_next_ref_view(struct tog_view *);
566 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
567 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
568 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
570 25791caa 2018-10-24 stsp static void
571 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
573 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
576 83baff54 2019-08-12 stsp static void
577 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
579 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
582 61266923 2020-01-14 stsp static void
583 61266923 2020-01-14 stsp tog_sigcont(int signo)
585 61266923 2020-01-14 stsp tog_sigcont_received = 1;
588 e5a0f69f 2018-08-18 stsp static const struct got_error *
589 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
591 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
593 669b5ffa 2018-10-07 stsp if (view->child) {
594 669b5ffa 2018-10-07 stsp view_close(view->child);
595 669b5ffa 2018-10-07 stsp view->child = NULL;
597 e5a0f69f 2018-08-18 stsp if (view->close)
598 e5a0f69f 2018-08-18 stsp err = view->close(view);
599 ea5e7bb5 2018-08-01 stsp if (view->panel)
600 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
601 ea5e7bb5 2018-08-01 stsp if (view->window)
602 ea5e7bb5 2018-08-01 stsp delwin(view->window);
603 ea5e7bb5 2018-08-01 stsp free(view);
604 e5a0f69f 2018-08-18 stsp return err;
607 ea5e7bb5 2018-08-01 stsp static struct tog_view *
608 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
609 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
611 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
613 ea5e7bb5 2018-08-01 stsp if (view == NULL)
614 ea5e7bb5 2018-08-01 stsp return NULL;
616 d6b05b5b 2018-08-04 stsp view->type = type;
617 f7d12f7e 2018-08-01 stsp view->lines = LINES;
618 f7d12f7e 2018-08-01 stsp view->cols = COLS;
619 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
620 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
621 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
622 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
623 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
624 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
625 96a765a8 2018-08-04 stsp view_close(view);
626 ea5e7bb5 2018-08-01 stsp return NULL;
628 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
629 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
630 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
631 96a765a8 2018-08-04 stsp view_close(view);
632 ea5e7bb5 2018-08-01 stsp return NULL;
635 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
636 ea5e7bb5 2018-08-01 stsp return view;
640 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
642 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
644 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
647 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
649 5c60c32a 2018-10-18 stsp static const struct got_error *
650 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
652 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
654 5c60c32a 2018-10-18 stsp view->begin_y = 0;
655 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
656 5c60c32a 2018-10-18 stsp view->nlines = LINES;
657 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
658 5c60c32a 2018-10-18 stsp view->lines = LINES;
659 5c60c32a 2018-10-18 stsp view->cols = COLS;
660 5c60c32a 2018-10-18 stsp err = view_resize(view);
662 5c60c32a 2018-10-18 stsp return err;
664 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
665 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
667 5c60c32a 2018-10-18 stsp return NULL;
670 5c60c32a 2018-10-18 stsp static const struct got_error *
671 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
673 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
675 5c60c32a 2018-10-18 stsp view->begin_x = 0;
676 5c60c32a 2018-10-18 stsp view->begin_y = 0;
677 5c60c32a 2018-10-18 stsp view->nlines = LINES;
678 5c60c32a 2018-10-18 stsp view->ncols = COLS;
679 5c60c32a 2018-10-18 stsp view->lines = LINES;
680 5c60c32a 2018-10-18 stsp view->cols = COLS;
681 5c60c32a 2018-10-18 stsp err = view_resize(view);
683 5c60c32a 2018-10-18 stsp return err;
685 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
686 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
688 5c60c32a 2018-10-18 stsp return NULL;
692 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
694 5c60c32a 2018-10-18 stsp return view->parent == NULL;
697 4d8c2215 2018-08-19 stsp static const struct got_error *
698 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
700 f7d12f7e 2018-08-01 stsp int nlines, ncols;
702 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
703 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
705 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
707 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
708 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
710 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
712 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
713 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
714 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
715 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
716 25791caa 2018-10-24 stsp wclear(view->window);
718 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
719 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
720 0cf4efb1 2018-09-29 stsp view->lines = LINES;
721 0cf4efb1 2018-09-29 stsp view->cols = COLS;
723 6e3e5d9c 2018-10-18 stsp if (view->child) {
724 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
725 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
726 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
727 5c60c32a 2018-10-18 stsp if (view->child->focussed)
728 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
730 5c60c32a 2018-10-18 stsp show_panel(view->panel);
732 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
733 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
737 5c60c32a 2018-10-18 stsp return NULL;
740 669b5ffa 2018-10-07 stsp static const struct got_error *
741 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
743 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
745 669b5ffa 2018-10-07 stsp if (view->child == NULL)
746 669b5ffa 2018-10-07 stsp return NULL;
748 669b5ffa 2018-10-07 stsp err = view_close(view->child);
749 669b5ffa 2018-10-07 stsp view->child = NULL;
750 669b5ffa 2018-10-07 stsp return err;
753 72a9cb46 2020-12-03 stsp static void
754 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
756 669b5ffa 2018-10-07 stsp view->child = child;
757 669b5ffa 2018-10-07 stsp child->parent = view;
761 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
763 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
766 34bc9ec9 2019-02-22 stsp static void
767 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
769 25791caa 2018-10-24 stsp int cols, lines;
770 25791caa 2018-10-24 stsp struct winsize size;
772 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
773 25791caa 2018-10-24 stsp cols = 80; /* Default */
774 25791caa 2018-10-24 stsp lines = 24;
776 25791caa 2018-10-24 stsp cols = size.ws_col;
777 25791caa 2018-10-24 stsp lines = size.ws_row;
779 25791caa 2018-10-24 stsp resize_term(lines, cols);
782 2b49a8ae 2019-06-22 stsp static const struct got_error *
783 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
785 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
786 2b49a8ae 2019-06-22 stsp char pattern[1024];
789 c0c4acc8 2021-01-24 stsp if (view->search_started) {
790 c0c4acc8 2021-01-24 stsp regfree(&view->regex);
791 c0c4acc8 2021-01-24 stsp view->searching = 0;
792 c0c4acc8 2021-01-24 stsp memset(&view->regmatch, 0, sizeof(view->regmatch));
794 c0c4acc8 2021-01-24 stsp view->search_started = 0;
796 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
797 2b49a8ae 2019-06-22 stsp return NULL;
799 cb1159f8 2020-02-19 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
800 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
802 2b49a8ae 2019-06-22 stsp nocbreak();
804 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
807 2b49a8ae 2019-06-22 stsp if (ret == ERR)
808 2b49a8ae 2019-06-22 stsp return NULL;
810 41605754 2020-11-12 stsp if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) {
811 7c32bd05 2019-06-22 stsp err = view->search_start(view);
813 7c32bd05 2019-06-22 stsp regfree(&view->regex);
814 7c32bd05 2019-06-22 stsp return err;
816 c0c4acc8 2021-01-24 stsp view->search_started = 1;
817 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
818 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
819 2b49a8ae 2019-06-22 stsp view->search_next(view);
822 2b49a8ae 2019-06-22 stsp return NULL;
825 0cf4efb1 2018-09-29 stsp static const struct got_error *
826 e78dc838 2020-12-04 stsp view_input(struct tog_view **new, int *done, struct tog_view *view,
827 e78dc838 2020-12-04 stsp struct tog_view_list_head *views)
829 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
830 669b5ffa 2018-10-07 stsp struct tog_view *v;
831 1a76625f 2018-10-22 stsp int ch, errcode;
833 e5a0f69f 2018-08-18 stsp *new = NULL;
835 f9967bca 2020-03-27 stsp /* Clear "no matches" indicator. */
836 f9967bca 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE ||
837 f9967bca 2020-03-27 stsp view->search_next_done == TOG_SEARCH_HAVE_NONE)
838 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
840 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
841 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
842 82954512 2020-02-03 stsp if (errcode)
843 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
844 82954512 2020-02-03 stsp "pthread_mutex_unlock");
845 82954512 2020-02-03 stsp pthread_yield();
846 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
847 82954512 2020-02-03 stsp if (errcode)
848 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
849 82954512 2020-02-03 stsp "pthread_mutex_lock");
850 60493ae3 2019-06-20 stsp view->search_next(view);
851 60493ae3 2019-06-20 stsp return NULL;
854 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
855 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
856 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
857 1a76625f 2018-10-22 stsp if (errcode)
858 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
859 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
860 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
861 1a76625f 2018-10-22 stsp if (errcode)
862 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
863 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
865 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
866 25791caa 2018-10-24 stsp tog_resizeterm();
867 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
868 61266923 2020-01-14 stsp tog_sigcont_received = 0;
869 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
870 25791caa 2018-10-24 stsp err = view_resize(v);
872 25791caa 2018-10-24 stsp return err;
873 e78dc838 2020-12-04 stsp err = v->input(new, v, KEY_RESIZE);
875 25791caa 2018-10-24 stsp return err;
876 cdfcfb03 2020-12-06 stsp if (v->child) {
877 cdfcfb03 2020-12-06 stsp err = view_resize(v->child);
879 cdfcfb03 2020-12-06 stsp return err;
880 cdfcfb03 2020-12-06 stsp err = v->child->input(new, v->child,
881 cdfcfb03 2020-12-06 stsp KEY_RESIZE);
883 cdfcfb03 2020-12-06 stsp return err;
888 e5a0f69f 2018-08-18 stsp switch (ch) {
890 1e37a5c2 2019-05-12 jcs if (view->child) {
891 e78dc838 2020-12-04 stsp view->focussed = 0;
892 e78dc838 2020-12-04 stsp view->child->focussed = 1;
893 e78dc838 2020-12-04 stsp view->focus_child = 1;
894 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
895 e78dc838 2020-12-04 stsp view->focussed = 0;
896 e78dc838 2020-12-04 stsp view->parent->focussed = 1;
897 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
901 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
902 9970f7fc 2020-12-03 stsp view->dying = 1;
908 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
909 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
911 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
912 e78dc838 2020-12-04 stsp view->focussed = 0;
913 e78dc838 2020-12-04 stsp view->child->focussed = 1;
914 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
916 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
919 e78dc838 2020-12-04 stsp err = view->child->input(new, view->child,
920 9970f7fc 2020-12-03 stsp KEY_RESIZE);
922 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
923 e78dc838 2020-12-04 stsp view->parent->focussed = 0;
924 e78dc838 2020-12-04 stsp view->focussed = 1;
925 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
927 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
931 e78dc838 2020-12-04 stsp err = view->input(new, view, KEY_RESIZE);
934 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
937 60493ae3 2019-06-20 stsp if (view->search_start)
938 2b49a8ae 2019-06-22 stsp view_search_start(view);
940 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
944 c0c4acc8 2021-01-24 stsp if (view->search_started && view->search_next) {
945 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
946 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
947 60493ae3 2019-06-20 stsp view->search_next_done = 0;
948 60493ae3 2019-06-20 stsp view->search_next(view);
950 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
953 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
957 e5a0f69f 2018-08-18 stsp return err;
961 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
963 0cf4efb1 2018-09-29 stsp PANEL *panel;
964 7f64f4d6 2020-12-10 naddy const struct tog_view *view_above;
966 669b5ffa 2018-10-07 stsp if (view->parent)
967 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
969 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
970 0cf4efb1 2018-09-29 stsp if (panel == NULL)
973 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
974 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
975 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
979 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
981 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
982 acdafe9c 2020-12-03 stsp if (view->child == NULL || view->child->focussed)
984 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
986 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
989 669b5ffa 2018-10-07 stsp return view->focussed;
992 bcbd79e2 2018-08-19 stsp static const struct got_error *
993 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
995 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
996 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
997 fb59748f 2020-12-05 stsp struct tog_view *new_view;
998 fd823528 2018-10-22 stsp int fast_refresh = 10;
999 1a76625f 2018-10-22 stsp int done = 0, errcode;
1001 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1002 1a76625f 2018-10-22 stsp if (errcode)
1003 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
1005 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
1006 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
1008 1004088d 2018-09-29 stsp view->focussed = 1;
1009 878940b7 2018-09-29 stsp err = view->show(view);
1011 0cf4efb1 2018-09-29 stsp return err;
1012 0cf4efb1 2018-09-29 stsp update_panels();
1013 0cf4efb1 2018-09-29 stsp doupdate();
1014 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
1015 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
1016 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
1017 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
1019 e78dc838 2020-12-04 stsp err = view_input(&new_view, &done, view, &views);
1022 9970f7fc 2020-12-03 stsp if (view->dying) {
1023 e78dc838 2020-12-04 stsp struct tog_view *v, *prev = NULL;
1025 9970f7fc 2020-12-03 stsp if (view_is_parent_view(view))
1026 9970f7fc 2020-12-03 stsp prev = TAILQ_PREV(view, tog_view_list_head,
1028 e78dc838 2020-12-04 stsp else if (view->parent)
1029 669b5ffa 2018-10-07 stsp prev = view->parent;
1031 e78dc838 2020-12-04 stsp if (view->parent) {
1032 9970f7fc 2020-12-03 stsp view->parent->child = NULL;
1033 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
1035 9970f7fc 2020-12-03 stsp TAILQ_REMOVE(&views, view, entry);
1037 9970f7fc 2020-12-03 stsp err = view_close(view);
1039 e5a0f69f 2018-08-18 stsp goto done;
1041 e78dc838 2020-12-04 stsp view = NULL;
1042 e78dc838 2020-12-04 stsp TAILQ_FOREACH(v, &views, entry) {
1043 e78dc838 2020-12-04 stsp if (v->focussed)
1046 e78dc838 2020-12-04 stsp if (view == NULL && new_view == NULL) {
1047 e78dc838 2020-12-04 stsp /* No view has focus. Try to pick one. */
1049 e78dc838 2020-12-04 stsp view = prev;
1050 e78dc838 2020-12-04 stsp else if (!TAILQ_EMPTY(&views)) {
1051 e78dc838 2020-12-04 stsp view = TAILQ_LAST(&views,
1052 e78dc838 2020-12-04 stsp tog_view_list_head);
1054 e78dc838 2020-12-04 stsp if (view) {
1055 e78dc838 2020-12-04 stsp if (view->focus_child) {
1056 e78dc838 2020-12-04 stsp view->child->focussed = 1;
1057 e78dc838 2020-12-04 stsp view = view->child;
1059 e78dc838 2020-12-04 stsp view->focussed = 1;
1063 bcbd79e2 2018-08-19 stsp if (new_view) {
1064 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
1065 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
1066 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
1067 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
1069 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
1070 86c66b02 2018-10-18 stsp err = view_close(v);
1072 86c66b02 2018-10-18 stsp goto done;
1075 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
1076 fed7eaa8 2018-10-24 stsp view = new_view;
1078 669b5ffa 2018-10-07 stsp if (view) {
1079 e78dc838 2020-12-04 stsp if (view_is_parent_view(view)) {
1080 e78dc838 2020-12-04 stsp if (view->child && view->child->focussed)
1081 e78dc838 2020-12-04 stsp view = view->child;
1083 e78dc838 2020-12-04 stsp if (view->parent && view->parent->focussed)
1084 e78dc838 2020-12-04 stsp view = view->parent;
1086 e78dc838 2020-12-04 stsp show_panel(view->panel);
1087 e78dc838 2020-12-04 stsp if (view->child && view_is_splitscreen(view->child))
1088 e78dc838 2020-12-04 stsp show_panel(view->child->panel);
1089 e78dc838 2020-12-04 stsp if (view->parent && view_is_splitscreen(view)) {
1090 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1092 1a76625f 2018-10-22 stsp goto done;
1094 669b5ffa 2018-10-07 stsp err = view->show(view);
1096 1a76625f 2018-10-22 stsp goto done;
1097 669b5ffa 2018-10-07 stsp if (view->child) {
1098 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1100 1a76625f 2018-10-22 stsp goto done;
1102 1a76625f 2018-10-22 stsp update_panels();
1103 1a76625f 2018-10-22 stsp doupdate();
1107 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1108 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1109 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1110 e5a0f69f 2018-08-18 stsp view_close(view);
1113 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1114 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1115 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1117 e5a0f69f 2018-08-18 stsp return err;
1120 4ed7e80c 2018-05-20 stsp __dead static void
1121 9f7d7167 2018-04-29 stsp usage_log(void)
1124 c70c5802 2018-08-01 stsp fprintf(stderr,
1125 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1126 9f7d7167 2018-04-29 stsp getprogname());
1130 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1131 80ddbec8 2018-04-29 stsp static const struct got_error *
1132 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1134 00dfcb92 2018-06-11 stsp char *vis = NULL;
1135 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1137 963b370f 2018-05-20 stsp *ws = NULL;
1138 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1139 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1140 00dfcb92 2018-06-11 stsp int vislen;
1141 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1142 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1144 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1145 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1147 00dfcb92 2018-06-11 stsp return err;
1148 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1149 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1150 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1151 a7f50699 2018-06-11 stsp goto done;
1155 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1156 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1157 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1158 a7f50699 2018-06-11 stsp goto done;
1161 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1162 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1164 00dfcb92 2018-06-11 stsp free(vis);
1165 963b370f 2018-05-20 stsp if (err) {
1166 963b370f 2018-05-20 stsp free(*ws);
1167 963b370f 2018-05-20 stsp *ws = NULL;
1168 963b370f 2018-05-20 stsp *wlen = 0;
1170 963b370f 2018-05-20 stsp return err;
1173 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
1174 963b370f 2018-05-20 stsp static const struct got_error *
1175 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1176 27a741e5 2019-09-11 stsp int col_tab_align)
1178 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1179 963b370f 2018-05-20 stsp int cols = 0;
1180 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1181 963b370f 2018-05-20 stsp size_t wlen;
1184 963b370f 2018-05-20 stsp *wlinep = NULL;
1185 b700b5d6 2018-07-10 stsp *widthp = 0;
1187 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
1189 963b370f 2018-05-20 stsp return err;
1191 3f670bfb 2020-12-10 stsp if (wlen > 0 && wline[wlen - 1] == L'\n') {
1192 3f670bfb 2020-12-10 stsp wline[wlen - 1] = L'\0';
1195 3f670bfb 2020-12-10 stsp if (wlen > 0 && wline[wlen - 1] == L'\r') {
1196 3f670bfb 2020-12-10 stsp wline[wlen - 1] = L'\0';
1201 27a741e5 2019-09-11 stsp while (i < wlen) {
1202 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
1204 27a741e5 2019-09-11 stsp if (width == 0) {
1209 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
1210 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1212 27a741e5 2019-09-11 stsp cols += width;
1214 27a741e5 2019-09-11 stsp } else if (width == -1) {
1215 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
1216 27a741e5 2019-09-11 stsp width = TABSIZE -
1217 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
1219 748d5cab 2020-12-14 naddy width = 1;
1220 748d5cab 2020-12-14 naddy wline[i] = L'.';
1222 748d5cab 2020-12-14 naddy if (cols + width > wlimit)
1224 748d5cab 2020-12-14 naddy cols += width;
1227 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
1228 963b370f 2018-05-20 stsp goto done;
1231 963b370f 2018-05-20 stsp wline[i] = L'\0';
1232 b700b5d6 2018-07-10 stsp if (widthp)
1233 b700b5d6 2018-07-10 stsp *widthp = cols;
1236 963b370f 2018-05-20 stsp free(wline);
1238 963b370f 2018-05-20 stsp *wlinep = wline;
1239 963b370f 2018-05-20 stsp return err;
1242 8b473291 2019-02-21 stsp static const struct got_error*
1243 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1244 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1246 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1247 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1249 8b473291 2019-02-21 stsp const char *name;
1251 8b473291 2019-02-21 stsp *refs_str = NULL;
1253 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, refs, entry) {
1254 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1255 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
1258 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1259 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1261 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1262 8b473291 2019-02-21 stsp name += 5;
1263 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1265 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1266 8b473291 2019-02-21 stsp name += 6;
1267 79cc719f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
1268 8b473291 2019-02-21 stsp name += 8;
1269 79cc719f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
1270 79cc719f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
1273 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
1276 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1277 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
1278 5d844a1e 2019-08-13 stsp if (err) {
1279 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
1280 48cae60d 2020-09-22 stsp free(ref_id);
1283 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1284 5d844a1e 2019-08-13 stsp err = NULL;
1285 5d844a1e 2019-08-13 stsp tag = NULL;
1288 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1289 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
1290 48cae60d 2020-09-22 stsp free(ref_id);
1292 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1293 52b5abe1 2019-08-13 stsp if (cmp != 0)
1295 8b473291 2019-02-21 stsp s = *refs_str;
1296 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1297 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1298 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1300 8b473291 2019-02-21 stsp *refs_str = NULL;
1306 8b473291 2019-02-21 stsp return err;
1309 963b370f 2018-05-20 stsp static const struct got_error *
1310 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1311 27a741e5 2019-09-11 stsp int col_tab_align)
1313 e6b8b890 2020-12-29 naddy char *smallerthan;
1315 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1316 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1317 5813d178 2019-03-09 stsp author = smallerthan + 1;
1318 e6b8b890 2020-12-29 naddy author[strcspn(author, "@>")] = '\0';
1319 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1322 5813d178 2019-03-09 stsp static const struct got_error *
1323 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1324 8fdc79fe 2020-12-01 naddy struct got_object_id *id, const size_t date_display_cols,
1325 8fdc79fe 2020-12-01 naddy int author_display_cols)
1327 8fdc79fe 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
1328 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1329 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1330 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1331 5813d178 2019-03-09 stsp char *author = NULL;
1332 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1333 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1334 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1335 bb737323 2018-05-20 stsp int col, limit;
1336 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1337 ccb26ccd 2018-11-05 stsp struct tm tm;
1338 45d799e2 2018-12-23 stsp time_t committer_time;
1339 11b20872 2019-11-08 stsp struct tog_color *tc;
1341 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1342 e385fc42 2021-08-30 stsp if (gmtime_r(&committer_time, &tm) == NULL)
1343 e385fc42 2021-08-30 stsp return got_error_from_errno("gmtime_r");
1344 ec6d1a36 2021-03-21 jrick if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0)
1345 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1347 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1348 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1350 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1351 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_DATE);
1353 11b20872 2019-11-08 stsp wattr_on(view->window,
1354 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1355 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1357 11b20872 2019-11-08 stsp wattr_off(view->window,
1358 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1359 27a741e5 2019-09-11 stsp col = limit;
1360 b39d25c7 2018-07-10 stsp if (col > avail)
1361 b39d25c7 2018-07-10 stsp goto done;
1363 6570a66d 2019-11-08 stsp if (avail >= 120) {
1364 6570a66d 2019-11-08 stsp char *id_str;
1365 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1367 6570a66d 2019-11-08 stsp goto done;
1368 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
1370 11b20872 2019-11-08 stsp wattr_on(view->window,
1371 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1372 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1374 11b20872 2019-11-08 stsp wattr_off(view->window,
1375 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1376 6570a66d 2019-11-08 stsp free(id_str);
1378 6570a66d 2019-11-08 stsp if (col > avail)
1379 6570a66d 2019-11-08 stsp goto done;
1382 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1383 5813d178 2019-03-09 stsp if (author == NULL) {
1384 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1385 80ddbec8 2018-04-29 stsp goto done;
1387 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1389 bb737323 2018-05-20 stsp goto done;
1390 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_AUTHOR);
1392 11b20872 2019-11-08 stsp wattr_on(view->window,
1393 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1394 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1396 11b20872 2019-11-08 stsp wattr_off(view->window,
1397 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1398 bb737323 2018-05-20 stsp col += author_width;
1399 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1400 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1402 bb737323 2018-05-20 stsp author_width++;
1404 9c2eaf34 2018-05-20 stsp if (col > avail)
1405 9c2eaf34 2018-05-20 stsp goto done;
1407 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1409 6d9fbc00 2018-04-29 stsp goto done;
1410 bb737323 2018-05-20 stsp logmsg = logmsg0;
1411 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1413 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1414 bb737323 2018-05-20 stsp if (newline)
1415 bb737323 2018-05-20 stsp *newline = '\0';
1416 bb737323 2018-05-20 stsp limit = avail - col;
1417 dee2c213 2019-11-13 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1419 bb737323 2018-05-20 stsp goto done;
1420 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1421 bb737323 2018-05-20 stsp col += logmsg_width;
1422 27a741e5 2019-09-11 stsp while (col < avail) {
1423 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1427 80ddbec8 2018-04-29 stsp free(logmsg0);
1428 bb737323 2018-05-20 stsp free(wlogmsg);
1429 5813d178 2019-03-09 stsp free(author);
1430 bb737323 2018-05-20 stsp free(wauthor);
1431 80ddbec8 2018-04-29 stsp free(line);
1432 80ddbec8 2018-04-29 stsp return err;
1435 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1436 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1437 899d86c2 2018-05-10 stsp struct got_object_id *id)
1439 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1441 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1442 80ddbec8 2018-04-29 stsp if (entry == NULL)
1443 899d86c2 2018-05-10 stsp return NULL;
1445 899d86c2 2018-05-10 stsp entry->id = id;
1446 99db9666 2018-05-07 stsp entry->commit = commit;
1447 899d86c2 2018-05-10 stsp return entry;
1450 99db9666 2018-05-07 stsp static void
1451 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1453 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1455 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1456 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1457 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1458 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1459 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1460 99db9666 2018-05-07 stsp free(entry);
1463 99db9666 2018-05-07 stsp static void
1464 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1466 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1467 99db9666 2018-05-07 stsp pop_commit(commits);
1470 c4972b91 2018-05-07 stsp static const struct got_error *
1471 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1472 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1474 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1475 13add988 2019-10-15 stsp regmatch_t regmatch;
1476 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1478 13add988 2019-10-15 stsp *have_match = 0;
1480 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1482 13add988 2019-10-15 stsp return err;
1484 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1486 13add988 2019-10-15 stsp goto done;
1488 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1489 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1490 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1491 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1492 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1493 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1494 13add988 2019-10-15 stsp *have_match = 1;
1496 13add988 2019-10-15 stsp free(id_str);
1497 13add988 2019-10-15 stsp free(logmsg);
1498 13add988 2019-10-15 stsp return err;
1501 13add988 2019-10-15 stsp static const struct got_error *
1502 4e0d2870 2020-12-07 naddy queue_commits(struct tog_log_thread_args *a)
1504 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1507 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1508 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1509 1a76625f 2018-10-22 stsp * while updating the display.
1512 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1513 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1514 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1515 1a76625f 2018-10-22 stsp int errcode;
1517 4e0d2870 2020-12-07 naddy err = got_commit_graph_iter_next(&id, a->graph, a->repo,
1518 4e0d2870 2020-12-07 naddy NULL, NULL);
1519 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1522 4e0d2870 2020-12-07 naddy err = got_object_open_as_commit(&commit, a->repo, id);
1525 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1526 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1527 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1531 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1532 1a76625f 2018-10-22 stsp if (errcode) {
1533 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1534 13add988 2019-10-15 stsp "pthread_mutex_lock");
1538 4e0d2870 2020-12-07 naddy entry->idx = a->commits->ncommits;
1539 4e0d2870 2020-12-07 naddy TAILQ_INSERT_TAIL(&a->commits->head, entry, entry);
1540 4e0d2870 2020-12-07 naddy a->commits->ncommits++;
1542 4e0d2870 2020-12-07 naddy if (*a->searching == TOG_SEARCH_FORWARD &&
1543 4e0d2870 2020-12-07 naddy !*a->search_next_done) {
1544 7c1452c1 2020-03-26 stsp int have_match;
1545 4e0d2870 2020-12-07 naddy err = match_commit(&have_match, id, commit, a->regex);
1548 7c1452c1 2020-03-26 stsp if (have_match)
1549 4e0d2870 2020-12-07 naddy *a->search_next_done = TOG_SEARCH_HAVE_MORE;
1552 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1553 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1554 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1555 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1558 4e0d2870 2020-12-07 naddy } while (*a->searching == TOG_SEARCH_FORWARD && !*a->search_next_done);
1560 9ba79e04 2018-06-11 stsp return err;
1563 2b779855 2020-12-05 naddy static void
1564 2b779855 2020-12-05 naddy select_commit(struct tog_log_view_state *s)
1566 2b779855 2020-12-05 naddy struct commit_queue_entry *entry;
1567 2b779855 2020-12-05 naddy int ncommits = 0;
1569 2b779855 2020-12-05 naddy entry = s->first_displayed_entry;
1570 2b779855 2020-12-05 naddy while (entry) {
1571 2b779855 2020-12-05 naddy if (ncommits == s->selected) {
1572 2b779855 2020-12-05 naddy s->selected_entry = entry;
1575 2b779855 2020-12-05 naddy entry = TAILQ_NEXT(entry, entry);
1576 2b779855 2020-12-05 naddy ncommits++;
1580 0553a4e3 2018-04-30 stsp static const struct got_error *
1581 8fdc79fe 2020-12-01 naddy draw_commits(struct tog_view *view)
1583 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1584 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1585 2b779855 2020-12-05 naddy struct commit_queue_entry *entry = s->selected_entry;
1586 8fdc79fe 2020-12-01 naddy const int limit = view->nlines;
1587 60493ae3 2019-06-20 stsp int width;
1588 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1589 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1590 8b473291 2019-02-21 stsp char *refs_str = NULL;
1591 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1592 11b20872 2019-11-08 stsp struct tog_color *tc;
1593 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1595 8fdc79fe 2020-12-01 naddy if (s->selected_entry &&
1596 8fdc79fe 2020-12-01 naddy !(view->searching && view->search_next_done == 0)) {
1597 d2075bf3 2020-12-25 stsp struct got_reflist_head *refs;
1598 8fdc79fe 2020-12-01 naddy err = got_object_id_str(&id_str, s->selected_entry->id);
1600 ecb28ae0 2018-07-16 stsp return err;
1601 51a10b52 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(tog_refs_idmap,
1602 d2075bf3 2020-12-25 stsp s->selected_entry->id);
1603 d2075bf3 2020-12-25 stsp if (refs) {
1604 d2075bf3 2020-12-25 stsp err = build_refs_str(&refs_str, refs,
1605 d2075bf3 2020-12-25 stsp s->selected_entry->id, s->repo);
1607 d2075bf3 2020-12-25 stsp goto done;
1611 8fdc79fe 2020-12-01 naddy if (s->thread_args.commits_needed == 0)
1612 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1614 fb280deb 2021-08-30 stsp if (s->thread_args.commits_needed > 0 || s->thread_args.load_all) {
1615 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1616 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
1617 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
1618 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
1619 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1620 8f4ed634 2020-03-26 stsp goto done;
1623 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
1625 f9686aa5 2020-03-27 stsp if (view->searching) {
1626 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
1627 f9686aa5 2020-03-27 stsp search_str = "no more matches";
1628 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1629 f9686aa5 2020-03-27 stsp search_str = "no matches found";
1630 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
1631 f9686aa5 2020-03-27 stsp search_str = "searching...";
1634 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1635 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
1636 f9686aa5 2020-03-27 stsp search_str ? search_str :
1637 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
1638 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1639 8f4ed634 2020-03-26 stsp goto done;
1643 8fdc79fe 2020-12-01 naddy if (s->in_repo_path && strcmp(s->in_repo_path, "/") != 0) {
1644 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1645 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1646 8fdc79fe 2020-12-01 naddy s->in_repo_path, ncommits_str) == -1) {
1647 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1648 1a76625f 2018-10-22 stsp header = NULL;
1649 1a76625f 2018-10-22 stsp goto done;
1651 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1652 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1653 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1654 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1655 1a76625f 2018-10-22 stsp header = NULL;
1656 1a76625f 2018-10-22 stsp goto done;
1658 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1660 1a76625f 2018-10-22 stsp goto done;
1662 2814baeb 2018-08-01 stsp werase(view->window);
1664 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1665 a3404814 2018-09-02 stsp wstandout(view->window);
1666 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
1668 11b20872 2019-11-08 stsp wattr_on(view->window,
1669 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1670 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1672 11b20872 2019-11-08 stsp wattr_off(view->window,
1673 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1674 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1675 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1678 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1679 a3404814 2018-09-02 stsp wstandend(view->window);
1680 ecb28ae0 2018-07-16 stsp free(wline);
1681 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1682 1a76625f 2018-10-22 stsp goto done;
1684 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1685 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
1686 5813d178 2019-03-09 stsp ncommits = 0;
1687 5813d178 2019-03-09 stsp while (entry) {
1688 5813d178 2019-03-09 stsp char *author;
1689 5813d178 2019-03-09 stsp wchar_t *wauthor;
1690 5813d178 2019-03-09 stsp int width;
1691 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1693 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1694 5813d178 2019-03-09 stsp if (author == NULL) {
1695 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1696 5813d178 2019-03-09 stsp goto done;
1698 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1699 27a741e5 2019-09-11 stsp date_display_cols);
1700 5813d178 2019-03-09 stsp if (author_cols < width)
1701 5813d178 2019-03-09 stsp author_cols = width;
1702 5813d178 2019-03-09 stsp free(wauthor);
1703 5813d178 2019-03-09 stsp free(author);
1704 7ca04879 2019-10-19 stsp ncommits++;
1705 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1708 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
1709 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = s->first_displayed_entry;
1710 867c6645 2018-07-10 stsp ncommits = 0;
1711 899d86c2 2018-05-10 stsp while (entry) {
1712 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1714 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
1715 2814baeb 2018-08-01 stsp wstandout(view->window);
1716 8fdc79fe 2020-12-01 naddy err = draw_commit(view, entry->commit, entry->id,
1717 8fdc79fe 2020-12-01 naddy date_display_cols, author_cols);
1718 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
1719 2814baeb 2018-08-01 stsp wstandend(view->window);
1721 60493ae3 2019-06-20 stsp goto done;
1722 0553a4e3 2018-04-30 stsp ncommits++;
1723 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = entry;
1724 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1727 1a57306a 2018-09-02 stsp view_vborder(view);
1729 1a76625f 2018-10-22 stsp free(id_str);
1730 8b473291 2019-02-21 stsp free(refs_str);
1731 1a76625f 2018-10-22 stsp free(ncommits_str);
1732 1a76625f 2018-10-22 stsp free(header);
1733 80ddbec8 2018-04-29 stsp return err;
1736 07b55e75 2018-05-10 stsp static void
1737 3e135950 2020-12-01 naddy log_scroll_up(struct tog_log_view_state *s, int maxscroll)
1739 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1740 07b55e75 2018-05-10 stsp int nscrolled = 0;
1742 ffe38506 2020-12-01 naddy entry = TAILQ_FIRST(&s->commits.head);
1743 ffe38506 2020-12-01 naddy if (s->first_displayed_entry == entry)
1746 ffe38506 2020-12-01 naddy entry = s->first_displayed_entry;
1747 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1748 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1749 07b55e75 2018-05-10 stsp if (entry) {
1750 ffe38506 2020-12-01 naddy s->first_displayed_entry = entry;
1751 07b55e75 2018-05-10 stsp nscrolled++;
1756 aa075928 2018-05-10 stsp static const struct got_error *
1757 ffe38506 2020-12-01 naddy trigger_log_thread(struct tog_view *view, int wait)
1759 ffe38506 2020-12-01 naddy struct tog_log_thread_args *ta = &view->state.log.thread_args;
1760 5e224a3e 2019-02-22 stsp int errcode;
1762 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1764 fb280deb 2021-08-30 stsp while (ta->commits_needed > 0 || ta->load_all) {
1765 ffe38506 2020-12-01 naddy if (ta->log_complete)
1768 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1769 ffe38506 2020-12-01 naddy errcode = pthread_cond_signal(&ta->need_commits);
1770 7aafa0d1 2019-02-22 stsp if (errcode)
1771 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1772 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1775 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
1776 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
1778 7c1452c1 2020-03-26 stsp if (!wait)
1781 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1782 ffe38506 2020-12-01 naddy show_log_view(view);
1783 7c1452c1 2020-03-26 stsp update_panels();
1784 7c1452c1 2020-03-26 stsp doupdate();
1786 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
1787 ffe38506 2020-12-01 naddy errcode = pthread_cond_wait(&ta->commit_loaded, &tog_mutex);
1788 82954512 2020-02-03 stsp if (errcode)
1789 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1790 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1792 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1793 ffe38506 2020-12-01 naddy show_log_view(view);
1794 7c1452c1 2020-03-26 stsp update_panels();
1795 7c1452c1 2020-03-26 stsp doupdate();
1798 5e224a3e 2019-02-22 stsp return NULL;
1801 5e224a3e 2019-02-22 stsp static const struct got_error *
1802 ffe38506 2020-12-01 naddy log_scroll_down(struct tog_view *view, int maxscroll)
1804 ffe38506 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
1805 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1806 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1807 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
1809 ffe38506 2020-12-01 naddy if (s->last_displayed_entry == NULL)
1810 5e224a3e 2019-02-22 stsp return NULL;
1812 bf30f154 2020-12-07 naddy ncommits_needed = s->last_displayed_entry->idx + 1 + maxscroll;
1813 ffe38506 2020-12-01 naddy if (s->commits.ncommits < ncommits_needed &&
1814 ffe38506 2020-12-01 naddy !s->thread_args.log_complete) {
1816 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
1818 ffe38506 2020-12-01 naddy s->thread_args.commits_needed += maxscroll;
1819 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
1821 5e224a3e 2019-02-22 stsp return err;
1825 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->last_displayed_entry, entry);
1826 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1829 ffe38506 2020-12-01 naddy s->last_displayed_entry = pentry;
1831 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->first_displayed_entry, entry);
1832 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1834 ffe38506 2020-12-01 naddy s->first_displayed_entry = pentry;
1835 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1837 dd0a52c1 2018-05-20 stsp return err;
1840 cd0acaa7 2018-05-20 stsp static const struct got_error *
1841 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1842 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1843 78756c87 2020-11-24 stsp struct tog_view *log_view, struct got_repository *repo)
1845 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1846 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1847 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1849 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1850 15a94983 2018-12-23 stsp if (diff_view == NULL)
1851 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1853 dbdddfee 2021-06-23 naddy parent_id = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
1854 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1855 78756c87 2020-11-24 stsp commit_id, NULL, NULL, 3, 0, 0, log_view, repo);
1856 e5a0f69f 2018-08-18 stsp if (err == NULL)
1857 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1858 cd0acaa7 2018-05-20 stsp return err;
1861 80ddbec8 2018-04-29 stsp static const struct got_error *
1862 42a2230c 2020-12-01 naddy tree_view_visit_subtree(struct tog_tree_view_state *s,
1863 42a2230c 2020-12-01 naddy struct got_tree_object *subtree)
1865 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1867 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1868 941e9f74 2019-05-21 stsp if (parent == NULL)
1869 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1871 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1872 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1873 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1874 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1875 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1876 941e9f74 2019-05-21 stsp s->tree = subtree;
1877 941e9f74 2019-05-21 stsp s->selected = 0;
1878 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1879 941e9f74 2019-05-21 stsp return NULL;
1882 941e9f74 2019-05-21 stsp static const struct got_error *
1883 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
1884 d91faf3b 2020-12-01 naddy struct got_object_id *commit_id, const char *path)
1886 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1887 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
1888 941e9f74 2019-05-21 stsp const char *p;
1889 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
1891 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1893 941e9f74 2019-05-21 stsp while (*p) {
1894 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
1895 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1896 56e0773d 2019-11-28 stsp char *te_name;
1898 33cbf02b 2020-01-12 stsp while (p[0] == '/')
1901 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1902 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1903 941e9f74 2019-05-21 stsp if (slash == NULL)
1904 33cbf02b 2020-01-12 stsp te_name = strdup(p);
1906 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
1907 56e0773d 2019-11-28 stsp if (te_name == NULL) {
1908 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
1911 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
1912 56e0773d 2019-11-28 stsp if (te == NULL) {
1913 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1914 56e0773d 2019-11-28 stsp free(te_name);
1917 56e0773d 2019-11-28 stsp free(te_name);
1918 9a1d5146 2020-11-27 naddy s->first_displayed_entry = s->selected_entry = te;
1920 9a1d5146 2020-11-27 naddy if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry)))
1921 9a1d5146 2020-11-27 naddy break; /* jump to this file's entry */
1923 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1924 941e9f74 2019-05-21 stsp if (slash)
1925 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1927 941e9f74 2019-05-21 stsp subpath = strdup(path);
1928 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1929 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1933 d91faf3b 2020-12-01 naddy err = got_object_id_by_path(&tree_id, s->repo, commit_id,
1938 d91faf3b 2020-12-01 naddy err = got_object_open_as_tree(&tree, s->repo, tree_id);
1939 941e9f74 2019-05-21 stsp free(tree_id);
1943 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, tree);
1944 941e9f74 2019-05-21 stsp if (err) {
1945 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1948 941e9f74 2019-05-21 stsp if (slash == NULL)
1950 941e9f74 2019-05-21 stsp free(subpath);
1951 941e9f74 2019-05-21 stsp subpath = NULL;
1952 941e9f74 2019-05-21 stsp p = slash;
1955 941e9f74 2019-05-21 stsp free(subpath);
1956 1a76625f 2018-10-22 stsp return err;
1959 61266923 2020-01-14 stsp static const struct got_error *
1960 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1961 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
1962 4e97c21c 2020-12-06 stsp const char *head_ref_name, struct got_repository *repo)
1964 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
1965 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
1966 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
1968 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1969 55cccc34 2020-02-20 stsp if (tree_view == NULL)
1970 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
1972 bc573f3b 2021-07-10 stsp err = open_tree_view(tree_view, entry->id, head_ref_name, repo);
1974 55cccc34 2020-02-20 stsp return err;
1975 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
1977 55cccc34 2020-02-20 stsp *new_view = tree_view;
1979 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
1980 55cccc34 2020-02-20 stsp return NULL;
1982 d91faf3b 2020-12-01 naddy return tree_view_walk_path(s, entry->id, path);
1985 55cccc34 2020-02-20 stsp static const struct got_error *
1986 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
1988 61266923 2020-01-14 stsp sigset_t sigset;
1989 61266923 2020-01-14 stsp int errcode;
1991 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
1992 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
1994 61266923 2020-01-14 stsp /* tog handles SIGWINCH and SIGCONT */
1995 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
1996 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1997 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
1998 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2000 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
2001 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
2002 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2004 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
2005 61266923 2020-01-14 stsp if (errcode)
2006 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
2008 61266923 2020-01-14 stsp return NULL;
2011 1a76625f 2018-10-22 stsp static void *
2012 1a76625f 2018-10-22 stsp log_thread(void *arg)
2014 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2015 1a76625f 2018-10-22 stsp int errcode = 0;
2016 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
2017 1a76625f 2018-10-22 stsp int done = 0;
2019 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
2021 61266923 2020-01-14 stsp return (void *)err;
2023 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
2024 4e0d2870 2020-12-07 naddy err = queue_commits(a);
2025 1a76625f 2018-10-22 stsp if (err) {
2026 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
2027 1a76625f 2018-10-22 stsp return (void *)err;
2028 1a76625f 2018-10-22 stsp err = NULL;
2030 fb280deb 2021-08-30 stsp } else if (a->commits_needed > 0 && !a->load_all)
2031 1a76625f 2018-10-22 stsp a->commits_needed--;
2033 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2034 3abe8080 2019-04-10 stsp if (errcode) {
2035 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2036 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2038 3abe8080 2019-04-10 stsp } else if (*a->quit)
2040 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
2041 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
2042 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
2043 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
2046 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
2047 7c1452c1 2020-03-26 stsp if (errcode) {
2048 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2049 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
2050 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
2055 1a76625f 2018-10-22 stsp a->commits_needed = 0;
2057 fb280deb 2021-08-30 stsp if (a->commits_needed == 0 && !a->load_all) {
2058 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
2059 7c1452c1 2020-03-26 stsp &tog_mutex);
2060 7c1452c1 2020-03-26 stsp if (errcode)
2061 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2062 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
2063 21355643 2020-12-06 stsp if (*a->quit)
2068 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2069 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2070 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2071 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2073 3abe8080 2019-04-10 stsp a->log_complete = 1;
2074 1a76625f 2018-10-22 stsp return (void *)err;
2077 1a76625f 2018-10-22 stsp static const struct got_error *
2078 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2080 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2081 1a76625f 2018-10-22 stsp int errcode;
2083 1a76625f 2018-10-22 stsp if (s->thread) {
2084 1a76625f 2018-10-22 stsp s->quit = 1;
2085 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2086 1a76625f 2018-10-22 stsp if (errcode)
2087 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2088 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2089 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2090 1a76625f 2018-10-22 stsp if (errcode)
2091 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2092 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2093 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
2094 1a76625f 2018-10-22 stsp if (errcode)
2095 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2096 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2097 1a76625f 2018-10-22 stsp if (errcode)
2098 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2099 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2100 1a76625f 2018-10-22 stsp s->thread = NULL;
2103 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2104 1d0f4054 2021-06-17 stsp err = got_repo_close(s->thread_args.repo);
2105 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2108 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2109 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2110 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2113 9343a5fb 2018-06-23 stsp return err;
2116 9343a5fb 2018-06-23 stsp static const struct got_error *
2117 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2119 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2120 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2121 276b94a1 2020-11-13 naddy int errcode;
2123 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2125 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2126 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2127 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2129 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.commit_loaded);
2130 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2131 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2133 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2134 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2135 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2136 1a76625f 2018-10-22 stsp free(s->start_id);
2137 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2138 9cd7cbd1 2020-12-07 stsp free(s->head_ref_name);
2139 9cd7cbd1 2020-12-07 stsp s->head_ref_name = NULL;
2140 1a76625f 2018-10-22 stsp return err;
2143 1a76625f 2018-10-22 stsp static const struct got_error *
2144 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2146 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2148 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2149 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2150 60493ae3 2019-06-20 stsp return NULL;
2153 60493ae3 2019-06-20 stsp static const struct got_error *
2154 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2156 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2157 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2158 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2160 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2161 f9686aa5 2020-03-27 stsp show_log_view(view);
2162 f9686aa5 2020-03-27 stsp update_panels();
2163 f9686aa5 2020-03-27 stsp doupdate();
2165 96e2b566 2019-07-08 stsp if (s->search_entry) {
2166 13add988 2019-10-15 stsp int errcode, ch;
2167 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2168 13add988 2019-10-15 stsp if (errcode)
2169 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2170 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2171 13add988 2019-10-15 stsp ch = wgetch(view->window);
2172 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2173 13add988 2019-10-15 stsp if (errcode)
2174 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2175 13add988 2019-10-15 stsp "pthread_mutex_lock");
2176 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2177 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2178 678cbce5 2019-07-28 stsp return NULL;
2180 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2181 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2183 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2184 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2185 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2186 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2187 8f4ed634 2020-03-26 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2189 8f4ed634 2020-03-26 stsp entry = TAILQ_PREV(s->matched_entry,
2190 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2192 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2193 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
2195 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2198 60493ae3 2019-06-20 stsp while (1) {
2199 13add988 2019-10-15 stsp int have_match = 0;
2201 60493ae3 2019-06-20 stsp if (entry == NULL) {
2202 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2203 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2204 f9967bca 2020-03-27 stsp view->search_next_done =
2205 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2206 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2207 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2208 f801134a 2019-06-25 stsp return NULL;
2211 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2212 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2213 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2215 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2216 ffe38506 2020-12-01 naddy return trigger_log_thread(view, 0);
2219 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2220 13add988 2019-10-15 stsp &view->regex);
2223 13add988 2019-10-15 stsp if (have_match) {
2224 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2225 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2229 96e2b566 2019-07-08 stsp s->search_entry = entry;
2230 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2231 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2233 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2236 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2237 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2238 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2239 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_DOWN);
2241 60493ae3 2019-06-20 stsp return err;
2244 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2245 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_UP);
2247 60493ae3 2019-06-20 stsp return err;
2252 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2254 60493ae3 2019-06-20 stsp return NULL;
2257 60493ae3 2019-06-20 stsp static const struct got_error *
2258 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2259 78756c87 2020-11-24 stsp struct got_repository *repo, const char *head_ref_name,
2260 78756c87 2020-11-24 stsp const char *in_repo_path, int log_branches)
2262 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2263 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2264 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2265 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2266 1a76625f 2018-10-22 stsp int errcode;
2268 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2269 f135c941 2020-02-20 stsp free(s->in_repo_path);
2270 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2271 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2272 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2275 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2276 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2277 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2279 fb2756b9 2018-08-04 stsp s->repo = repo;
2280 9cd7cbd1 2020-12-07 stsp if (head_ref_name) {
2281 9cd7cbd1 2020-12-07 stsp s->head_ref_name = strdup(head_ref_name);
2282 9cd7cbd1 2020-12-07 stsp if (s->head_ref_name == NULL) {
2283 9cd7cbd1 2020-12-07 stsp err = got_error_from_errno("strdup");
2284 9cd7cbd1 2020-12-07 stsp goto done;
2287 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2288 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2289 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2290 5036bf37 2018-09-24 stsp goto done;
2292 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2294 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
2295 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2296 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2297 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2299 11b20872 2019-11-08 stsp goto done;
2300 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2301 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2302 11b20872 2019-11-08 stsp if (err) {
2303 11b20872 2019-11-08 stsp free_colors(&s->colors);
2304 11b20872 2019-11-08 stsp goto done;
2306 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2307 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2308 11b20872 2019-11-08 stsp if (err) {
2309 11b20872 2019-11-08 stsp free_colors(&s->colors);
2310 11b20872 2019-11-08 stsp goto done;
2314 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2315 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2316 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2317 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2318 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2320 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2322 1a76625f 2018-10-22 stsp goto done;
2323 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2324 b672a97a 2020-01-27 stsp !s->log_branches);
2326 1a76625f 2018-10-22 stsp goto done;
2327 62d463ca 2020-10-20 naddy err = got_commit_graph_iter_start(thread_graph, s->start_id,
2328 62d463ca 2020-10-20 naddy s->repo, NULL, NULL);
2330 c5b78334 2020-01-12 stsp goto done;
2332 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2333 1a76625f 2018-10-22 stsp if (errcode) {
2334 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2335 1a76625f 2018-10-22 stsp goto done;
2337 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2338 7c1452c1 2020-03-26 stsp if (errcode) {
2339 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
2340 7c1452c1 2020-03-26 stsp goto done;
2343 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2344 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2345 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2346 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2347 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2348 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2349 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2350 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2351 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2352 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2353 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2354 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2355 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2358 1a76625f 2018-10-22 stsp close_log_view(view);
2359 ba4f502b 2018-08-04 stsp return err;
2362 e5a0f69f 2018-08-18 stsp static const struct got_error *
2363 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2365 f2f6d207 2020-11-24 stsp const struct got_error *err;
2366 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2368 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2369 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2370 2b380cc8 2018-10-24 stsp &s->thread_args);
2371 2b380cc8 2018-10-24 stsp if (errcode)
2372 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2373 f2f6d207 2020-11-24 stsp if (s->thread_args.commits_needed > 0) {
2374 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
2376 f2f6d207 2020-11-24 stsp return err;
2380 8fdc79fe 2020-12-01 naddy return draw_commits(view);
2383 e5a0f69f 2018-08-18 stsp static const struct got_error *
2384 e78dc838 2020-12-04 stsp input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
2386 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2387 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2388 21355643 2020-12-06 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
2389 6458efa5 2020-11-24 stsp struct tog_view *ref_view = NULL;
2390 f3bc9f1d 2021-09-05 naddy struct commit_queue_entry *entry;
2391 f3bc9f1d 2021-09-05 naddy int begin_x = 0, n;
2393 528dedf3 2021-08-30 stsp if (s->thread_args.load_all) {
2394 528dedf3 2021-08-30 stsp if (ch == KEY_BACKSPACE)
2395 fb280deb 2021-08-30 stsp s->thread_args.load_all = 0;
2396 528dedf3 2021-08-30 stsp else if (s->thread_args.log_complete) {
2397 528dedf3 2021-08-30 stsp s->thread_args.load_all = 0;
2398 fb280deb 2021-08-30 stsp log_scroll_down(view, s->commits.ncommits);
2399 fb280deb 2021-08-30 stsp s->selected = MIN(view->nlines - 2,
2400 fb280deb 2021-08-30 stsp s->commits.ncommits - 1);
2401 fb280deb 2021-08-30 stsp select_commit(s);
2403 528dedf3 2021-08-30 stsp return NULL;
2406 528dedf3 2021-08-30 stsp switch (ch) {
2408 1e37a5c2 2019-05-12 jcs s->quit = 1;
2411 1e37a5c2 2019-05-12 jcs case KEY_UP:
2414 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2416 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2417 1e37a5c2 2019-05-12 jcs s->selected--;
2419 3e135950 2020-12-01 naddy log_scroll_up(s, 1);
2420 912a3f79 2021-08-30 j select_commit(s);
2423 912a3f79 2021-08-30 j case KEY_HOME:
2424 912a3f79 2021-08-30 j s->selected = 0;
2425 ea66598a 2021-09-03 naddy s->first_displayed_entry = TAILQ_FIRST(&s->commits.head);
2426 2b779855 2020-12-05 naddy select_commit(s);
2428 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2429 a4292ac5 2019-05-12 jcs case CTRL('b'):
2430 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2432 2b779855 2020-12-05 naddy if (TAILQ_FIRST(&s->commits.head) == s->first_displayed_entry)
2433 1e37a5c2 2019-05-12 jcs s->selected = 0;
2435 2b779855 2020-12-05 naddy log_scroll_up(s, view->nlines - 1);
2436 2b779855 2020-12-05 naddy select_commit(s);
2439 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2442 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2444 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2445 2b779855 2020-12-05 naddy s->commits.ncommits - 1))
2446 1e37a5c2 2019-05-12 jcs s->selected++;
2448 2b779855 2020-12-05 naddy err = log_scroll_down(view, 1);
2452 912a3f79 2021-08-30 j select_commit(s);
2455 912a3f79 2021-08-30 j case KEY_END: {
2456 912a3f79 2021-08-30 j /* We don't know yet how many commits, so we're forced to
2457 912a3f79 2021-08-30 j * traverse them all. */
2458 fb280deb 2021-08-30 stsp if (!s->thread_args.log_complete) {
2459 fb280deb 2021-08-30 stsp s->thread_args.load_all = 1;
2460 fb280deb 2021-08-30 stsp return trigger_log_thread(view, 0);
2463 f3bc9f1d 2021-09-05 naddy s->selected = 0;
2464 f3bc9f1d 2021-09-05 naddy entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2465 f3bc9f1d 2021-09-05 naddy for (n = 0; n < view->nlines - 1; n++) {
2466 f3bc9f1d 2021-09-05 naddy if (entry == NULL)
2468 f3bc9f1d 2021-09-05 naddy s->first_displayed_entry = entry;
2469 f3bc9f1d 2021-09-05 naddy entry = TAILQ_PREV(entry, commit_queue_head, entry);
2471 f3bc9f1d 2021-09-05 naddy if (n > 0)
2472 f3bc9f1d 2021-09-05 naddy s->selected = n - 1;
2473 2b779855 2020-12-05 naddy select_commit(s);
2476 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2477 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2478 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2479 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2480 1e37a5c2 2019-05-12 jcs if (first == NULL)
2482 ffe38506 2020-12-01 naddy err = log_scroll_down(view, view->nlines - 1);
2485 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2486 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2487 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2488 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2489 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2490 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2492 2b779855 2020-12-05 naddy select_commit(s);
2495 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2496 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2497 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2498 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2499 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2500 2b779855 2020-12-05 naddy select_commit(s);
2501 0bf7f153 2020-12-02 naddy if (s->commits.ncommits < view->nlines - 1 &&
2502 0bf7f153 2020-12-02 naddy !s->thread_args.log_complete) {
2503 0bf7f153 2020-12-02 naddy s->thread_args.commits_needed += (view->nlines - 1) -
2504 0bf7f153 2020-12-02 naddy s->commits.ncommits;
2505 0bf7f153 2020-12-02 naddy err = trigger_log_thread(view, 1);
2508 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2511 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2513 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2514 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2515 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2516 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2517 78756c87 2020-11-24 stsp view, s->repo);
2520 e78dc838 2020-12-04 stsp view->focussed = 0;
2521 e78dc838 2020-12-04 stsp diff_view->focussed = 1;
2522 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2523 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2525 1e37a5c2 2019-05-12 jcs return err;
2526 72a9cb46 2020-12-03 stsp view_set_child(view, diff_view);
2527 e78dc838 2020-12-04 stsp view->focus_child = 1;
2529 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2532 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2534 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2535 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2536 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2537 4e97c21c 2020-12-06 stsp s->selected_entry, s->in_repo_path, s->head_ref_name,
2541 e78dc838 2020-12-04 stsp view->focussed = 0;
2542 e78dc838 2020-12-04 stsp tree_view->focussed = 1;
2543 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2544 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2546 1e37a5c2 2019-05-12 jcs return err;
2547 72a9cb46 2020-12-03 stsp view_set_child(view, tree_view);
2548 e78dc838 2020-12-04 stsp view->focus_child = 1;
2550 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2552 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2553 21355643 2020-12-06 stsp case CTRL('l'):
2555 21355643 2020-12-06 stsp if (ch == KEY_BACKSPACE &&
2556 21355643 2020-12-06 stsp got_path_is_root_dir(s->in_repo_path))
2558 21355643 2020-12-06 stsp err = stop_log_thread(s);
2560 74cfe85e 2020-10-20 stsp return err;
2561 21355643 2020-12-06 stsp if (ch == KEY_BACKSPACE) {
2562 21355643 2020-12-06 stsp char *parent_path;
2563 21355643 2020-12-06 stsp err = got_path_dirname(&parent_path, s->in_repo_path);
2565 21355643 2020-12-06 stsp return err;
2566 21355643 2020-12-06 stsp free(s->in_repo_path);
2567 21355643 2020-12-06 stsp s->in_repo_path = parent_path;
2568 21355643 2020-12-06 stsp s->thread_args.in_repo_path = s->in_repo_path;
2569 21355643 2020-12-06 stsp } else if (ch == CTRL('l')) {
2570 21355643 2020-12-06 stsp struct got_object_id *start_id;
2571 21355643 2020-12-06 stsp err = got_repo_match_object_id(&start_id, NULL,
2572 21355643 2020-12-06 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2573 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_COMMIT, &tog_refs, s->repo);
2575 21355643 2020-12-06 stsp return err;
2576 21355643 2020-12-06 stsp free(s->start_id);
2577 21355643 2020-12-06 stsp s->start_id = start_id;
2578 21355643 2020-12-06 stsp s->thread_args.start_id = s->start_id;
2579 21355643 2020-12-06 stsp } else /* 'B' */
2580 21355643 2020-12-06 stsp s->log_branches = !s->log_branches;
2582 21355643 2020-12-06 stsp err = got_repo_open(&s->thread_args.repo,
2583 21355643 2020-12-06 stsp got_repo_get_path(s->repo), NULL);
2585 21355643 2020-12-06 stsp return err;
2586 51a10b52 2020-12-26 stsp tog_free_refs();
2587 51a10b52 2020-12-26 stsp err = tog_load_refs(s->repo);
2589 ca51c541 2020-12-07 stsp return err;
2590 21355643 2020-12-06 stsp err = got_commit_graph_open(&s->thread_args.graph,
2591 21355643 2020-12-06 stsp s->in_repo_path, !s->log_branches);
2593 d01904d4 2019-06-25 stsp return err;
2594 21355643 2020-12-06 stsp err = got_commit_graph_iter_start(s->thread_args.graph,
2595 21355643 2020-12-06 stsp s->start_id, s->repo, NULL, NULL);
2597 b672a97a 2020-01-27 stsp return err;
2598 21355643 2020-12-06 stsp free_commits(&s->commits);
2599 21355643 2020-12-06 stsp s->first_displayed_entry = NULL;
2600 21355643 2020-12-06 stsp s->last_displayed_entry = NULL;
2601 21355643 2020-12-06 stsp s->selected_entry = NULL;
2602 21355643 2020-12-06 stsp s->selected = 0;
2603 21355643 2020-12-06 stsp s->thread_args.log_complete = 0;
2604 21355643 2020-12-06 stsp s->quit = 0;
2605 21355643 2020-12-06 stsp s->thread_args.commits_needed = view->nlines;
2608 6458efa5 2020-11-24 stsp if (view_is_parent_view(view))
2609 6458efa5 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
2610 6458efa5 2020-11-24 stsp ref_view = view_open(view->nlines, view->ncols,
2611 6458efa5 2020-11-24 stsp view->begin_y, begin_x, TOG_VIEW_REF);
2612 6458efa5 2020-11-24 stsp if (ref_view == NULL)
2613 6458efa5 2020-11-24 stsp return got_error_from_errno("view_open");
2614 6458efa5 2020-11-24 stsp err = open_ref_view(ref_view, s->repo);
2615 6458efa5 2020-11-24 stsp if (err) {
2616 6458efa5 2020-11-24 stsp view_close(ref_view);
2617 6458efa5 2020-11-24 stsp return err;
2619 e78dc838 2020-12-04 stsp view->focussed = 0;
2620 e78dc838 2020-12-04 stsp ref_view->focussed = 1;
2621 6458efa5 2020-11-24 stsp if (view_is_parent_view(view)) {
2622 6458efa5 2020-11-24 stsp err = view_close_child(view);
2624 6458efa5 2020-11-24 stsp return err;
2625 72a9cb46 2020-12-03 stsp view_set_child(view, ref_view);
2626 e78dc838 2020-12-04 stsp view->focus_child = 1;
2628 6458efa5 2020-11-24 stsp *new_view = ref_view;
2634 80ddbec8 2018-04-29 stsp return err;
2637 4ed7e80c 2018-05-20 stsp static const struct got_error *
2638 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2640 c2db6724 2019-01-04 stsp const struct got_error *error;
2642 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2643 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2644 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2646 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2647 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2649 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2650 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2652 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2653 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2655 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2656 c2db6724 2019-01-04 stsp if (error != NULL)
2657 c2db6724 2019-01-04 stsp return error;
2659 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2660 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2662 c2db6724 2019-01-04 stsp return NULL;
2665 a915003a 2019-02-05 stsp static void
2666 a915003a 2019-02-05 stsp init_curses(void)
2668 a915003a 2019-02-05 stsp initscr();
2670 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2673 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2674 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2675 a915003a 2019-02-05 stsp curs_set(0);
2676 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2677 6d17833f 2019-11-08 stsp start_color();
2678 6d17833f 2019-11-08 stsp use_default_colors();
2680 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2681 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2682 61266923 2020-01-14 stsp signal(SIGCONT, tog_sigcont);
2685 c2db6724 2019-01-04 stsp static const struct got_error *
2686 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2687 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2689 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2691 f135c941 2020-02-20 stsp if (argc == 0) {
2692 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2693 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2694 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2695 f135c941 2020-02-20 stsp return NULL;
2698 f135c941 2020-02-20 stsp if (worktree) {
2699 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2702 bfd61697 2020-11-14 stsp err = got_worktree_resolve_path(&p, worktree, argv[0]);
2704 f135c941 2020-02-20 stsp return err;
2705 bfd61697 2020-11-14 stsp if (asprintf(in_repo_path, "%s%s%s", prefix,
2706 bfd61697 2020-11-14 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
2707 bfd61697 2020-11-14 stsp p) == -1) {
2708 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2709 bfd61697 2020-11-14 stsp *in_repo_path = NULL;
2713 8fa913ec 2020-11-14 stsp err = got_repo_map_path(in_repo_path, repo, argv[0]);
2715 f135c941 2020-02-20 stsp return err;
2718 f135c941 2020-02-20 stsp static const struct got_error *
2719 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2721 80ddbec8 2018-04-29 stsp const struct got_error *error;
2722 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2723 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2724 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2725 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2726 d8f38dc4 2020-12-05 stsp char *start_commit = NULL, *label = NULL;
2727 d8f38dc4 2020-12-05 stsp struct got_reference *ref = NULL;
2728 d8f38dc4 2020-12-05 stsp const char *head_ref_name = NULL;
2729 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2730 04cc582a 2018-08-01 stsp struct tog_view *view;
2732 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2733 80ddbec8 2018-04-29 stsp switch (ch) {
2735 b672a97a 2020-01-27 stsp log_branches = 1;
2738 80ddbec8 2018-04-29 stsp start_commit = optarg;
2741 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2742 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2743 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2747 17020d27 2019-03-07 stsp usage_log();
2748 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2752 80ddbec8 2018-04-29 stsp argc -= optind;
2753 80ddbec8 2018-04-29 stsp argv += optind;
2755 f135c941 2020-02-20 stsp if (argc > 1)
2756 f135c941 2020-02-20 stsp usage_log();
2758 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2759 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
2760 c156c7a4 2020-12-18 stsp if (cwd == NULL)
2761 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
2762 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
2763 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2764 c156c7a4 2020-12-18 stsp goto done;
2765 a1fbf39a 2019-08-11 stsp if (worktree)
2766 6962eb72 2020-02-20 stsp repo_path =
2767 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2769 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2770 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
2771 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
2772 c156c7a4 2020-12-18 stsp goto done;
2776 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2777 80ddbec8 2018-04-29 stsp if (error != NULL)
2778 ecb28ae0 2018-07-16 stsp goto done;
2780 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2781 f135c941 2020-02-20 stsp repo, worktree);
2782 f135c941 2020-02-20 stsp if (error)
2783 f135c941 2020-02-20 stsp goto done;
2785 f135c941 2020-02-20 stsp init_curses();
2787 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2788 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2789 c02c541e 2019-03-29 stsp if (error)
2790 c02c541e 2019-03-29 stsp goto done;
2792 87670572 2020-12-26 naddy /* already loaded by tog_log_with_path()? */
2793 d9dff0e5 2020-12-26 stsp if (TAILQ_EMPTY(&tog_refs)) {
2794 87670572 2020-12-26 naddy error = tog_load_refs(repo);
2795 87670572 2020-12-26 naddy if (error)
2796 87670572 2020-12-26 naddy goto done;
2799 d8f38dc4 2020-12-05 stsp if (start_commit == NULL) {
2800 d8f38dc4 2020-12-05 stsp error = got_repo_match_object_id(&start_id, &label,
2801 d8f38dc4 2020-12-05 stsp worktree ? got_worktree_get_head_ref_name(worktree) :
2802 84de9106 2020-12-26 stsp GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
2803 d8f38dc4 2020-12-05 stsp if (error)
2804 d8f38dc4 2020-12-05 stsp goto done;
2805 d8f38dc4 2020-12-05 stsp head_ref_name = label;
2807 d8f38dc4 2020-12-05 stsp error = got_ref_open(&ref, repo, start_commit, 0);
2808 d8f38dc4 2020-12-05 stsp if (error == NULL)
2809 d8f38dc4 2020-12-05 stsp head_ref_name = got_ref_get_name(ref);
2810 d8f38dc4 2020-12-05 stsp else if (error->code != GOT_ERR_NOT_REF)
2811 d8f38dc4 2020-12-05 stsp goto done;
2812 d8f38dc4 2020-12-05 stsp error = got_repo_match_object_id(&start_id, NULL,
2813 84de9106 2020-12-26 stsp start_commit, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
2814 d8f38dc4 2020-12-05 stsp if (error)
2815 d8f38dc4 2020-12-05 stsp goto done;
2818 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2819 04cc582a 2018-08-01 stsp if (view == NULL) {
2820 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2821 04cc582a 2018-08-01 stsp goto done;
2823 78756c87 2020-11-24 stsp error = open_log_view(view, start_id, repo, head_ref_name,
2824 f135c941 2020-02-20 stsp in_repo_path, log_branches);
2825 ba4f502b 2018-08-04 stsp if (error)
2826 ba4f502b 2018-08-04 stsp goto done;
2827 2fc00ff4 2019-08-31 stsp if (worktree) {
2828 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2829 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2830 2fc00ff4 2019-08-31 stsp worktree = NULL;
2832 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2834 f135c941 2020-02-20 stsp free(in_repo_path);
2835 ecb28ae0 2018-07-16 stsp free(repo_path);
2836 ecb28ae0 2018-07-16 stsp free(cwd);
2837 899d86c2 2018-05-10 stsp free(start_id);
2838 d8f38dc4 2020-12-05 stsp free(label);
2840 d8f38dc4 2020-12-05 stsp got_ref_close(ref);
2841 1d0f4054 2021-06-17 stsp if (repo) {
2842 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
2843 1d0f4054 2021-06-17 stsp if (error == NULL)
2844 1d0f4054 2021-06-17 stsp error = close_err;
2846 ec142235 2019-03-07 stsp if (worktree)
2847 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2848 51a10b52 2020-12-26 stsp tog_free_refs();
2849 80ddbec8 2018-04-29 stsp return error;
2852 4ed7e80c 2018-05-20 stsp __dead static void
2853 9f7d7167 2018-04-29 stsp usage_diff(void)
2856 3dbaef42 2020-11-24 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
2857 3dbaef42 2020-11-24 stsp "[-w] object1 object2\n", getprogname());
2861 6d17833f 2019-11-08 stsp static int
2862 41605754 2020-11-12 stsp match_line(const char *line, regex_t *regex, size_t nmatch,
2863 41605754 2020-11-12 stsp regmatch_t *regmatch)
2865 41605754 2020-11-12 stsp return regexec(regex, line, nmatch, regmatch, 0) == 0;
2868 f26dddb7 2019-11-08 stsp struct tog_color *
2869 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
2871 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
2873 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(tc, colors, entry) {
2874 41605754 2020-11-12 stsp if (match_line(line, &tc->regex, 0, NULL))
2875 6d17833f 2019-11-08 stsp return tc;
2878 6d17833f 2019-11-08 stsp return NULL;
2881 4ed7e80c 2018-05-20 stsp static const struct got_error *
2882 41605754 2020-11-12 stsp add_matched_line(int *wtotal, const char *line, int wlimit, int col_tab_align,
2883 41605754 2020-11-12 stsp WINDOW *window, regmatch_t *regmatch)
2885 41605754 2020-11-12 stsp const struct got_error *err = NULL;
2886 41605754 2020-11-12 stsp wchar_t *wline;
2887 41605754 2020-11-12 stsp int width;
2890 41605754 2020-11-12 stsp *wtotal = 0;
2892 41605754 2020-11-12 stsp s = strndup(line, regmatch->rm_so);
2893 41605754 2020-11-12 stsp if (s == NULL)
2894 41605754 2020-11-12 stsp return got_error_from_errno("strndup");
2896 41605754 2020-11-12 stsp err = format_line(&wline, &width, s, wlimit, col_tab_align);
2897 41605754 2020-11-12 stsp if (err) {
2899 41605754 2020-11-12 stsp return err;
2901 41605754 2020-11-12 stsp waddwstr(window, wline);
2902 41605754 2020-11-12 stsp free(wline);
2904 41605754 2020-11-12 stsp wlimit -= width;
2905 41605754 2020-11-12 stsp *wtotal += width;
2907 41605754 2020-11-12 stsp if (wlimit > 0) {
2908 41605754 2020-11-12 stsp s = strndup(line + regmatch->rm_so,
2909 41605754 2020-11-12 stsp regmatch->rm_eo - regmatch->rm_so);
2910 41605754 2020-11-12 stsp if (s == NULL) {
2911 41605754 2020-11-12 stsp err = got_error_from_errno("strndup");
2913 41605754 2020-11-12 stsp return err;
2915 41605754 2020-11-12 stsp err = format_line(&wline, &width, s, wlimit, col_tab_align);
2916 41605754 2020-11-12 stsp if (err) {
2918 41605754 2020-11-12 stsp return err;
2920 41605754 2020-11-12 stsp wattr_on(window, A_STANDOUT, NULL);
2921 41605754 2020-11-12 stsp waddwstr(window, wline);
2922 41605754 2020-11-12 stsp wattr_off(window, A_STANDOUT, NULL);
2923 41605754 2020-11-12 stsp free(wline);
2925 41605754 2020-11-12 stsp wlimit -= width;
2926 41605754 2020-11-12 stsp *wtotal += width;
2929 41605754 2020-11-12 stsp if (wlimit > 0 && strlen(line) > regmatch->rm_eo) {
2930 41605754 2020-11-12 stsp err = format_line(&wline, &width,
2931 bf30f154 2020-12-07 naddy line + regmatch->rm_eo, wlimit, col_tab_align);
2933 41605754 2020-11-12 stsp return err;
2934 41605754 2020-11-12 stsp waddwstr(window, wline);
2935 41605754 2020-11-12 stsp free(wline);
2936 41605754 2020-11-12 stsp *wtotal += width;
2939 41605754 2020-11-12 stsp return NULL;
2942 41605754 2020-11-12 stsp static const struct got_error *
2943 89f1a395 2020-12-01 naddy draw_file(struct tog_view *view, const char *header)
2945 89f1a395 2020-12-01 naddy struct tog_diff_view_state *s = &view->state.diff;
2946 89f1a395 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
2947 61e69b96 2018-05-20 stsp const struct got_error *err;
2948 fe621944 2020-11-10 stsp int nprinted = 0;
2949 b304db33 2018-05-20 stsp char *line;
2950 826082fe 2020-12-10 stsp size_t linesize = 0;
2951 826082fe 2020-12-10 stsp ssize_t linelen;
2952 f26dddb7 2019-11-08 stsp struct tog_color *tc;
2953 61e69b96 2018-05-20 stsp wchar_t *wline;
2954 e0b650dd 2018-05-20 stsp int width;
2955 89f1a395 2020-12-01 naddy int max_lines = view->nlines;
2956 89f1a395 2020-12-01 naddy int nlines = s->nlines;
2957 fe621944 2020-11-10 stsp off_t line_offset;
2959 89f1a395 2020-12-01 naddy line_offset = s->line_offsets[s->first_displayed_line - 1];
2960 89f1a395 2020-12-01 naddy if (fseeko(s->f, line_offset, SEEK_SET) == -1)
2961 fe621944 2020-11-10 stsp return got_error_from_errno("fseek");
2963 f7d12f7e 2018-08-01 stsp werase(view->window);
2965 a3404814 2018-09-02 stsp if (header) {
2966 135a2da0 2020-11-11 stsp if (asprintf(&line, "[%d/%d] %s",
2967 89f1a395 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, nlines,
2968 135a2da0 2020-11-11 stsp header) == -1)
2969 135a2da0 2020-11-11 stsp return got_error_from_errno("asprintf");
2970 135a2da0 2020-11-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2971 135a2da0 2020-11-11 stsp free(line);
2973 a3404814 2018-09-02 stsp return err;
2975 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2976 a3404814 2018-09-02 stsp wstandout(view->window);
2977 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2978 e54cc94a 2020-11-11 stsp free(wline);
2979 e54cc94a 2020-11-11 stsp wline = NULL;
2980 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2981 a3404814 2018-09-02 stsp wstandend(view->window);
2982 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2983 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2985 a3404814 2018-09-02 stsp if (max_lines <= 1)
2986 a3404814 2018-09-02 stsp return NULL;
2987 a3404814 2018-09-02 stsp max_lines--;
2990 89f1a395 2020-12-01 naddy s->eof = 0;
2991 826082fe 2020-12-10 stsp line = NULL;
2992 fe621944 2020-11-10 stsp while (max_lines > 0 && nprinted < max_lines) {
2993 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
2994 826082fe 2020-12-10 stsp if (linelen == -1) {
2995 826082fe 2020-12-10 stsp if (feof(s->f)) {
2996 826082fe 2020-12-10 stsp s->eof = 1;
2999 826082fe 2020-12-10 stsp free(line);
3000 826082fe 2020-12-10 stsp return got_ferror(s->f, GOT_ERR_IO);
3003 89f1a395 2020-12-01 naddy tc = match_color(&s->colors, line);
3005 f26dddb7 2019-11-08 stsp wattr_on(view->window,
3006 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3007 89f1a395 2020-12-01 naddy if (s->first_displayed_line + nprinted == s->matched_line &&
3008 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
3009 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols, 0,
3010 41605754 2020-11-12 stsp view->window, regmatch);
3011 41605754 2020-11-12 stsp if (err) {
3012 41605754 2020-11-12 stsp free(line);
3013 41605754 2020-11-12 stsp return err;
3016 41605754 2020-11-12 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3017 41605754 2020-11-12 stsp if (err) {
3018 41605754 2020-11-12 stsp free(line);
3019 41605754 2020-11-12 stsp return err;
3021 41605754 2020-11-12 stsp waddwstr(view->window, wline);
3022 41605754 2020-11-12 stsp free(wline);
3023 41605754 2020-11-12 stsp wline = NULL;
3026 6d17833f 2019-11-08 stsp wattr_off(view->window,
3027 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3028 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
3029 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3030 fe621944 2020-11-10 stsp nprinted++;
3032 826082fe 2020-12-10 stsp free(line);
3033 fe621944 2020-11-10 stsp if (nprinted >= 1)
3034 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line +
3035 89f1a395 2020-12-01 naddy (nprinted - 1);
3037 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line;
3039 1a57306a 2018-09-02 stsp view_vborder(view);
3041 89f1a395 2020-12-01 naddy if (s->eof) {
3042 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
3043 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
3044 c3e9aa98 2019-05-13 jcs nprinted++;
3047 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
3049 c3e9aa98 2019-05-13 jcs return err;
3052 c3e9aa98 2019-05-13 jcs wstandout(view->window);
3053 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
3054 e54cc94a 2020-11-11 stsp free(wline);
3055 e54cc94a 2020-11-11 stsp wline = NULL;
3056 c3e9aa98 2019-05-13 jcs wstandend(view->window);
3059 26ed57b2 2018-05-19 stsp return NULL;
3062 abd2672a 2018-12-23 stsp static char *
3063 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
3065 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3066 09867e48 2019-08-13 stsp char *p, *s;
3068 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3069 09867e48 2019-08-13 stsp if (tm == NULL)
3070 09867e48 2019-08-13 stsp return NULL;
3071 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3072 09867e48 2019-08-13 stsp if (s == NULL)
3073 09867e48 2019-08-13 stsp return NULL;
3074 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
3076 abd2672a 2018-12-23 stsp *p = '\0';
3080 4ed7e80c 2018-05-20 stsp static const struct got_error *
3081 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3082 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3084 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3085 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3086 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3087 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3089 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3090 0208f208 2020-05-05 stsp if (qid != NULL) {
3091 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3092 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3095 0208f208 2020-05-05 stsp return err;
3097 aa8b5dd0 2021-08-01 stsp tree_id1 = got_object_id_dup(
3098 aa8b5dd0 2021-08-01 stsp got_object_commit_get_tree_id(pcommit));
3099 aa8b5dd0 2021-08-01 stsp if (tree_id1 == NULL) {
3100 aa8b5dd0 2021-08-01 stsp got_object_commit_close(pcommit);
3101 aa8b5dd0 2021-08-01 stsp return got_error_from_errno("got_object_id_dup");
3103 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3107 0208f208 2020-05-05 stsp if (tree_id1) {
3108 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3110 0208f208 2020-05-05 stsp goto done;
3113 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3114 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3116 0208f208 2020-05-05 stsp goto done;
3118 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3119 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3121 0208f208 2020-05-05 stsp if (tree1)
3122 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3123 0208f208 2020-05-05 stsp if (tree2)
3124 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3125 aa8b5dd0 2021-08-01 stsp free(tree_id1);
3126 0208f208 2020-05-05 stsp return err;
3129 0208f208 2020-05-05 stsp static const struct got_error *
3130 fe621944 2020-11-10 stsp add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
3134 fe621944 2020-11-10 stsp p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
3135 fe621944 2020-11-10 stsp if (p == NULL)
3136 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
3137 fe621944 2020-11-10 stsp *line_offsets = p;
3138 fe621944 2020-11-10 stsp (*line_offsets)[*nlines] = off;
3139 fe621944 2020-11-10 stsp (*nlines)++;
3140 fe621944 2020-11-10 stsp return NULL;
3143 fe621944 2020-11-10 stsp static const struct got_error *
3144 fe621944 2020-11-10 stsp write_commit_info(off_t **line_offsets, size_t *nlines,
3145 fe621944 2020-11-10 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3146 fe621944 2020-11-10 stsp struct got_repository *repo, FILE *outfile)
3148 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
3149 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
3150 15a94983 2018-12-23 stsp struct got_commit_object *commit;
3151 fe621944 2020-11-10 stsp char *id_str = NULL, *logmsg = NULL, *s = NULL, *line;
3152 45d799e2 2018-12-23 stsp time_t committer_time;
3153 45d799e2 2018-12-23 stsp const char *author, *committer;
3154 8b473291 2019-02-21 stsp char *refs_str = NULL;
3155 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3156 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3157 fe621944 2020-11-10 stsp off_t outoff = 0;
3160 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3162 8b473291 2019-02-21 stsp if (refs) {
3163 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
3165 8b473291 2019-02-21 stsp return err;
3168 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3170 abd2672a 2018-12-23 stsp return err;
3172 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
3173 15a94983 2018-12-23 stsp if (err) {
3174 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
3175 15a94983 2018-12-23 stsp goto done;
3178 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, 0);
3180 fe621944 2020-11-10 stsp goto done;
3182 fe621944 2020-11-10 stsp n = fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3183 fe621944 2020-11-10 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3184 fe621944 2020-11-10 stsp if (n < 0) {
3185 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3186 abd2672a 2018-12-23 stsp goto done;
3188 fe621944 2020-11-10 stsp outoff += n;
3189 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3191 fe621944 2020-11-10 stsp goto done;
3193 fe621944 2020-11-10 stsp n = fprintf(outfile, "from: %s\n",
3194 fe621944 2020-11-10 stsp got_object_commit_get_author(commit));
3195 fe621944 2020-11-10 stsp if (n < 0) {
3196 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3197 abd2672a 2018-12-23 stsp goto done;
3199 fe621944 2020-11-10 stsp outoff += n;
3200 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3202 fe621944 2020-11-10 stsp goto done;
3204 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3205 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
3206 fe621944 2020-11-10 stsp if (datestr) {
3207 fe621944 2020-11-10 stsp n = fprintf(outfile, "date: %s UTC\n", datestr);
3208 fe621944 2020-11-10 stsp if (n < 0) {
3209 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3210 fe621944 2020-11-10 stsp goto done;
3212 fe621944 2020-11-10 stsp outoff += n;
3213 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3215 fe621944 2020-11-10 stsp goto done;
3217 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3218 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3219 fe621944 2020-11-10 stsp if (strcmp(author, committer) != 0) {
3220 fe621944 2020-11-10 stsp n = fprintf(outfile, "via: %s\n", committer);
3221 fe621944 2020-11-10 stsp if (n < 0) {
3222 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3223 fe621944 2020-11-10 stsp goto done;
3225 fe621944 2020-11-10 stsp outoff += n;
3226 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3228 fe621944 2020-11-10 stsp goto done;
3230 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
3232 5943eee2 2019-08-13 stsp goto done;
3233 fe621944 2020-11-10 stsp s = logmsg;
3234 fe621944 2020-11-10 stsp while ((line = strsep(&s, "\n")) != NULL) {
3235 fe621944 2020-11-10 stsp n = fprintf(outfile, "%s\n", line);
3236 fe621944 2020-11-10 stsp if (n < 0) {
3237 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3238 fe621944 2020-11-10 stsp goto done;
3240 fe621944 2020-11-10 stsp outoff += n;
3241 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3243 fe621944 2020-11-10 stsp goto done;
3246 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3248 0208f208 2020-05-05 stsp goto done;
3249 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3250 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3251 fe621944 2020-11-10 stsp n = fprintf(outfile, "%c %s\n", cp->status, pe->path);
3252 fe621944 2020-11-10 stsp if (n < 0) {
3253 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3254 fe621944 2020-11-10 stsp goto done;
3256 fe621944 2020-11-10 stsp outoff += n;
3257 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3259 fe621944 2020-11-10 stsp goto done;
3260 0208f208 2020-05-05 stsp free((char *)pe->path);
3261 0208f208 2020-05-05 stsp free(pe->data);
3264 0208f208 2020-05-05 stsp fputc('\n', outfile);
3266 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3268 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3269 abd2672a 2018-12-23 stsp free(id_str);
3270 5943eee2 2019-08-13 stsp free(logmsg);
3271 8b473291 2019-02-21 stsp free(refs_str);
3272 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3273 7510f233 2020-08-09 stsp if (err) {
3274 ae6a6978 2020-08-09 stsp free(*line_offsets);
3275 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3276 ae6a6978 2020-08-09 stsp *nlines = 0;
3278 fe621944 2020-11-10 stsp return err;
3281 abd2672a 2018-12-23 stsp static const struct got_error *
3282 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
3284 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
3285 48ae06ee 2018-10-18 stsp FILE *f = NULL;
3286 15a94983 2018-12-23 stsp int obj_type;
3288 fe621944 2020-11-10 stsp free(s->line_offsets);
3289 fe621944 2020-11-10 stsp s->line_offsets = malloc(sizeof(off_t));
3290 fe621944 2020-11-10 stsp if (s->line_offsets == NULL)
3291 fe621944 2020-11-10 stsp return got_error_from_errno("malloc");
3292 fe621944 2020-11-10 stsp s->nlines = 0;
3294 511a516b 2018-05-19 stsp f = got_opentemp();
3295 48ae06ee 2018-10-18 stsp if (f == NULL) {
3296 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3297 48ae06ee 2018-10-18 stsp goto done;
3299 56b63ca4 2021-01-22 stsp if (s->f && fclose(s->f) == EOF) {
3300 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3301 fb43ecf1 2019-02-11 stsp goto done;
3305 15a94983 2018-12-23 stsp if (s->id1)
3306 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3308 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3310 15a94983 2018-12-23 stsp goto done;
3312 15a94983 2018-12-23 stsp switch (obj_type) {
3313 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3314 fe621944 2020-11-10 stsp err = got_diff_objects_as_blobs(&s->line_offsets, &s->nlines,
3315 3dbaef42 2020-11-24 stsp s->id1, s->id2, s->label1, s->label2, s->diff_context,
3316 3dbaef42 2020-11-24 stsp s->ignore_whitespace, s->force_text_diff, s->repo, s->f);
3318 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3319 fe621944 2020-11-10 stsp err = got_diff_objects_as_trees(&s->line_offsets, &s->nlines,
3320 3dbaef42 2020-11-24 stsp s->id1, s->id2, "", "", s->diff_context,
3321 3dbaef42 2020-11-24 stsp s->ignore_whitespace, s->force_text_diff, s->repo, s->f);
3323 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3324 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3325 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3326 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3327 d2075bf3 2020-12-25 stsp struct got_reflist_head *refs;
3329 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3331 3ffacbe1 2020-02-02 tracey goto done;
3332 51a10b52 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(tog_refs_idmap, s->id2);
3333 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3334 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3335 fe621944 2020-11-10 stsp err = write_commit_info(&s->line_offsets, &s->nlines,
3336 d2075bf3 2020-12-25 stsp s->id2, refs, s->repo, s->f);
3337 f44b1f58 2020-02-02 tracey if (err)
3338 f44b1f58 2020-02-02 tracey goto done;
3339 f44b1f58 2020-02-02 tracey } else {
3340 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3341 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(pid, parent_ids, entry) {
3342 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
3343 fe621944 2020-11-10 stsp err = write_commit_info(
3344 fe621944 2020-11-10 stsp &s->line_offsets, &s->nlines,
3345 d2075bf3 2020-12-25 stsp s->id2, refs, s->repo, s->f);
3346 f44b1f58 2020-02-02 tracey if (err)
3347 f44b1f58 2020-02-02 tracey goto done;
3352 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3354 fe621944 2020-11-10 stsp err = got_diff_objects_as_commits(&s->line_offsets, &s->nlines,
3355 3dbaef42 2020-11-24 stsp s->id1, s->id2, s->diff_context, s->ignore_whitespace,
3356 3dbaef42 2020-11-24 stsp s->force_text_diff, s->repo, s->f);
3360 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3363 f44b1f58 2020-02-02 tracey if (err)
3364 f44b1f58 2020-02-02 tracey goto done;
3366 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3367 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3368 48ae06ee 2018-10-18 stsp return err;
3371 f5215bb9 2019-02-22 stsp static void
3372 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3374 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3375 f5215bb9 2019-02-22 stsp update_panels();
3376 f5215bb9 2019-02-22 stsp doupdate();
3379 f44b1f58 2020-02-02 tracey static const struct got_error *
3380 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3382 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3384 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3385 f44b1f58 2020-02-02 tracey return NULL;
3388 f44b1f58 2020-02-02 tracey static const struct got_error *
3389 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3391 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3392 f44b1f58 2020-02-02 tracey int lineno;
3393 826082fe 2020-12-10 stsp char *line = NULL;
3394 826082fe 2020-12-10 stsp size_t linesize = 0;
3395 826082fe 2020-12-10 stsp ssize_t linelen;
3397 f44b1f58 2020-02-02 tracey if (!view->searching) {
3398 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3399 f44b1f58 2020-02-02 tracey return NULL;
3402 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3403 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3404 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3406 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3407 f44b1f58 2020-02-02 tracey } else {
3408 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3409 f44b1f58 2020-02-02 tracey lineno = 1;
3411 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3414 f44b1f58 2020-02-02 tracey while (1) {
3415 f44b1f58 2020-02-02 tracey off_t offset;
3417 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3418 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3419 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3423 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3424 f44b1f58 2020-02-02 tracey lineno = 1;
3426 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3429 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3430 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3431 f44b1f58 2020-02-02 tracey free(line);
3432 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3434 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
3435 826082fe 2020-12-10 stsp if (linelen != -1 &&
3436 41605754 2020-11-12 stsp match_line(line, &view->regex, 1, &view->regmatch)) {
3437 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3438 f44b1f58 2020-02-02 tracey s->matched_line = lineno;
3441 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3442 f44b1f58 2020-02-02 tracey lineno++;
3444 f44b1f58 2020-02-02 tracey lineno--;
3446 826082fe 2020-12-10 stsp free(line);
3448 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3449 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3450 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3453 f44b1f58 2020-02-02 tracey return NULL;
3456 48ae06ee 2018-10-18 stsp static const struct got_error *
3457 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3458 3dbaef42 2020-11-24 stsp struct got_object_id *id2, const char *label1, const char *label2,
3459 3dbaef42 2020-11-24 stsp int diff_context, int ignore_whitespace, int force_text_diff,
3460 78756c87 2020-11-24 stsp struct tog_view *log_view, struct got_repository *repo)
3462 48ae06ee 2018-10-18 stsp const struct got_error *err;
3463 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3465 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3466 15a94983 2018-12-23 stsp int type1, type2;
3467 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3469 15a94983 2018-12-23 stsp return err;
3470 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3472 15a94983 2018-12-23 stsp return err;
3474 15a94983 2018-12-23 stsp if (type1 != type2)
3475 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3477 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3478 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3479 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3480 f44b1f58 2020-02-02 tracey s->repo = repo;
3481 f44b1f58 2020-02-02 tracey s->id1 = id1;
3482 f44b1f58 2020-02-02 tracey s->id2 = id2;
3483 3dbaef42 2020-11-24 stsp s->label1 = label1;
3484 3dbaef42 2020-11-24 stsp s->label2 = label2;
3486 15a94983 2018-12-23 stsp if (id1) {
3487 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3488 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3489 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3491 5465d566 2020-02-01 tracey s->id1 = NULL;
3493 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3494 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3495 5465d566 2020-02-01 tracey free(s->id1);
3496 5465d566 2020-02-01 tracey s->id1 = NULL;
3497 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3499 5465d566 2020-02-01 tracey s->f = NULL;
3500 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3501 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3502 3dbaef42 2020-11-24 stsp s->diff_context = diff_context;
3503 3dbaef42 2020-11-24 stsp s->ignore_whitespace = ignore_whitespace;
3504 64453f7e 2020-11-21 stsp s->force_text_diff = force_text_diff;
3505 5465d566 2020-02-01 tracey s->log_view = log_view;
3506 5465d566 2020-02-01 tracey s->repo = repo;
3508 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
3509 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3510 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3511 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3512 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3514 6d17833f 2019-11-08 stsp return err;
3515 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
3516 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
3517 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
3518 6d17833f 2019-11-08 stsp if (err) {
3519 5465d566 2020-02-01 tracey free_colors(&s->colors);
3520 6d17833f 2019-11-08 stsp return err;
3522 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3523 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3524 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3525 6d17833f 2019-11-08 stsp if (err) {
3526 5465d566 2020-02-01 tracey free_colors(&s->colors);
3527 6d17833f 2019-11-08 stsp return err;
3530 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3531 528c17dd 2020-07-31 stsp "^(commit [0-9a-f]|(blob|file) [-+] |[MDmA] [^ ])",
3532 0208f208 2020-05-05 stsp TOG_COLOR_DIFF_META,
3533 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3534 6d17833f 2019-11-08 stsp if (err) {
3535 5465d566 2020-02-01 tracey free_colors(&s->colors);
3536 6d17833f 2019-11-08 stsp return err;
3539 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3540 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3541 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3542 11b20872 2019-11-08 stsp if (err) {
3543 5465d566 2020-02-01 tracey free_colors(&s->colors);
3544 11b20872 2019-11-08 stsp return err;
3547 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3548 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3549 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3550 11b20872 2019-11-08 stsp if (err) {
3551 5465d566 2020-02-01 tracey free_colors(&s->colors);
3552 11b20872 2019-11-08 stsp return err;
3556 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3557 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3558 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3560 fe621944 2020-11-10 stsp s->line_offsets = NULL;
3561 fe621944 2020-11-10 stsp s->nlines = 0;
3562 5465d566 2020-02-01 tracey err = create_diff(s);
3563 48ae06ee 2018-10-18 stsp if (err) {
3564 5465d566 2020-02-01 tracey free(s->id1);
3565 5465d566 2020-02-01 tracey s->id1 = NULL;
3566 5465d566 2020-02-01 tracey free(s->id2);
3567 5465d566 2020-02-01 tracey s->id2 = NULL;
3568 78756c87 2020-11-24 stsp free_colors(&s->colors);
3569 48ae06ee 2018-10-18 stsp return err;
3572 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3573 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3574 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3575 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3576 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3578 5dc9f4bc 2018-08-04 stsp return NULL;
3581 e5a0f69f 2018-08-18 stsp static const struct got_error *
3582 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
3584 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3585 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3587 5465d566 2020-02-01 tracey free(s->id1);
3588 5465d566 2020-02-01 tracey s->id1 = NULL;
3589 5465d566 2020-02-01 tracey free(s->id2);
3590 5465d566 2020-02-01 tracey s->id2 = NULL;
3591 5465d566 2020-02-01 tracey if (s->f && fclose(s->f) == EOF)
3592 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3593 5465d566 2020-02-01 tracey free_colors(&s->colors);
3594 f44b1f58 2020-02-02 tracey free(s->line_offsets);
3595 fe621944 2020-11-10 stsp s->line_offsets = NULL;
3596 fe621944 2020-11-10 stsp s->nlines = 0;
3597 e5a0f69f 2018-08-18 stsp return err;
3600 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3601 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3603 a3404814 2018-09-02 stsp const struct got_error *err;
3604 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3605 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3606 3dbaef42 2020-11-24 stsp const char *label1, *label2;
3608 a3404814 2018-09-02 stsp if (s->id1) {
3609 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3611 a3404814 2018-09-02 stsp return err;
3612 3dbaef42 2020-11-24 stsp label1 = s->label1 ? : id_str1;
3614 3dbaef42 2020-11-24 stsp label1 = "/dev/null";
3616 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3618 a3404814 2018-09-02 stsp return err;
3619 3dbaef42 2020-11-24 stsp label2 = s->label2 ? : id_str2;
3621 3dbaef42 2020-11-24 stsp if (asprintf(&header, "diff %s %s", label1, label2) == -1) {
3622 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3623 a3404814 2018-09-02 stsp free(id_str1);
3624 a3404814 2018-09-02 stsp free(id_str2);
3625 a3404814 2018-09-02 stsp return err;
3627 a3404814 2018-09-02 stsp free(id_str1);
3628 a3404814 2018-09-02 stsp free(id_str2);
3630 267bb3b8 2021-08-01 stsp err = draw_file(view, header);
3631 267bb3b8 2021-08-01 stsp free(header);
3632 267bb3b8 2021-08-01 stsp return err;
3635 15a087fe 2019-02-21 stsp static const struct got_error *
3636 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3637 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3639 d7a04538 2019-02-21 stsp const struct got_error *err;
3640 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3641 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3642 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3644 15a087fe 2019-02-21 stsp free(s->id2);
3645 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3646 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3647 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3649 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3651 d7a04538 2019-02-21 stsp return err;
3652 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3653 15a087fe 2019-02-21 stsp free(s->id1);
3654 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(parent_ids);
3655 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3656 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3657 15a087fe 2019-02-21 stsp return NULL;
3660 0cf4efb1 2018-09-29 stsp static const struct got_error *
3661 e78dc838 2020-12-04 stsp input_diff_view(struct tog_view **new_view, struct tog_view *view, int ch)
3663 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3664 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3665 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3666 5a8b5076 2020-12-05 stsp struct commit_queue_entry *old_selected_entry;
3667 826082fe 2020-12-10 stsp char *line = NULL;
3668 826082fe 2020-12-10 stsp size_t linesize = 0;
3669 826082fe 2020-12-10 stsp ssize_t linelen;
3672 e5a0f69f 2018-08-18 stsp switch (ch) {
3675 3dbaef42 2020-11-24 stsp if (ch == 'a')
3676 3dbaef42 2020-11-24 stsp s->force_text_diff = !s->force_text_diff;
3677 3dbaef42 2020-11-24 stsp if (ch == 'w')
3678 3dbaef42 2020-11-24 stsp s->ignore_whitespace = !s->ignore_whitespace;
3679 64453f7e 2020-11-21 stsp wclear(view->window);
3680 64453f7e 2020-11-21 stsp s->first_displayed_line = 1;
3681 64453f7e 2020-11-21 stsp s->last_displayed_line = view->nlines;
3682 64453f7e 2020-11-21 stsp diff_view_indicate_progress(view);
3683 64453f7e 2020-11-21 stsp err = create_diff(s);
3686 912a3f79 2021-08-30 j case KEY_HOME:
3687 912a3f79 2021-08-30 j s->first_displayed_line = 1;
3690 912a3f79 2021-08-30 j case KEY_END:
3694 912a3f79 2021-08-30 j s->first_displayed_line = (s->nlines - view->nlines) + 2;
3698 1e37a5c2 2019-05-12 jcs case KEY_UP:
3699 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
3700 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3702 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3703 a60a9dc4 2019-05-13 jcs case CTRL('b'):
3704 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
3707 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
3708 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3709 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3712 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3713 1e37a5c2 2019-05-12 jcs if (!s->eof)
3714 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3716 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3717 a60a9dc4 2019-05-13 jcs case CTRL('f'):
3719 00ba99a7 2019-05-12 jcs if (s->eof)
3722 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
3723 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
3724 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3725 826082fe 2020-12-10 stsp if (linelen == -1) {
3726 826082fe 2020-12-10 stsp if (feof(s->f)) {
3727 826082fe 2020-12-10 stsp s->eof = 1;
3729 826082fe 2020-12-10 stsp err = got_ferror(s->f, GOT_ERR_IO);
3733 826082fe 2020-12-10 stsp free(line);
3736 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
3737 1e37a5c2 2019-05-12 jcs s->diff_context--;
3738 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3739 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3740 27829c9e 2020-11-21 stsp if (s->first_displayed_line + view->nlines - 1 >
3741 27829c9e 2020-11-21 stsp s->nlines) {
3742 27829c9e 2020-11-21 stsp s->first_displayed_line = 1;
3743 27829c9e 2020-11-21 stsp s->last_displayed_line = view->nlines;
3748 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3749 1e37a5c2 2019-05-12 jcs s->diff_context++;
3750 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3751 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3756 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3758 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3759 5a8b5076 2020-12-05 stsp old_selected_entry = ls->selected_entry;
3761 e78dc838 2020-12-04 stsp err = input_log_view(NULL, s->log_view, KEY_UP);
3765 5a8b5076 2020-12-05 stsp if (old_selected_entry == ls->selected_entry)
3768 2b779855 2020-12-05 naddy err = set_selected_commit(s, ls->selected_entry);
3772 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3773 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3775 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3776 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3780 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3782 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3783 5a8b5076 2020-12-05 stsp old_selected_entry = ls->selected_entry;
3785 e78dc838 2020-12-04 stsp err = input_log_view(NULL, s->log_view, KEY_DOWN);
3789 5a8b5076 2020-12-05 stsp if (old_selected_entry == ls->selected_entry)
3792 2b779855 2020-12-05 naddy err = set_selected_commit(s, ls->selected_entry);
3796 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3797 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3799 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3800 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3806 bcbd79e2 2018-08-19 stsp return err;
3809 4ed7e80c 2018-05-20 stsp static const struct got_error *
3810 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
3812 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
3813 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
3814 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
3815 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3816 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
3817 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
3818 3dbaef42 2020-11-24 stsp char *label1 = NULL, *label2 = NULL;
3819 3dbaef42 2020-11-24 stsp int diff_context = 3, ignore_whitespace = 0;
3820 64453f7e 2020-11-21 stsp int ch, force_text_diff = 0;
3821 3dbaef42 2020-11-24 stsp const char *errstr;
3822 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
3824 3dbaef42 2020-11-24 stsp while ((ch = getopt(argc, argv, "aC:r:w")) != -1) {
3825 26ed57b2 2018-05-19 stsp switch (ch) {
3827 64453f7e 2020-11-21 stsp force_text_diff = 1;
3830 3dbaef42 2020-11-24 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3832 3dbaef42 2020-11-24 stsp if (errstr != NULL)
3833 3dbaef42 2020-11-24 stsp err(1, "-C option %s", errstr);
3835 09b5bff8 2020-02-23 naddy case 'r':
3836 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
3837 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
3838 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
3840 3dbaef42 2020-11-24 stsp got_path_strip_trailing_slashes(repo_path);
3843 3dbaef42 2020-11-24 stsp ignore_whitespace = 1;
3846 17020d27 2019-03-07 stsp usage_diff();
3847 26ed57b2 2018-05-19 stsp /* NOTREACHED */
3851 26ed57b2 2018-05-19 stsp argc -= optind;
3852 26ed57b2 2018-05-19 stsp argv += optind;
3854 26ed57b2 2018-05-19 stsp if (argc == 0) {
3855 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
3856 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
3857 15a94983 2018-12-23 stsp id_str1 = argv[0];
3858 15a94983 2018-12-23 stsp id_str2 = argv[1];
3860 26ed57b2 2018-05-19 stsp usage_diff();
3862 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3863 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
3864 c156c7a4 2020-12-18 stsp if (cwd == NULL)
3865 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
3866 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
3867 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3868 c156c7a4 2020-12-18 stsp goto done;
3869 a273ac94 2020-02-23 naddy if (worktree)
3870 a273ac94 2020-02-23 naddy repo_path =
3871 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
3873 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
3874 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
3875 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
3876 c156c7a4 2020-12-18 stsp goto done;
3880 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3881 eb6600df 2019-01-04 stsp if (error)
3882 eb6600df 2019-01-04 stsp goto done;
3884 a273ac94 2020-02-23 naddy init_curses();
3886 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3887 51a10b52 2020-12-26 stsp if (error)
3888 51a10b52 2020-12-26 stsp goto done;
3890 51a10b52 2020-12-26 stsp error = tog_load_refs(repo);
3891 26ed57b2 2018-05-19 stsp if (error)
3892 26ed57b2 2018-05-19 stsp goto done;
3894 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
3895 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &tog_refs, repo);
3896 26ed57b2 2018-05-19 stsp if (error)
3897 26ed57b2 2018-05-19 stsp goto done;
3899 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
3900 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &tog_refs, repo);
3901 26ed57b2 2018-05-19 stsp if (error)
3902 26ed57b2 2018-05-19 stsp goto done;
3904 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3905 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3906 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3907 ea5e7bb5 2018-08-01 stsp goto done;
3909 3dbaef42 2020-11-24 stsp error = open_diff_view(view, id1, id2, label1, label2, diff_context,
3910 78756c87 2020-11-24 stsp ignore_whitespace, force_text_diff, NULL, repo);
3911 5dc9f4bc 2018-08-04 stsp if (error)
3912 5dc9f4bc 2018-08-04 stsp goto done;
3913 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3915 3dbaef42 2020-11-24 stsp free(label1);
3916 3dbaef42 2020-11-24 stsp free(label2);
3917 c02c541e 2019-03-29 stsp free(repo_path);
3918 a273ac94 2020-02-23 naddy free(cwd);
3919 1d0f4054 2021-06-17 stsp if (repo) {
3920 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
3921 1d0f4054 2021-06-17 stsp if (error == NULL)
3922 1d0f4054 2021-06-17 stsp error = close_err;
3924 a273ac94 2020-02-23 naddy if (worktree)
3925 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
3926 51a10b52 2020-12-26 stsp tog_free_refs();
3927 26ed57b2 2018-05-19 stsp return error;
3930 4ed7e80c 2018-05-20 stsp __dead static void
3931 9f7d7167 2018-04-29 stsp usage_blame(void)
3934 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3935 9f7d7167 2018-04-29 stsp getprogname());
3939 84451b3e 2018-07-10 stsp struct tog_blame_line {
3940 84451b3e 2018-07-10 stsp int annotated;
3941 84451b3e 2018-07-10 stsp struct got_object_id *id;
3944 4ed7e80c 2018-05-20 stsp static const struct got_error *
3945 4f7c3e5e 2020-12-01 naddy draw_blame(struct tog_view *view)
3947 4f7c3e5e 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
3948 4f7c3e5e 2020-12-01 naddy struct tog_blame *blame = &s->blame;
3949 4f7c3e5e 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
3950 84451b3e 2018-07-10 stsp const struct got_error *err;
3951 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3952 826082fe 2020-12-10 stsp char *line = NULL;
3953 826082fe 2020-12-10 stsp size_t linesize = 0;
3954 826082fe 2020-12-10 stsp ssize_t linelen;
3955 84451b3e 2018-07-10 stsp wchar_t *wline;
3956 27a741e5 2019-09-11 stsp int width;
3957 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3958 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3959 ab089a2a 2018-07-12 stsp char *id_str;
3960 11b20872 2019-11-08 stsp struct tog_color *tc;
3962 4f7c3e5e 2020-12-01 naddy err = got_object_id_str(&id_str, s->blamed_commit->id);
3964 ab089a2a 2018-07-12 stsp return err;
3966 4f7c3e5e 2020-12-01 naddy rewind(blame->f);
3967 f7d12f7e 2018-08-01 stsp werase(view->window);
3969 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3970 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3971 ab089a2a 2018-07-12 stsp free(id_str);
3972 ab089a2a 2018-07-12 stsp return err;
3975 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3976 ab089a2a 2018-07-12 stsp free(line);
3977 2550e4c3 2018-07-13 stsp line = NULL;
3979 1cae65b4 2019-09-22 stsp return err;
3980 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3981 a3404814 2018-09-02 stsp wstandout(view->window);
3982 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
3984 11b20872 2019-11-08 stsp wattr_on(view->window,
3985 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3986 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3988 11b20872 2019-11-08 stsp wattr_off(view->window,
3989 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3990 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3991 a3404814 2018-09-02 stsp wstandend(view->window);
3992 2550e4c3 2018-07-13 stsp free(wline);
3993 2550e4c3 2018-07-13 stsp wline = NULL;
3994 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3995 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3997 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3998 4f7c3e5e 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, blame->nlines,
3999 4f7c3e5e 2020-12-01 naddy s->blame_complete ? "" : "annotating... ", s->path) == -1) {
4000 ab089a2a 2018-07-12 stsp free(id_str);
4001 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4003 ab089a2a 2018-07-12 stsp free(id_str);
4004 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4005 3f60a8ef 2018-07-10 stsp free(line);
4006 2550e4c3 2018-07-13 stsp line = NULL;
4008 3f60a8ef 2018-07-10 stsp return err;
4009 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4010 2550e4c3 2018-07-13 stsp free(wline);
4011 2550e4c3 2018-07-13 stsp wline = NULL;
4012 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4013 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4015 4f7c3e5e 2020-12-01 naddy s->eof = 0;
4016 4f7c3e5e 2020-12-01 naddy while (nprinted < view->nlines - 2) {
4017 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, blame->f);
4018 826082fe 2020-12-10 stsp if (linelen == -1) {
4019 826082fe 2020-12-10 stsp if (feof(blame->f)) {
4020 826082fe 2020-12-10 stsp s->eof = 1;
4023 84451b3e 2018-07-10 stsp free(line);
4024 826082fe 2020-12-10 stsp return got_ferror(blame->f, GOT_ERR_IO);
4026 826082fe 2020-12-10 stsp if (++lineno < s->first_displayed_line)
4029 4f7c3e5e 2020-12-01 naddy if (view->focussed && nprinted == s->selected_line - 1)
4030 f7d12f7e 2018-08-01 stsp wstandout(view->window);
4032 4f7c3e5e 2020-12-01 naddy if (blame->nlines > 0) {
4033 4f7c3e5e 2020-12-01 naddy blame_line = &blame->lines[lineno - 1];
4034 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
4035 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
4036 27a741e5 2019-09-11 stsp !(view->focussed &&
4037 4f7c3e5e 2020-12-01 naddy nprinted == s->selected_line - 1)) {
4038 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
4039 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
4040 8d0fe45a 2019-08-12 stsp char *id_str;
4041 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
4042 8d0fe45a 2019-08-12 stsp if (err) {
4043 8d0fe45a 2019-08-12 stsp free(line);
4044 8d0fe45a 2019-08-12 stsp return err;
4046 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
4048 11b20872 2019-11-08 stsp wattr_on(view->window,
4049 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4050 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
4052 11b20872 2019-11-08 stsp wattr_off(view->window,
4053 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4054 8d0fe45a 2019-08-12 stsp free(id_str);
4055 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
4057 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
4058 8d0fe45a 2019-08-12 stsp prev_id = NULL;
4061 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
4062 ee41ec32 2018-07-10 stsp prev_id = NULL;
4065 4f7c3e5e 2020-12-01 naddy if (view->focussed && nprinted == s->selected_line - 1)
4066 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4067 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
4069 41605754 2020-11-12 stsp if (view->ncols <= 9) {
4070 41605754 2020-11-12 stsp width = 9;
4071 41605754 2020-11-12 stsp wline = wcsdup(L"");
4072 41605754 2020-11-12 stsp if (wline == NULL) {
4073 41605754 2020-11-12 stsp err = got_error_from_errno("wcsdup");
4074 41605754 2020-11-12 stsp free(line);
4075 41605754 2020-11-12 stsp return err;
4077 4f7c3e5e 2020-12-01 naddy } else if (s->first_displayed_line + nprinted ==
4078 4f7c3e5e 2020-12-01 naddy s->matched_line &&
4079 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
4080 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols - 9, 9,
4081 41605754 2020-11-12 stsp view->window, regmatch);
4082 41605754 2020-11-12 stsp if (err) {
4083 41605754 2020-11-12 stsp free(line);
4084 41605754 2020-11-12 stsp return err;
4086 41605754 2020-11-12 stsp width += 9;
4088 41605754 2020-11-12 stsp err = format_line(&wline, &width, line,
4089 41605754 2020-11-12 stsp view->ncols - 9, 9);
4090 41605754 2020-11-12 stsp waddwstr(view->window, wline);
4091 41605754 2020-11-12 stsp free(wline);
4092 41605754 2020-11-12 stsp wline = NULL;
4093 41605754 2020-11-12 stsp width += 9;
4096 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
4097 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
4098 84451b3e 2018-07-10 stsp if (++nprinted == 1)
4099 4f7c3e5e 2020-12-01 naddy s->first_displayed_line = lineno;
4101 826082fe 2020-12-10 stsp free(line);
4102 4f7c3e5e 2020-12-01 naddy s->last_displayed_line = lineno;
4104 1a57306a 2018-09-02 stsp view_vborder(view);
4106 84451b3e 2018-07-10 stsp return NULL;
4109 84451b3e 2018-07-10 stsp static const struct got_error *
4110 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4112 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
4113 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
4114 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
4115 1a76625f 2018-10-22 stsp int errcode;
4117 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
4118 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4119 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
4121 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4122 1a76625f 2018-10-22 stsp if (errcode)
4123 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
4125 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
4126 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
4127 d68a0a7d 2018-07-10 stsp goto done;
4130 d68a0a7d 2018-07-10 stsp if (lineno == -1)
4131 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
4133 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
4134 d68a0a7d 2018-07-10 stsp if (line->annotated)
4135 d68a0a7d 2018-07-10 stsp goto done;
4137 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
4138 84451b3e 2018-07-10 stsp if (line->id == NULL) {
4139 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4140 84451b3e 2018-07-10 stsp goto done;
4142 84451b3e 2018-07-10 stsp line->annotated = 1;
4144 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4145 1a76625f 2018-10-22 stsp if (errcode)
4146 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4147 84451b3e 2018-07-10 stsp return err;
4150 84451b3e 2018-07-10 stsp static void *
4151 84451b3e 2018-07-10 stsp blame_thread(void *arg)
4153 1d0f4054 2021-06-17 stsp const struct got_error *err, *close_err;
4154 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
4155 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
4156 1a76625f 2018-10-22 stsp int errcode;
4158 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
4160 61266923 2020-01-14 stsp return (void *)err;
4162 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
4163 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
4164 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
4165 fc06ba56 2019-08-22 stsp err = NULL;
4167 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4168 1a76625f 2018-10-22 stsp if (errcode)
4169 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
4170 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4172 1d0f4054 2021-06-17 stsp close_err = got_repo_close(ta->repo);
4173 1d0f4054 2021-06-17 stsp if (err == NULL)
4174 1d0f4054 2021-06-17 stsp err = close_err;
4175 c9beca56 2018-07-22 stsp ta->repo = NULL;
4176 c9beca56 2018-07-22 stsp *ta->complete = 1;
4178 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4179 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
4180 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4182 18430de3 2018-07-10 stsp return (void *)err;
4185 245d91c1 2018-07-12 stsp static struct got_object_id *
4186 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
4187 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
4189 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
4191 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
4192 8d0fe45a 2019-08-12 stsp return NULL;
4194 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
4195 245d91c1 2018-07-12 stsp if (!line->annotated)
4196 245d91c1 2018-07-12 stsp return NULL;
4198 245d91c1 2018-07-12 stsp return line->id;
4201 b880a918 2018-07-10 stsp static const struct got_error *
4202 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
4204 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
4207 245d91c1 2018-07-12 stsp if (blame->thread) {
4208 1a76625f 2018-10-22 stsp int errcode;
4209 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4210 1a76625f 2018-10-22 stsp if (errcode)
4211 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4212 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
4213 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
4214 1a76625f 2018-10-22 stsp if (errcode)
4215 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
4216 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4217 1a76625f 2018-10-22 stsp if (errcode)
4218 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4219 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4220 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
4221 245d91c1 2018-07-12 stsp err = NULL;
4222 245d91c1 2018-07-12 stsp blame->thread = NULL;
4224 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
4225 1d0f4054 2021-06-17 stsp const struct got_error *close_err;
4226 1d0f4054 2021-06-17 stsp close_err = got_repo_close(blame->thread_args.repo);
4227 1d0f4054 2021-06-17 stsp if (err == NULL)
4228 1d0f4054 2021-06-17 stsp err = close_err;
4229 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
4231 245d91c1 2018-07-12 stsp if (blame->f) {
4232 56b63ca4 2021-01-22 stsp if (fclose(blame->f) == EOF && err == NULL)
4233 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4234 245d91c1 2018-07-12 stsp blame->f = NULL;
4236 57670559 2018-12-23 stsp if (blame->lines) {
4237 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
4238 57670559 2018-12-23 stsp free(blame->lines[i].id);
4239 57670559 2018-12-23 stsp free(blame->lines);
4240 57670559 2018-12-23 stsp blame->lines = NULL;
4242 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
4243 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
4245 245d91c1 2018-07-12 stsp return err;
4248 245d91c1 2018-07-12 stsp static const struct got_error *
4249 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
4251 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
4252 fc06ba56 2019-08-22 stsp int *done = arg;
4253 fc06ba56 2019-08-22 stsp int errcode;
4255 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4256 fc06ba56 2019-08-22 stsp if (errcode)
4257 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4258 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
4260 fc06ba56 2019-08-22 stsp if (*done)
4261 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
4263 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4264 fc06ba56 2019-08-22 stsp if (errcode)
4265 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4266 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
4268 fc06ba56 2019-08-22 stsp return err;
4271 fc06ba56 2019-08-22 stsp static const struct got_error *
4272 a5388363 2020-12-01 naddy run_blame(struct tog_view *view)
4274 a5388363 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
4275 a5388363 2020-12-01 naddy struct tog_blame *blame = &s->blame;
4276 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
4277 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
4278 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
4279 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
4280 15a94983 2018-12-23 stsp int obj_type;
4282 a5388363 2020-12-01 naddy err = got_object_id_by_path(&obj_id, s->repo, s->blamed_commit->id,
4283 a5388363 2020-12-01 naddy s->path);
4285 15a94983 2018-12-23 stsp return err;
4287 a5388363 2020-12-01 naddy err = got_object_get_type(&obj_type, s->repo, obj_id);
4289 84451b3e 2018-07-10 stsp goto done;
4291 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4292 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
4293 84451b3e 2018-07-10 stsp goto done;
4296 a5388363 2020-12-01 naddy err = got_object_open_as_blob(&blob, s->repo, obj_id, 8192);
4298 a70480e0 2018-06-23 stsp goto done;
4299 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
4300 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
4301 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
4302 84451b3e 2018-07-10 stsp goto done;
4304 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4305 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
4307 1fddf795 2021-01-20 stsp goto done;
4308 1fddf795 2021-01-20 stsp if (blame->nlines == 0) {
4309 1fddf795 2021-01-20 stsp s->blame_complete = 1;
4310 84451b3e 2018-07-10 stsp goto done;
4313 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4314 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4315 b02560ec 2019-08-19 stsp blame->nlines--;
4317 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4318 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
4319 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4320 84451b3e 2018-07-10 stsp goto done;
4323 a5388363 2020-12-01 naddy err = got_repo_open(&thread_repo, got_repo_get_path(s->repo), NULL);
4325 bd24772e 2018-07-11 stsp goto done;
4327 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
4328 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
4329 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
4330 a5388363 2020-12-01 naddy blame->cb_args.commit_id = got_object_id_dup(s->blamed_commit->id);
4331 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
4332 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4333 245d91c1 2018-07-12 stsp goto done;
4335 a5388363 2020-12-01 naddy blame->cb_args.quit = &s->done;
4337 a5388363 2020-12-01 naddy blame->thread_args.path = s->path;
4338 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
4339 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
4340 a5388363 2020-12-01 naddy blame->thread_args.complete = &s->blame_complete;
4341 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
4342 a5388363 2020-12-01 naddy blame->thread_args.cancel_arg = &s->done;
4343 a5388363 2020-12-01 naddy s->blame_complete = 0;
4345 f5a09613 2020-12-13 naddy if (s->first_displayed_line + view->nlines - 1 > blame->nlines) {
4346 f5a09613 2020-12-13 naddy s->first_displayed_line = 1;
4347 f5a09613 2020-12-13 naddy s->last_displayed_line = view->nlines;
4348 f5a09613 2020-12-13 naddy s->selected_line = 1;
4353 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
4354 27d434c2 2018-09-15 stsp free(obj_id);
4356 245d91c1 2018-07-12 stsp stop_blame(blame);
4357 245d91c1 2018-07-12 stsp return err;
4360 245d91c1 2018-07-12 stsp static const struct got_error *
4361 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
4362 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4364 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
4365 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4367 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->blamed_commits);
4369 c4843652 2019-08-12 stsp s->path = strdup(path);
4370 c4843652 2019-08-12 stsp if (s->path == NULL)
4371 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4373 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4374 c4843652 2019-08-12 stsp if (err) {
4375 c4843652 2019-08-12 stsp free(s->path);
4376 7cbe629d 2018-08-04 stsp return err;
4379 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4380 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4381 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4382 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4383 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4384 fb2756b9 2018-08-04 stsp s->repo = repo;
4385 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4386 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4388 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
4389 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4390 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4391 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4393 11b20872 2019-11-08 stsp return err;
4396 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4397 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4398 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4399 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4400 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4402 a5388363 2020-12-01 naddy return run_blame(view);
4405 e5a0f69f 2018-08-18 stsp static const struct got_error *
4406 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4408 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4409 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4411 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4412 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4414 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&s->blamed_commits)) {
4415 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4416 dbdddfee 2021-06-23 naddy blamed_commit = STAILQ_FIRST(&s->blamed_commits);
4417 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
4418 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4421 e5a0f69f 2018-08-18 stsp free(s->path);
4422 11b20872 2019-11-08 stsp free_colors(&s->colors);
4424 e5a0f69f 2018-08-18 stsp return err;
4427 7cbe629d 2018-08-04 stsp static const struct got_error *
4428 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4430 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4432 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4433 6c4c42e0 2019-06-24 stsp return NULL;
4436 6c4c42e0 2019-06-24 stsp static const struct got_error *
4437 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4439 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4440 6c4c42e0 2019-06-24 stsp int lineno;
4441 826082fe 2020-12-10 stsp char *line = NULL;
4442 826082fe 2020-12-10 stsp size_t linesize = 0;
4443 826082fe 2020-12-10 stsp ssize_t linelen;
4445 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4446 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4447 6c4c42e0 2019-06-24 stsp return NULL;
4450 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4451 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4452 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4454 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4456 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4457 6c4c42e0 2019-06-24 stsp lineno = 1;
4459 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4462 6c4c42e0 2019-06-24 stsp while (1) {
4463 6c4c42e0 2019-06-24 stsp off_t offset;
4465 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4466 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4467 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4471 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4472 6c4c42e0 2019-06-24 stsp lineno = 1;
4474 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4477 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4478 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4479 6c4c42e0 2019-06-24 stsp free(line);
4480 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4482 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->blame.f);
4483 826082fe 2020-12-10 stsp if (linelen != -1 &&
4484 41605754 2020-11-12 stsp match_line(line, &view->regex, 1, &view->regmatch)) {
4485 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4486 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
4489 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4494 826082fe 2020-12-10 stsp free(line);
4496 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4497 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4498 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4501 6c4c42e0 2019-06-24 stsp return NULL;
4504 6c4c42e0 2019-06-24 stsp static const struct got_error *
4505 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4507 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4508 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4509 2b380cc8 2018-10-24 stsp int errcode;
4511 1fddf795 2021-01-20 stsp if (s->blame.thread == NULL && !s->blame_complete) {
4512 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4513 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4514 2b380cc8 2018-10-24 stsp if (errcode)
4515 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4517 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4520 51fe7530 2019-08-19 stsp if (s->blame_complete)
4521 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4523 4f7c3e5e 2020-12-01 naddy err = draw_blame(view);
4525 669b5ffa 2018-10-07 stsp view_vborder(view);
4526 e5a0f69f 2018-08-18 stsp return err;
4529 e5a0f69f 2018-08-18 stsp static const struct got_error *
4530 e78dc838 2020-12-04 stsp input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
4532 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4533 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4534 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4535 669b5ffa 2018-10-07 stsp int begin_x = 0;
4537 e5a0f69f 2018-08-18 stsp switch (ch) {
4539 1e37a5c2 2019-05-12 jcs s->done = 1;
4541 4deef56f 2021-09-02 naddy case 'g':
4542 4deef56f 2021-09-02 naddy case KEY_HOME:
4543 4deef56f 2021-09-02 naddy s->selected_line = 1;
4544 4deef56f 2021-09-02 naddy s->first_displayed_line = 1;
4546 4deef56f 2021-09-02 naddy case 'G':
4547 4deef56f 2021-09-02 naddy case KEY_END:
4548 4deef56f 2021-09-02 naddy if (s->blame.nlines < view->nlines - 2) {
4549 4deef56f 2021-09-02 naddy s->selected_line = s->blame.nlines;
4550 4deef56f 2021-09-02 naddy s->first_displayed_line = 1;
4552 4deef56f 2021-09-02 naddy s->selected_line = view->nlines - 2;
4553 4deef56f 2021-09-02 naddy s->first_displayed_line = s->blame.nlines -
4554 4deef56f 2021-09-02 naddy (view->nlines - 3);
4558 1e37a5c2 2019-05-12 jcs case KEY_UP:
4559 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4560 1e37a5c2 2019-05-12 jcs s->selected_line--;
4561 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4562 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4563 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4565 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4566 ea025d1d 2020-02-22 naddy case CTRL('b'):
4567 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4568 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
4571 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
4572 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
4573 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
4575 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4578 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4579 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4580 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4581 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4582 1e37a5c2 2019-05-12 jcs s->selected_line++;
4583 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
4584 1e37a5c2 2019-05-12 jcs s->blame.nlines)
4585 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4588 1e37a5c2 2019-05-12 jcs case 'p': {
4589 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4590 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4591 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4592 1e37a5c2 2019-05-12 jcs if (id == NULL)
4594 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
4595 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
4596 15a94983 2018-12-23 stsp struct got_object_qid *pid;
4597 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
4598 1e37a5c2 2019-05-12 jcs int obj_type;
4599 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
4600 1e37a5c2 2019-05-12 jcs s->repo, id);
4603 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(
4604 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
4605 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
4606 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4609 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
4610 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
4611 1e37a5c2 2019-05-12 jcs pid->id, s->path);
4612 e5a0f69f 2018-08-18 stsp if (err) {
4613 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
4614 1e37a5c2 2019-05-12 jcs err = NULL;
4615 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4618 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
4620 1e37a5c2 2019-05-12 jcs free(blob_id);
4621 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
4622 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
4623 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4626 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4628 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4630 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
4631 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
4633 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4638 1e37a5c2 2019-05-12 jcs s->done = 1;
4639 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4640 1e37a5c2 2019-05-12 jcs s->done = 0;
4641 1e37a5c2 2019-05-12 jcs if (thread_err)
4643 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(&s->blamed_commits,
4644 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
4645 a5388363 2020-12-01 naddy err = run_blame(view);
4650 1e37a5c2 2019-05-12 jcs case 'B': {
4651 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
4652 dbdddfee 2021-06-23 naddy first = STAILQ_FIRST(&s->blamed_commits);
4653 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
4655 1e37a5c2 2019-05-12 jcs s->done = 1;
4656 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4657 1e37a5c2 2019-05-12 jcs s->done = 0;
4658 1e37a5c2 2019-05-12 jcs if (thread_err)
4660 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
4661 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
4662 1e37a5c2 2019-05-12 jcs s->blamed_commit =
4663 dbdddfee 2021-06-23 naddy STAILQ_FIRST(&s->blamed_commits);
4664 a5388363 2020-12-01 naddy err = run_blame(view);
4669 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4670 1e37a5c2 2019-05-12 jcs case '\r': {
4671 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4672 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
4673 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
4674 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4675 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4676 1e37a5c2 2019-05-12 jcs if (id == NULL)
4678 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
4681 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(
4682 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
4683 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4684 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4685 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4686 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
4687 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4688 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
4691 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
4692 78756c87 2020-11-24 stsp id, NULL, NULL, 3, 0, 0, NULL, s->repo);
4693 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4695 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4698 e78dc838 2020-12-04 stsp view->focussed = 0;
4699 e78dc838 2020-12-04 stsp diff_view->focussed = 1;
4700 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4701 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4704 72a9cb46 2020-12-03 stsp view_set_child(view, diff_view);
4705 e78dc838 2020-12-04 stsp view->focus_child = 1;
4707 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
4712 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4713 ea025d1d 2020-02-22 naddy case CTRL('f'):
4715 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4716 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
4717 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
4720 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4721 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
4722 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4723 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4726 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
4727 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
4728 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
4729 1e37a5c2 2019-05-12 jcs view->nlines - 2;
4731 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
4732 1e37a5c2 2019-05-12 jcs s->blame.nlines -
4733 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
4735 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4736 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
4737 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4738 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4744 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
4747 a70480e0 2018-06-23 stsp static const struct got_error *
4748 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
4750 a70480e0 2018-06-23 stsp const struct got_error *error;
4751 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
4752 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
4753 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4754 0587e10c 2020-07-23 stsp char *link_target = NULL;
4755 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4756 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
4758 e1cd8fed 2018-08-01 stsp struct tog_view *view;
4760 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4761 a70480e0 2018-06-23 stsp switch (ch) {
4763 a70480e0 2018-06-23 stsp commit_id_str = optarg;
4766 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4767 69069811 2018-08-02 stsp if (repo_path == NULL)
4768 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4772 17020d27 2019-03-07 stsp usage_blame();
4773 a70480e0 2018-06-23 stsp /* NOTREACHED */
4777 a70480e0 2018-06-23 stsp argc -= optind;
4778 a70480e0 2018-06-23 stsp argv += optind;
4780 f135c941 2020-02-20 stsp if (argc != 1)
4781 a70480e0 2018-06-23 stsp usage_blame();
4783 69069811 2018-08-02 stsp if (repo_path == NULL) {
4784 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
4785 c156c7a4 2020-12-18 stsp if (cwd == NULL)
4786 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
4787 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
4788 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4789 c156c7a4 2020-12-18 stsp goto done;
4790 f135c941 2020-02-20 stsp if (worktree)
4791 eb41ed75 2019-02-05 stsp repo_path =
4792 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4794 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
4795 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
4796 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
4797 c156c7a4 2020-12-18 stsp goto done;
4801 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4802 c02c541e 2019-03-29 stsp if (error != NULL)
4803 8e94dd5b 2019-01-04 stsp goto done;
4805 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4806 f135c941 2020-02-20 stsp worktree);
4807 c02c541e 2019-03-29 stsp if (error)
4808 92205607 2019-01-04 stsp goto done;
4810 f135c941 2020-02-20 stsp init_curses();
4812 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4813 51a10b52 2020-12-26 stsp if (error)
4814 51a10b52 2020-12-26 stsp goto done;
4816 51a10b52 2020-12-26 stsp error = tog_load_refs(repo);
4817 eb41ed75 2019-02-05 stsp if (error)
4818 69069811 2018-08-02 stsp goto done;
4820 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
4821 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
4822 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4823 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4824 a70480e0 2018-06-23 stsp if (error != NULL)
4825 66b4983c 2018-06-23 stsp goto done;
4826 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4827 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
4829 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4830 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
4832 a19e88aa 2018-06-23 stsp if (error != NULL)
4833 8b473291 2019-02-21 stsp goto done;
4835 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4836 e1cd8fed 2018-08-01 stsp if (view == NULL) {
4837 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4838 e1cd8fed 2018-08-01 stsp goto done;
4841 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4842 0587e10c 2020-07-23 stsp commit_id, repo);
4843 7cbe629d 2018-08-04 stsp if (error)
4844 7cbe629d 2018-08-04 stsp goto done;
4846 0587e10c 2020-07-23 stsp error = open_blame_view(view, link_target ? link_target : in_repo_path,
4847 78756c87 2020-11-24 stsp commit_id, repo);
4848 0587e10c 2020-07-23 stsp if (error)
4849 0587e10c 2020-07-23 stsp goto done;
4850 12314ad4 2019-08-31 stsp if (worktree) {
4851 12314ad4 2019-08-31 stsp /* Release work tree lock. */
4852 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
4853 12314ad4 2019-08-31 stsp worktree = NULL;
4855 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4857 69069811 2018-08-02 stsp free(repo_path);
4858 f135c941 2020-02-20 stsp free(in_repo_path);
4859 0587e10c 2020-07-23 stsp free(link_target);
4860 69069811 2018-08-02 stsp free(cwd);
4861 a70480e0 2018-06-23 stsp free(commit_id);
4862 eb41ed75 2019-02-05 stsp if (worktree)
4863 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
4864 1d0f4054 2021-06-17 stsp if (repo) {
4865 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
4866 1d0f4054 2021-06-17 stsp if (error == NULL)
4867 1d0f4054 2021-06-17 stsp error = close_err;
4869 51a10b52 2020-12-26 stsp tog_free_refs();
4870 a70480e0 2018-06-23 stsp return error;
4873 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4874 d86d3b18 2020-12-01 naddy draw_tree_entries(struct tog_view *view, const char *parent_path)
4876 d86d3b18 2020-12-01 naddy struct tog_tree_view_state *s = &view->state.tree;
4877 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4878 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
4879 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
4880 f26dddb7 2019-11-08 stsp struct tog_color *tc;
4881 56e0773d 2019-11-28 stsp int width, n, i, nentries;
4882 d86d3b18 2020-12-01 naddy int limit = view->nlines;
4884 d86d3b18 2020-12-01 naddy s->ndisplayed = 0;
4886 f7d12f7e 2018-08-01 stsp werase(view->window);
4888 ffd1d5e5 2018-06-23 stsp if (limit == 0)
4889 ffd1d5e5 2018-06-23 stsp return NULL;
4891 d86d3b18 2020-12-01 naddy err = format_line(&wline, &width, s->tree_label, view->ncols, 0);
4893 ffd1d5e5 2018-06-23 stsp return err;
4894 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4895 a3404814 2018-09-02 stsp wstandout(view->window);
4896 d86d3b18 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
4898 11b20872 2019-11-08 stsp wattr_on(view->window,
4899 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4900 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4902 11b20872 2019-11-08 stsp wattr_off(view->window,
4903 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4904 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4905 a3404814 2018-09-02 stsp wstandend(view->window);
4906 2550e4c3 2018-07-13 stsp free(wline);
4907 2550e4c3 2018-07-13 stsp wline = NULL;
4908 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4909 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4910 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4911 ffd1d5e5 2018-06-23 stsp return NULL;
4912 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
4914 ce52c690 2018-06-23 stsp return err;
4915 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4916 2550e4c3 2018-07-13 stsp free(wline);
4917 2550e4c3 2018-07-13 stsp wline = NULL;
4918 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4919 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4920 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4921 ffd1d5e5 2018-06-23 stsp return NULL;
4922 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4923 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
4924 a1eca9bb 2018-06-23 stsp return NULL;
4926 d86d3b18 2020-12-01 naddy if (s->first_displayed_entry == NULL) {
4927 d86d3b18 2020-12-01 naddy te = got_object_tree_get_first_entry(s->tree);
4928 d86d3b18 2020-12-01 naddy if (s->selected == 0) {
4929 0cf4efb1 2018-09-29 stsp if (view->focussed)
4930 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4931 d86d3b18 2020-12-01 naddy s->selected_entry = NULL;
4933 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4934 d86d3b18 2020-12-01 naddy if (s->selected == 0 && view->focussed)
4935 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4936 d86d3b18 2020-12-01 naddy s->ndisplayed++;
4937 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4938 ffd1d5e5 2018-06-23 stsp return NULL;
4942 d86d3b18 2020-12-01 naddy te = s->first_displayed_entry;
4945 d86d3b18 2020-12-01 naddy nentries = got_object_tree_get_nentries(s->tree);
4946 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4947 0d6c6ee3 2020-05-20 stsp char *line = NULL, *id_str = NULL, *link_target = NULL;
4948 848d6979 2019-08-12 stsp const char *modestr = "";
4949 56e0773d 2019-11-28 stsp mode_t mode;
4951 d86d3b18 2020-12-01 naddy te = got_object_tree_get_entry(s->tree, i);
4952 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
4954 d86d3b18 2020-12-01 naddy if (s->show_ids) {
4955 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4956 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4958 638f9024 2019-05-13 stsp return got_error_from_errno(
4959 230a42bd 2019-05-11 jcs "got_object_id_str");
4961 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4962 63c5ca5d 2019-08-24 stsp modestr = "$";
4963 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4966 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target,
4967 d86d3b18 2020-12-01 naddy te, s->repo);
4968 0d6c6ee3 2020-05-20 stsp if (err) {
4969 0d6c6ee3 2020-05-20 stsp free(id_str);
4970 0d6c6ee3 2020-05-20 stsp return err;
4972 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4973 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4974 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4976 848d6979 2019-08-12 stsp modestr = "@";
4978 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4979 848d6979 2019-08-12 stsp modestr = "/";
4980 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4981 848d6979 2019-08-12 stsp modestr = "*";
4982 0d6c6ee3 2020-05-20 stsp if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
4983 0d6c6ee3 2020-05-20 stsp got_tree_entry_get_name(te), modestr,
4984 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "",
4985 0d6c6ee3 2020-05-20 stsp link_target ? link_target : "") == -1) {
4986 1d13200f 2018-07-12 stsp free(id_str);
4987 0d6c6ee3 2020-05-20 stsp free(link_target);
4988 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4990 1d13200f 2018-07-12 stsp free(id_str);
4991 0d6c6ee3 2020-05-20 stsp free(link_target);
4992 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4993 ffd1d5e5 2018-06-23 stsp if (err) {
4994 ffd1d5e5 2018-06-23 stsp free(line);
4997 d86d3b18 2020-12-01 naddy if (n == s->selected) {
4998 0cf4efb1 2018-09-29 stsp if (view->focussed)
4999 0cf4efb1 2018-09-29 stsp wstandout(view->window);
5000 d86d3b18 2020-12-01 naddy s->selected_entry = te;
5002 d86d3b18 2020-12-01 naddy tc = match_color(&s->colors, line);
5004 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
5005 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5006 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
5008 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
5009 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5010 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
5011 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
5012 d86d3b18 2020-12-01 naddy if (n == s->selected && view->focussed)
5013 f7d12f7e 2018-08-01 stsp wstandend(view->window);
5014 ffd1d5e5 2018-06-23 stsp free(line);
5015 2550e4c3 2018-07-13 stsp free(wline);
5016 2550e4c3 2018-07-13 stsp wline = NULL;
5018 d86d3b18 2020-12-01 naddy s->ndisplayed++;
5019 d86d3b18 2020-12-01 naddy s->last_displayed_entry = te;
5020 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
5024 ffd1d5e5 2018-06-23 stsp return err;
5027 ffd1d5e5 2018-06-23 stsp static void
5028 3e135950 2020-12-01 naddy tree_scroll_up(struct tog_tree_view_state *s, int maxscroll)
5030 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
5031 694d3271 2020-12-01 naddy int isroot = s->tree == s->root;
5032 fa86c4bf 2020-11-29 stsp int i = 0;
5034 694d3271 2020-12-01 naddy if (s->first_displayed_entry == NULL)
5037 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, s->first_displayed_entry);
5038 fa86c4bf 2020-11-29 stsp while (i++ < maxscroll) {
5039 fa86c4bf 2020-11-29 stsp if (te == NULL) {
5040 fa86c4bf 2020-11-29 stsp if (!isroot)
5041 694d3271 2020-12-01 naddy s->first_displayed_entry = NULL;
5044 694d3271 2020-12-01 naddy s->first_displayed_entry = te;
5045 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, te);
5049 fa86c4bf 2020-11-29 stsp static void
5050 3e135950 2020-12-01 naddy tree_scroll_down(struct tog_tree_view_state *s, int maxscroll)
5052 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
5053 ffd1d5e5 2018-06-23 stsp int n = 0;
5055 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
5056 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree,
5057 694d3271 2020-12-01 naddy s->first_displayed_entry);
5059 694d3271 2020-12-01 naddy next = got_object_tree_get_first_entry(s->tree);
5061 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
5062 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
5063 694d3271 2020-12-01 naddy last = got_tree_entry_get_next(s->tree, last);
5064 768394f3 2019-01-24 stsp if (last) {
5065 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
5066 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree, next);
5071 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5072 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
5073 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
5075 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
5076 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
5077 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
5079 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
5080 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
5081 56e0773d 2019-11-28 stsp + 1 /* slash */;
5083 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
5085 ce52c690 2018-06-23 stsp *path = calloc(1, len);
5086 ffd1d5e5 2018-06-23 stsp if (path == NULL)
5087 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5089 ce52c690 2018-06-23 stsp (*path)[0] = '/';
5090 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
5091 d9765a41 2018-06-23 stsp while (pt) {
5092 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
5093 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
5094 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
5095 cb2ebc8a 2018-06-23 stsp goto done;
5097 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
5098 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
5099 cb2ebc8a 2018-06-23 stsp goto done;
5101 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
5104 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
5105 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
5106 ce52c690 2018-06-23 stsp goto done;
5110 ce52c690 2018-06-23 stsp if (err) {
5111 ce52c690 2018-06-23 stsp free(*path);
5112 ce52c690 2018-06-23 stsp *path = NULL;
5114 ce52c690 2018-06-23 stsp return err;
5117 ce52c690 2018-06-23 stsp static const struct got_error *
5118 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
5119 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
5120 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5122 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
5123 ce52c690 2018-06-23 stsp char *path;
5124 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
5126 a0de39f3 2019-08-09 stsp *new_view = NULL;
5128 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
5130 ce52c690 2018-06-23 stsp return err;
5132 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
5133 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
5134 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
5135 83ce39e3 2019-08-12 stsp goto done;
5138 78756c87 2020-11-24 stsp err = open_blame_view(blame_view, path, commit_id, repo);
5139 e5a0f69f 2018-08-18 stsp if (err) {
5140 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
5141 fc06ba56 2019-08-22 stsp err = NULL;
5142 e5a0f69f 2018-08-18 stsp view_close(blame_view);
5144 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
5146 83ce39e3 2019-08-12 stsp free(path);
5147 69efd4c4 2018-07-18 stsp return err;
5150 69efd4c4 2018-07-18 stsp static const struct got_error *
5151 4e97c21c 2020-12-06 stsp log_selected_tree_entry(struct tog_view **new_view, int begin_x,
5152 4e97c21c 2020-12-06 stsp struct tog_tree_view_state *s)
5154 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
5155 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
5156 69efd4c4 2018-07-18 stsp char *path;
5158 a0de39f3 2019-08-09 stsp *new_view = NULL;
5160 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
5161 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
5162 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
5164 4e97c21c 2020-12-06 stsp err = tree_entry_path(&path, &s->parents, s->selected_entry);
5166 69efd4c4 2018-07-18 stsp return err;
5168 4e97c21c 2020-12-06 stsp err = open_log_view(log_view, s->commit_id, s->repo, s->head_ref_name,
5171 e5a0f69f 2018-08-18 stsp view_close(log_view);
5173 e5a0f69f 2018-08-18 stsp *new_view = log_view;
5174 cb2ebc8a 2018-06-23 stsp free(path);
5175 cb2ebc8a 2018-06-23 stsp return err;
5178 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5179 bc573f3b 2021-07-10 stsp open_tree_view(struct tog_view *view, struct got_object_id *commit_id,
5180 bc573f3b 2021-07-10 stsp const char *head_ref_name, struct got_repository *repo)
5182 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
5183 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
5184 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5185 bc573f3b 2021-07-10 stsp struct got_commit_object *commit = NULL;
5187 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
5188 bc573f3b 2021-07-10 stsp STAILQ_INIT(&s->colors);
5190 bc573f3b 2021-07-10 stsp s->commit_id = got_object_id_dup(commit_id);
5191 bc573f3b 2021-07-10 stsp if (s->commit_id == NULL)
5192 bc573f3b 2021-07-10 stsp return got_error_from_errno("got_object_id_dup");
5194 bc573f3b 2021-07-10 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5196 bc573f3b 2021-07-10 stsp goto done;
5199 bc573f3b 2021-07-10 stsp * The root is opened here and will be closed when the view is closed.
5200 bc573f3b 2021-07-10 stsp * Any visited subtrees and their path-wise parents are opened and
5201 bc573f3b 2021-07-10 stsp * closed on demand.
5203 bc573f3b 2021-07-10 stsp err = got_object_open_as_tree(&s->root, repo,
5204 bc573f3b 2021-07-10 stsp got_object_commit_get_tree_id(commit));
5206 bc573f3b 2021-07-10 stsp goto done;
5207 bc573f3b 2021-07-10 stsp s->tree = s->root;
5209 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
5210 ffd1d5e5 2018-06-23 stsp if (err != NULL)
5211 ffd1d5e5 2018-06-23 stsp goto done;
5213 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
5214 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5215 ffd1d5e5 2018-06-23 stsp goto done;
5218 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
5219 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
5220 9cd7cbd1 2020-12-07 stsp if (head_ref_name) {
5221 9cd7cbd1 2020-12-07 stsp s->head_ref_name = strdup(head_ref_name);
5222 9cd7cbd1 2020-12-07 stsp if (s->head_ref_name == NULL) {
5223 9cd7cbd1 2020-12-07 stsp err = got_error_from_errno("strdup");
5224 9cd7cbd1 2020-12-07 stsp goto done;
5227 fb2756b9 2018-08-04 stsp s->repo = repo;
5229 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5230 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
5231 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
5232 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
5234 c0b01bdb 2019-11-08 stsp goto done;
5235 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5236 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
5238 c0b01bdb 2019-11-08 stsp goto done;
5239 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
5240 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
5241 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5243 c0b01bdb 2019-11-08 stsp goto done;
5245 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
5246 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
5247 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5249 11b20872 2019-11-08 stsp goto done;
5251 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5252 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
5254 c0b01bdb 2019-11-08 stsp goto done;
5257 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
5258 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
5259 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
5260 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
5261 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
5263 ad80ab7b 2018-08-04 stsp free(commit_id_str);
5264 bc573f3b 2021-07-10 stsp if (commit)
5265 bc573f3b 2021-07-10 stsp got_object_commit_close(commit);
5267 bc573f3b 2021-07-10 stsp close_tree_view(view);
5268 ad80ab7b 2018-08-04 stsp return err;
5271 e5a0f69f 2018-08-18 stsp static const struct got_error *
5272 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
5274 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5276 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5277 fb2756b9 2018-08-04 stsp free(s->tree_label);
5278 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5279 6484ec90 2018-09-29 stsp free(s->commit_id);
5280 6484ec90 2018-09-29 stsp s->commit_id = NULL;
5281 9cd7cbd1 2020-12-07 stsp free(s->head_ref_name);
5282 9cd7cbd1 2020-12-07 stsp s->head_ref_name = NULL;
5283 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
5284 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
5285 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
5286 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
5287 bc573f3b 2021-07-10 stsp if (parent->tree != s->root)
5288 bc573f3b 2021-07-10 stsp got_object_tree_close(parent->tree);
5289 ad80ab7b 2018-08-04 stsp free(parent);
5292 bc573f3b 2021-07-10 stsp if (s->tree != NULL && s->tree != s->root)
5293 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
5294 bc573f3b 2021-07-10 stsp if (s->root)
5295 bc573f3b 2021-07-10 stsp got_object_tree_close(s->root);
5296 7c32bd05 2019-06-22 stsp return NULL;
5299 7c32bd05 2019-06-22 stsp static const struct got_error *
5300 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
5302 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5304 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
5305 7c32bd05 2019-06-22 stsp return NULL;
5308 7c32bd05 2019-06-22 stsp static int
5309 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5311 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
5313 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5317 7c32bd05 2019-06-22 stsp static const struct got_error *
5318 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
5320 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5321 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
5323 7c32bd05 2019-06-22 stsp if (!view->searching) {
5324 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5325 7c32bd05 2019-06-22 stsp return NULL;
5328 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5329 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5330 7c32bd05 2019-06-22 stsp if (s->selected_entry)
5331 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
5332 56e0773d 2019-11-28 stsp s->selected_entry);
5334 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5336 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
5337 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5339 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
5340 56e0773d 2019-11-28 stsp s->selected_entry);
5343 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5344 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5346 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5349 7c32bd05 2019-06-22 stsp while (1) {
5350 56e0773d 2019-11-28 stsp if (te == NULL) {
5351 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
5352 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5353 ac66afb8 2019-06-24 stsp return NULL;
5355 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5356 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5358 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5361 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
5362 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5363 56e0773d 2019-11-28 stsp s->matched_entry = te;
5367 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5368 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5370 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
5373 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5374 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
5375 7c32bd05 2019-06-22 stsp s->selected = 0;
5378 e5a0f69f 2018-08-18 stsp return NULL;
5381 ad80ab7b 2018-08-04 stsp static const struct got_error *
5382 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
5384 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
5385 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5386 e5a0f69f 2018-08-18 stsp char *parent_path;
5388 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5390 e5a0f69f 2018-08-18 stsp return err;
5392 d86d3b18 2020-12-01 naddy err = draw_tree_entries(view, parent_path);
5393 e5a0f69f 2018-08-18 stsp free(parent_path);
5395 669b5ffa 2018-10-07 stsp view_vborder(view);
5396 e5a0f69f 2018-08-18 stsp return err;
5399 e5a0f69f 2018-08-18 stsp static const struct got_error *
5400 e78dc838 2020-12-04 stsp input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
5402 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5403 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
5404 152c1c93 2020-11-29 stsp struct tog_view *log_view, *ref_view;
5405 e4526bf5 2021-09-03 naddy struct got_tree_entry *te;
5406 e4526bf5 2021-09-03 naddy int begin_x = 0, n;
5408 e5a0f69f 2018-08-18 stsp switch (ch) {
5410 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
5413 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
5415 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5416 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5417 4e97c21c 2020-12-06 stsp err = log_selected_tree_entry(&log_view, begin_x, s);
5418 e78dc838 2020-12-04 stsp view->focussed = 0;
5419 e78dc838 2020-12-04 stsp log_view->focussed = 1;
5420 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5421 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5423 1e37a5c2 2019-05-12 jcs return err;
5424 72a9cb46 2020-12-03 stsp view_set_child(view, log_view);
5425 e78dc838 2020-12-04 stsp view->focus_child = 1;
5427 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5430 152c1c93 2020-11-29 stsp if (view_is_parent_view(view))
5431 152c1c93 2020-11-29 stsp begin_x = view_split_begin_x(view->begin_x);
5432 152c1c93 2020-11-29 stsp ref_view = view_open(view->nlines, view->ncols,
5433 152c1c93 2020-11-29 stsp view->begin_y, begin_x, TOG_VIEW_REF);
5434 152c1c93 2020-11-29 stsp if (ref_view == NULL)
5435 152c1c93 2020-11-29 stsp return got_error_from_errno("view_open");
5436 152c1c93 2020-11-29 stsp err = open_ref_view(ref_view, s->repo);
5437 152c1c93 2020-11-29 stsp if (err) {
5438 152c1c93 2020-11-29 stsp view_close(ref_view);
5439 152c1c93 2020-11-29 stsp return err;
5441 e78dc838 2020-12-04 stsp view->focussed = 0;
5442 e78dc838 2020-12-04 stsp ref_view->focussed = 1;
5443 152c1c93 2020-11-29 stsp if (view_is_parent_view(view)) {
5444 152c1c93 2020-11-29 stsp err = view_close_child(view);
5446 152c1c93 2020-11-29 stsp return err;
5447 72a9cb46 2020-12-03 stsp view_set_child(view, ref_view);
5448 e78dc838 2020-12-04 stsp view->focus_child = 1;
5450 152c1c93 2020-11-29 stsp *new_view = ref_view;
5452 e4526bf5 2021-09-03 naddy case 'g':
5453 e4526bf5 2021-09-03 naddy case KEY_HOME:
5454 e4526bf5 2021-09-03 naddy s->selected = 0;
5455 e4526bf5 2021-09-03 naddy if (s->tree == s->root)
5456 e4526bf5 2021-09-03 naddy s->first_displayed_entry =
5457 e4526bf5 2021-09-03 naddy got_object_tree_get_first_entry(s->tree);
5459 e4526bf5 2021-09-03 naddy s->first_displayed_entry = NULL;
5461 e4526bf5 2021-09-03 naddy case 'G':
5462 e4526bf5 2021-09-03 naddy case KEY_END:
5463 e4526bf5 2021-09-03 naddy s->selected = 0;
5464 e4526bf5 2021-09-03 naddy te = got_object_tree_get_last_entry(s->tree);
5465 e4526bf5 2021-09-03 naddy for (n = 0; n < view->nlines - 3; n++) {
5466 e4526bf5 2021-09-03 naddy if (te == NULL) {
5467 e4526bf5 2021-09-03 naddy if(s->tree != s->root) {
5468 e4526bf5 2021-09-03 naddy s->first_displayed_entry = NULL;
5473 e4526bf5 2021-09-03 naddy s->first_displayed_entry = te;
5474 e4526bf5 2021-09-03 naddy te = got_tree_entry_get_prev(s->tree, te);
5476 e4526bf5 2021-09-03 naddy if (n > 0)
5477 e4526bf5 2021-09-03 naddy s->selected = n - 1;
5480 1e37a5c2 2019-05-12 jcs case KEY_UP:
5481 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5482 1e37a5c2 2019-05-12 jcs s->selected--;
5485 3e135950 2020-12-01 naddy tree_scroll_up(s, 1);
5487 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5488 ea025d1d 2020-02-22 naddy case CTRL('b'):
5489 fa86c4bf 2020-11-29 stsp if (s->tree == s->root) {
5490 fa86c4bf 2020-11-29 stsp if (got_object_tree_get_first_entry(s->tree) ==
5491 fa86c4bf 2020-11-29 stsp s->first_displayed_entry)
5492 fa86c4bf 2020-11-29 stsp s->selected = 0;
5494 fa86c4bf 2020-11-29 stsp if (s->first_displayed_entry == NULL)
5495 fa86c4bf 2020-11-29 stsp s->selected = 0;
5497 3e135950 2020-12-01 naddy tree_scroll_up(s, MAX(0, view->nlines - 3));
5500 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5501 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5502 1e37a5c2 2019-05-12 jcs s->selected++;
5505 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5507 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5509 3e135950 2020-12-01 naddy tree_scroll_down(s, 1);
5511 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5512 ea025d1d 2020-02-22 naddy case CTRL('f'):
5513 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5515 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5516 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5517 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5520 3e135950 2020-12-01 naddy tree_scroll_down(s, view->nlines - 3);
5522 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5524 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5525 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5526 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5527 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5528 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5530 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5531 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5533 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5534 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5535 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5536 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
5537 1e37a5c2 2019-05-12 jcs s->selected_entry =
5538 1e37a5c2 2019-05-12 jcs parent->selected_entry;
5539 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
5540 1e37a5c2 2019-05-12 jcs free(parent);
5541 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
5542 56e0773d 2019-11-28 stsp s->selected_entry))) {
5543 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
5544 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
5545 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
5548 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, subtree);
5549 941e9f74 2019-05-21 stsp if (err) {
5550 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
5553 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
5554 56e0773d 2019-11-28 stsp s->selected_entry))) {
5555 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
5556 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
5557 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
5559 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
5560 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
5561 78756c87 2020-11-24 stsp s->commit_id, s->repo);
5564 e78dc838 2020-12-04 stsp view->focussed = 0;
5565 e78dc838 2020-12-04 stsp blame_view->focussed = 1;
5566 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
5567 669b5ffa 2018-10-07 stsp err = view_close_child(view);
5569 669b5ffa 2018-10-07 stsp return err;
5570 72a9cb46 2020-12-03 stsp view_set_child(view, blame_view);
5571 e78dc838 2020-12-04 stsp view->focus_child = 1;
5573 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
5576 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5577 1e1ff4ed 2020-12-07 stsp if (view->nlines >= 4 && s->selected >= view->nlines - 3)
5578 1e1ff4ed 2020-12-07 stsp s->selected = view->nlines - 4;
5584 ffd1d5e5 2018-06-23 stsp return err;
5587 ffd1d5e5 2018-06-23 stsp __dead static void
5588 ffd1d5e5 2018-06-23 stsp usage_tree(void)
5591 55cccc34 2020-02-20 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5592 ffd1d5e5 2018-06-23 stsp getprogname());
5596 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5597 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
5599 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
5600 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
5601 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
5602 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5603 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5604 4e97c21c 2020-12-06 stsp const char *commit_id_arg = NULL;
5605 4e97c21c 2020-12-06 stsp char *label = NULL;
5606 4e97c21c 2020-12-06 stsp struct got_reference *ref = NULL;
5607 4e97c21c 2020-12-06 stsp const char *head_ref_name = NULL;
5609 5221c383 2018-08-01 stsp struct tog_view *view;
5611 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5612 ffd1d5e5 2018-06-23 stsp switch (ch) {
5614 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
5617 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
5618 74283ab8 2020-02-07 stsp if (repo_path == NULL)
5619 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
5623 e99e2d15 2020-11-24 naddy usage_tree();
5624 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
5628 ffd1d5e5 2018-06-23 stsp argc -= optind;
5629 ffd1d5e5 2018-06-23 stsp argv += optind;
5631 55cccc34 2020-02-20 stsp if (argc > 1)
5632 e99e2d15 2020-11-24 naddy usage_tree();
5634 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
5635 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
5636 c156c7a4 2020-12-18 stsp if (cwd == NULL)
5637 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
5638 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
5639 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5640 c156c7a4 2020-12-18 stsp goto done;
5641 55cccc34 2020-02-20 stsp if (worktree)
5642 52185f70 2019-02-05 stsp repo_path =
5643 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5645 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
5646 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
5647 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
5648 c156c7a4 2020-12-18 stsp goto done;
5652 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5653 c02c541e 2019-03-29 stsp if (error != NULL)
5654 52185f70 2019-02-05 stsp goto done;
5656 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5657 55cccc34 2020-02-20 stsp repo, worktree);
5658 55cccc34 2020-02-20 stsp if (error)
5659 55cccc34 2020-02-20 stsp goto done;
5661 55cccc34 2020-02-20 stsp init_curses();
5663 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5664 c02c541e 2019-03-29 stsp if (error)
5665 52185f70 2019-02-05 stsp goto done;
5667 51a10b52 2020-12-26 stsp error = tog_load_refs(repo);
5668 51a10b52 2020-12-26 stsp if (error)
5669 51a10b52 2020-12-26 stsp goto done;
5671 4e97c21c 2020-12-06 stsp if (commit_id_arg == NULL) {
5672 4e97c21c 2020-12-06 stsp error = got_repo_match_object_id(&commit_id, &label,
5673 4e97c21c 2020-12-06 stsp worktree ? got_worktree_get_head_ref_name(worktree) :
5674 84de9106 2020-12-26 stsp GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
5675 4e97c21c 2020-12-06 stsp if (error)
5676 4e97c21c 2020-12-06 stsp goto done;
5677 4e97c21c 2020-12-06 stsp head_ref_name = label;
5679 4e97c21c 2020-12-06 stsp error = got_ref_open(&ref, repo, commit_id_arg, 0);
5680 4e97c21c 2020-12-06 stsp if (error == NULL)
5681 4e97c21c 2020-12-06 stsp head_ref_name = got_ref_get_name(ref);
5682 4e97c21c 2020-12-06 stsp else if (error->code != GOT_ERR_NOT_REF)
5683 4e97c21c 2020-12-06 stsp goto done;
5684 4e97c21c 2020-12-06 stsp error = got_repo_match_object_id(&commit_id, NULL,
5685 84de9106 2020-12-26 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
5686 4e97c21c 2020-12-06 stsp if (error)
5687 4e97c21c 2020-12-06 stsp goto done;
5690 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5691 5221c383 2018-08-01 stsp if (view == NULL) {
5692 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5693 5221c383 2018-08-01 stsp goto done;
5695 bc573f3b 2021-07-10 stsp error = open_tree_view(view, commit_id, head_ref_name, repo);
5696 ad80ab7b 2018-08-04 stsp if (error)
5697 ad80ab7b 2018-08-04 stsp goto done;
5698 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
5699 55cccc34 2020-02-20 stsp error = tree_view_walk_path(&view->state.tree, commit_id,
5700 d91faf3b 2020-12-01 naddy in_repo_path);
5701 55cccc34 2020-02-20 stsp if (error)
5702 55cccc34 2020-02-20 stsp goto done;
5705 55cccc34 2020-02-20 stsp if (worktree) {
5706 55cccc34 2020-02-20 stsp /* Release work tree lock. */
5707 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
5708 55cccc34 2020-02-20 stsp worktree = NULL;
5710 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5712 52185f70 2019-02-05 stsp free(repo_path);
5713 e4a0e26d 2020-02-20 stsp free(cwd);
5714 ffd1d5e5 2018-06-23 stsp free(commit_id);
5715 4e97c21c 2020-12-06 stsp free(label);
5717 486cd271 2020-12-06 stsp got_ref_close(ref);
5718 1d0f4054 2021-06-17 stsp if (repo) {
5719 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
5720 1d0f4054 2021-06-17 stsp if (error == NULL)
5721 1d0f4054 2021-06-17 stsp error = close_err;
5723 51a10b52 2020-12-26 stsp tog_free_refs();
5724 ffd1d5e5 2018-06-23 stsp return error;
5727 6458efa5 2020-11-24 stsp static const struct got_error *
5728 6458efa5 2020-11-24 stsp ref_view_load_refs(struct tog_ref_view_state *s)
5730 6458efa5 2020-11-24 stsp struct got_reflist_entry *sre;
5731 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
5733 6458efa5 2020-11-24 stsp s->nrefs = 0;
5734 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(sre, &tog_refs, entry) {
5735 6458efa5 2020-11-24 stsp if (strncmp(got_ref_get_name(sre->ref), "refs/got/", 9) == 0)
5738 6458efa5 2020-11-24 stsp re = malloc(sizeof(*re));
5739 6458efa5 2020-11-24 stsp if (re == NULL)
5740 6458efa5 2020-11-24 stsp return got_error_from_errno("malloc");
5742 8924d611 2020-12-26 stsp re->ref = got_ref_dup(sre->ref);
5743 8924d611 2020-12-26 stsp if (re->ref == NULL)
5744 8924d611 2020-12-26 stsp return got_error_from_errno("got_ref_dup");
5745 6458efa5 2020-11-24 stsp re->idx = s->nrefs++;
5746 6458efa5 2020-11-24 stsp TAILQ_INSERT_TAIL(&s->refs, re, entry);
5749 8924d611 2020-12-26 stsp s->first_displayed_entry = TAILQ_FIRST(&s->refs);
5750 6458efa5 2020-11-24 stsp return NULL;
5754 6458efa5 2020-11-24 stsp ref_view_free_refs(struct tog_ref_view_state *s)
5756 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
5758 6458efa5 2020-11-24 stsp while (!TAILQ_EMPTY(&s->refs)) {
5759 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
5760 6458efa5 2020-11-24 stsp TAILQ_REMOVE(&s->refs, re, entry);
5761 8924d611 2020-12-26 stsp got_ref_close(re->ref);
5766 6458efa5 2020-11-24 stsp static const struct got_error *
5767 6458efa5 2020-11-24 stsp open_ref_view(struct tog_view *view, struct got_repository *repo)
5769 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
5770 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5772 6458efa5 2020-11-24 stsp s->selected_entry = 0;
5773 6458efa5 2020-11-24 stsp s->repo = repo;
5775 6458efa5 2020-11-24 stsp TAILQ_INIT(&s->refs);
5776 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
5778 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
5780 6458efa5 2020-11-24 stsp return err;
5782 6458efa5 2020-11-24 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5783 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/heads/",
5784 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_HEADS,
5785 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_HEADS"));
5787 6458efa5 2020-11-24 stsp goto done;
5789 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/tags/",
5790 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_TAGS,
5791 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_TAGS"));
5793 6458efa5 2020-11-24 stsp goto done;
5795 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/remotes/",
5796 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_REMOTES,
5797 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_REMOTES"));
5799 6458efa5 2020-11-24 stsp goto done;
5802 6458efa5 2020-11-24 stsp view->show = show_ref_view;
5803 6458efa5 2020-11-24 stsp view->input = input_ref_view;
5804 6458efa5 2020-11-24 stsp view->close = close_ref_view;
5805 6458efa5 2020-11-24 stsp view->search_start = search_start_ref_view;
5806 6458efa5 2020-11-24 stsp view->search_next = search_next_ref_view;
5809 6458efa5 2020-11-24 stsp free_colors(&s->colors);
5810 6458efa5 2020-11-24 stsp return err;
5813 6458efa5 2020-11-24 stsp static const struct got_error *
5814 6458efa5 2020-11-24 stsp close_ref_view(struct tog_view *view)
5816 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5818 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
5819 6458efa5 2020-11-24 stsp free_colors(&s->colors);
5821 6458efa5 2020-11-24 stsp return NULL;
5824 6458efa5 2020-11-24 stsp static const struct got_error *
5825 c42c9805 2020-11-24 stsp resolve_reflist_entry(struct got_object_id **commit_id,
5826 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
5828 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
5829 c42c9805 2020-11-24 stsp struct got_object_id *obj_id;
5830 6458efa5 2020-11-24 stsp struct got_tag_object *tag = NULL;
5831 6458efa5 2020-11-24 stsp int obj_type;
5833 c42c9805 2020-11-24 stsp *commit_id = NULL;
5835 6458efa5 2020-11-24 stsp err = got_ref_resolve(&obj_id, repo, re->ref);
5837 6458efa5 2020-11-24 stsp return err;
5839 6458efa5 2020-11-24 stsp err = got_object_get_type(&obj_type, repo, obj_id);
5841 6458efa5 2020-11-24 stsp goto done;
5843 6458efa5 2020-11-24 stsp switch (obj_type) {
5844 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_COMMIT:
5845 c42c9805 2020-11-24 stsp *commit_id = obj_id;
5847 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_TAG:
5848 6458efa5 2020-11-24 stsp err = got_object_open_as_tag(&tag, repo, obj_id);
5850 6458efa5 2020-11-24 stsp goto done;
5851 c42c9805 2020-11-24 stsp free(obj_id);
5852 c42c9805 2020-11-24 stsp err = got_object_get_type(&obj_type, repo,
5853 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
5855 6458efa5 2020-11-24 stsp goto done;
5856 c42c9805 2020-11-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT) {
5857 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
5858 c42c9805 2020-11-24 stsp goto done;
5860 c42c9805 2020-11-24 stsp *commit_id = got_object_id_dup(
5861 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
5862 c42c9805 2020-11-24 stsp if (*commit_id == NULL) {
5863 c42c9805 2020-11-24 stsp err = got_error_from_errno("got_object_id_dup");
5864 c42c9805 2020-11-24 stsp goto done;
5868 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
5874 c42c9805 2020-11-24 stsp got_object_tag_close(tag);
5875 c42c9805 2020-11-24 stsp if (err) {
5876 c42c9805 2020-11-24 stsp free(*commit_id);
5877 c42c9805 2020-11-24 stsp *commit_id = NULL;
5879 c42c9805 2020-11-24 stsp return err;
5882 c42c9805 2020-11-24 stsp static const struct got_error *
5883 c42c9805 2020-11-24 stsp log_ref_entry(struct tog_view **new_view, int begin_x,
5884 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
5886 c42c9805 2020-11-24 stsp struct tog_view *log_view;
5887 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
5888 c42c9805 2020-11-24 stsp struct got_object_id *commit_id = NULL;
5890 c42c9805 2020-11-24 stsp *new_view = NULL;
5892 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
5893 c42c9805 2020-11-24 stsp if (err) {
5894 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
5895 c42c9805 2020-11-24 stsp return err;
5897 c42c9805 2020-11-24 stsp return NULL;
5900 6458efa5 2020-11-24 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
5901 6458efa5 2020-11-24 stsp if (log_view == NULL) {
5902 6458efa5 2020-11-24 stsp err = got_error_from_errno("view_open");
5903 6458efa5 2020-11-24 stsp goto done;
5906 ee756517 2020-12-05 stsp err = open_log_view(log_view, commit_id, repo,
5907 ee756517 2020-12-05 stsp got_ref_get_name(re->ref), "", 0);
5910 6458efa5 2020-11-24 stsp view_close(log_view);
5912 6458efa5 2020-11-24 stsp *new_view = log_view;
5913 c42c9805 2020-11-24 stsp free(commit_id);
5914 6458efa5 2020-11-24 stsp return err;
5917 ce5b7c56 2019-07-09 stsp static void
5918 3e135950 2020-12-01 naddy ref_scroll_up(struct tog_ref_view_state *s, int maxscroll)
5920 34ba6917 2020-11-30 stsp struct tog_reflist_entry *re;
5921 34ba6917 2020-11-30 stsp int i = 0;
5923 694d3271 2020-12-01 naddy if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
5926 694d3271 2020-12-01 naddy re = TAILQ_PREV(s->first_displayed_entry, tog_reflist_head, entry);
5927 34ba6917 2020-11-30 stsp while (i++ < maxscroll) {
5928 34ba6917 2020-11-30 stsp if (re == NULL)
5930 694d3271 2020-12-01 naddy s->first_displayed_entry = re;
5931 34ba6917 2020-11-30 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
5935 34ba6917 2020-11-30 stsp static void
5936 3e135950 2020-12-01 naddy ref_scroll_down(struct tog_ref_view_state *s, int maxscroll)
5938 6458efa5 2020-11-24 stsp struct tog_reflist_entry *next, *last;
5939 6458efa5 2020-11-24 stsp int n = 0;
5941 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
5942 694d3271 2020-12-01 naddy next = TAILQ_NEXT(s->first_displayed_entry, entry);
5944 694d3271 2020-12-01 naddy next = TAILQ_FIRST(&s->refs);
5946 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
5947 6458efa5 2020-11-24 stsp while (next && last && n++ < maxscroll) {
5948 6458efa5 2020-11-24 stsp last = TAILQ_NEXT(last, entry);
5949 6458efa5 2020-11-24 stsp if (last) {
5950 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
5951 6458efa5 2020-11-24 stsp next = TAILQ_NEXT(next, entry);
5956 6458efa5 2020-11-24 stsp static const struct got_error *
5957 6458efa5 2020-11-24 stsp search_start_ref_view(struct tog_view *view)
5959 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5961 6458efa5 2020-11-24 stsp s->matched_entry = NULL;
5962 6458efa5 2020-11-24 stsp return NULL;
5965 6458efa5 2020-11-24 stsp static int
5966 6458efa5 2020-11-24 stsp match_reflist_entry(struct tog_reflist_entry *re, regex_t *regex)
5968 6458efa5 2020-11-24 stsp regmatch_t regmatch;
5970 6458efa5 2020-11-24 stsp return regexec(regex, got_ref_get_name(re->ref), 1, ®match,
5974 6458efa5 2020-11-24 stsp static const struct got_error *
5975 6458efa5 2020-11-24 stsp search_next_ref_view(struct tog_view *view)
5977 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5978 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re = NULL;
5980 6458efa5 2020-11-24 stsp if (!view->searching) {
5981 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5982 6458efa5 2020-11-24 stsp return NULL;
5985 6458efa5 2020-11-24 stsp if (s->matched_entry) {
5986 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5987 6458efa5 2020-11-24 stsp if (s->selected_entry)
5988 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(s->selected_entry, entry);
5990 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
5991 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
5993 6458efa5 2020-11-24 stsp if (s->selected_entry == NULL)
5994 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
5996 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
5997 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
6000 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
6001 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
6003 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
6006 6458efa5 2020-11-24 stsp while (1) {
6007 6458efa5 2020-11-24 stsp if (re == NULL) {
6008 6458efa5 2020-11-24 stsp if (s->matched_entry == NULL) {
6009 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6010 6458efa5 2020-11-24 stsp return NULL;
6012 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
6013 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
6015 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
6018 6458efa5 2020-11-24 stsp if (match_reflist_entry(re, &view->regex)) {
6019 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6020 6458efa5 2020-11-24 stsp s->matched_entry = re;
6024 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
6025 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
6027 6458efa5 2020-11-24 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
6030 6458efa5 2020-11-24 stsp if (s->matched_entry) {
6031 6458efa5 2020-11-24 stsp s->first_displayed_entry = s->matched_entry;
6032 6458efa5 2020-11-24 stsp s->selected = 0;
6035 6458efa5 2020-11-24 stsp return NULL;
6038 6458efa5 2020-11-24 stsp static const struct got_error *
6039 6458efa5 2020-11-24 stsp show_ref_view(struct tog_view *view)
6041 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
6042 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6043 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
6044 6458efa5 2020-11-24 stsp char *line = NULL;
6045 6458efa5 2020-11-24 stsp wchar_t *wline;
6046 6458efa5 2020-11-24 stsp struct tog_color *tc;
6047 6458efa5 2020-11-24 stsp int width, n;
6048 6458efa5 2020-11-24 stsp int limit = view->nlines;
6050 6458efa5 2020-11-24 stsp werase(view->window);
6052 6458efa5 2020-11-24 stsp s->ndisplayed = 0;
6054 6458efa5 2020-11-24 stsp if (limit == 0)
6055 6458efa5 2020-11-24 stsp return NULL;
6057 34ba6917 2020-11-30 stsp re = s->first_displayed_entry;
6059 6458efa5 2020-11-24 stsp if (asprintf(&line, "references [%d/%d]", re->idx + s->selected + 1,
6060 6458efa5 2020-11-24 stsp s->nrefs) == -1)
6061 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
6063 6458efa5 2020-11-24 stsp err = format_line(&wline, &width, line, view->ncols, 0);
6064 6458efa5 2020-11-24 stsp if (err) {
6065 6458efa5 2020-11-24 stsp free(line);
6066 6458efa5 2020-11-24 stsp return err;
6068 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
6069 6458efa5 2020-11-24 stsp wstandout(view->window);
6070 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
6071 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
6072 6458efa5 2020-11-24 stsp wstandend(view->window);
6073 6458efa5 2020-11-24 stsp free(wline);
6074 6458efa5 2020-11-24 stsp wline = NULL;
6075 6458efa5 2020-11-24 stsp free(line);
6076 6458efa5 2020-11-24 stsp line = NULL;
6077 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
6078 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
6079 6458efa5 2020-11-24 stsp if (--limit <= 0)
6080 6458efa5 2020-11-24 stsp return NULL;
6083 6458efa5 2020-11-24 stsp while (re && limit > 0) {
6084 6458efa5 2020-11-24 stsp char *line = NULL;
6086 6458efa5 2020-11-24 stsp if (got_ref_is_symbolic(re->ref)) {
6087 6458efa5 2020-11-24 stsp if (asprintf(&line, "%s -> %s",
6088 6458efa5 2020-11-24 stsp got_ref_get_name(re->ref),
6089 6458efa5 2020-11-24 stsp got_ref_get_symref_target(re->ref)) == -1)
6090 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
6091 6458efa5 2020-11-24 stsp } else if (s->show_ids) {
6092 6458efa5 2020-11-24 stsp struct got_object_id *id;
6093 6458efa5 2020-11-24 stsp char *id_str;
6094 6458efa5 2020-11-24 stsp err = got_ref_resolve(&id, s->repo, re->ref);
6096 6458efa5 2020-11-24 stsp return err;
6097 6458efa5 2020-11-24 stsp err = got_object_id_str(&id_str, id);
6098 6458efa5 2020-11-24 stsp if (err) {
6100 6458efa5 2020-11-24 stsp return err;
6102 6458efa5 2020-11-24 stsp if (asprintf(&line, "%s: %s",
6103 6458efa5 2020-11-24 stsp got_ref_get_name(re->ref), id_str) == -1) {
6104 6458efa5 2020-11-24 stsp err = got_error_from_errno("asprintf");
6106 6458efa5 2020-11-24 stsp free(id_str);
6107 6458efa5 2020-11-24 stsp return err;
6110 6458efa5 2020-11-24 stsp free(id_str);
6112 6458efa5 2020-11-24 stsp line = strdup(got_ref_get_name(re->ref));
6113 6458efa5 2020-11-24 stsp if (line == NULL)
6114 6458efa5 2020-11-24 stsp return got_error_from_errno("strdup");
6117 6458efa5 2020-11-24 stsp err = format_line(&wline, &width, line, view->ncols, 0);
6118 6458efa5 2020-11-24 stsp if (err) {
6119 6458efa5 2020-11-24 stsp free(line);
6120 6458efa5 2020-11-24 stsp return err;
6122 6458efa5 2020-11-24 stsp if (n == s->selected) {
6123 6458efa5 2020-11-24 stsp if (view->focussed)
6124 6458efa5 2020-11-24 stsp wstandout(view->window);
6125 6458efa5 2020-11-24 stsp s->selected_entry = re;
6127 6458efa5 2020-11-24 stsp tc = match_color(&s->colors, got_ref_get_name(re->ref));
6129 6458efa5 2020-11-24 stsp wattr_on(view->window,
6130 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
6131 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
6133 6458efa5 2020-11-24 stsp wattr_off(view->window,
6134 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
6135 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
6136 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
6137 6458efa5 2020-11-24 stsp if (n == s->selected && view->focussed)
6138 6458efa5 2020-11-24 stsp wstandend(view->window);
6139 6458efa5 2020-11-24 stsp free(line);
6140 6458efa5 2020-11-24 stsp free(wline);
6141 6458efa5 2020-11-24 stsp wline = NULL;
6143 6458efa5 2020-11-24 stsp s->ndisplayed++;
6144 6458efa5 2020-11-24 stsp s->last_displayed_entry = re;
6147 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
6150 6458efa5 2020-11-24 stsp view_vborder(view);
6151 6458efa5 2020-11-24 stsp return err;
6154 6458efa5 2020-11-24 stsp static const struct got_error *
6155 c42c9805 2020-11-24 stsp browse_ref_tree(struct tog_view **new_view, int begin_x,
6156 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
6158 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
6159 bc573f3b 2021-07-10 stsp struct got_object_id *commit_id = NULL;
6160 c42c9805 2020-11-24 stsp struct tog_view *tree_view;
6162 c42c9805 2020-11-24 stsp *new_view = NULL;
6164 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
6165 c42c9805 2020-11-24 stsp if (err) {
6166 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
6167 c42c9805 2020-11-24 stsp return err;
6169 c42c9805 2020-11-24 stsp return NULL;
6173 c42c9805 2020-11-24 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
6174 c42c9805 2020-11-24 stsp if (tree_view == NULL) {
6175 c42c9805 2020-11-24 stsp err = got_error_from_errno("view_open");
6176 c42c9805 2020-11-24 stsp goto done;
6179 bc573f3b 2021-07-10 stsp err = open_tree_view(tree_view, commit_id,
6180 4e97c21c 2020-12-06 stsp got_ref_get_name(re->ref), repo);
6182 c42c9805 2020-11-24 stsp goto done;
6184 c42c9805 2020-11-24 stsp *new_view = tree_view;
6186 c42c9805 2020-11-24 stsp free(commit_id);
6187 c42c9805 2020-11-24 stsp return err;
6189 c42c9805 2020-11-24 stsp static const struct got_error *
6190 e78dc838 2020-12-04 stsp input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
6192 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
6193 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6194 c42c9805 2020-11-24 stsp struct tog_view *log_view, *tree_view;
6195 e4526bf5 2021-09-03 naddy struct tog_reflist_entry *re;
6196 e4526bf5 2021-09-03 naddy int begin_x = 0, n;
6198 6458efa5 2020-11-24 stsp switch (ch) {
6200 6458efa5 2020-11-24 stsp s->show_ids = !s->show_ids;
6202 6458efa5 2020-11-24 stsp case KEY_ENTER:
6203 6458efa5 2020-11-24 stsp case '\r':
6204 6458efa5 2020-11-24 stsp if (!s->selected_entry)
6206 6458efa5 2020-11-24 stsp if (view_is_parent_view(view))
6207 6458efa5 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
6208 6458efa5 2020-11-24 stsp err = log_ref_entry(&log_view, begin_x, s->selected_entry,
6210 e78dc838 2020-12-04 stsp view->focussed = 0;
6211 e78dc838 2020-12-04 stsp log_view->focussed = 1;
6212 6458efa5 2020-11-24 stsp if (view_is_parent_view(view)) {
6213 6458efa5 2020-11-24 stsp err = view_close_child(view);
6215 6458efa5 2020-11-24 stsp return err;
6216 72a9cb46 2020-12-03 stsp view_set_child(view, log_view);
6217 e78dc838 2020-12-04 stsp view->focus_child = 1;
6219 6458efa5 2020-11-24 stsp *new_view = log_view;
6222 c42c9805 2020-11-24 stsp if (!s->selected_entry)
6224 c42c9805 2020-11-24 stsp if (view_is_parent_view(view))
6225 c42c9805 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
6226 c42c9805 2020-11-24 stsp err = browse_ref_tree(&tree_view, begin_x, s->selected_entry,
6228 c42c9805 2020-11-24 stsp if (err || tree_view == NULL)
6230 e78dc838 2020-12-04 stsp view->focussed = 0;
6231 e78dc838 2020-12-04 stsp tree_view->focussed = 1;
6232 c42c9805 2020-11-24 stsp if (view_is_parent_view(view)) {
6233 c42c9805 2020-11-24 stsp err = view_close_child(view);
6235 c42c9805 2020-11-24 stsp return err;
6236 72a9cb46 2020-12-03 stsp view_set_child(view, tree_view);
6237 e78dc838 2020-12-04 stsp view->focus_child = 1;
6239 c42c9805 2020-11-24 stsp *new_view = tree_view;
6241 e4526bf5 2021-09-03 naddy case 'g':
6242 e4526bf5 2021-09-03 naddy case KEY_HOME:
6243 e4526bf5 2021-09-03 naddy s->selected = 0;
6244 e4526bf5 2021-09-03 naddy s->first_displayed_entry = TAILQ_FIRST(&s->refs);
6246 e4526bf5 2021-09-03 naddy case 'G':
6247 e4526bf5 2021-09-03 naddy case KEY_END:
6248 e4526bf5 2021-09-03 naddy s->selected = 0;
6249 e4526bf5 2021-09-03 naddy re = TAILQ_LAST(&s->refs, tog_reflist_head);
6250 e4526bf5 2021-09-03 naddy for (n = 0; n < view->nlines - 1; n++) {
6251 e4526bf5 2021-09-03 naddy if (re == NULL)
6253 e4526bf5 2021-09-03 naddy s->first_displayed_entry = re;
6254 e4526bf5 2021-09-03 naddy re = TAILQ_PREV(re, tog_reflist_head, entry);
6256 e4526bf5 2021-09-03 naddy if (n > 0)
6257 e4526bf5 2021-09-03 naddy s->selected = n - 1;
6260 6458efa5 2020-11-24 stsp case KEY_UP:
6261 6458efa5 2020-11-24 stsp if (s->selected > 0) {
6262 6458efa5 2020-11-24 stsp s->selected--;
6265 3e135950 2020-12-01 naddy ref_scroll_up(s, 1);
6267 6458efa5 2020-11-24 stsp case KEY_PPAGE:
6268 6458efa5 2020-11-24 stsp case CTRL('b'):
6269 34ba6917 2020-11-30 stsp if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
6270 34ba6917 2020-11-30 stsp s->selected = 0;
6271 3e135950 2020-12-01 naddy ref_scroll_up(s, MAX(0, view->nlines - 1));
6274 6458efa5 2020-11-24 stsp case KEY_DOWN:
6275 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1) {
6276 6458efa5 2020-11-24 stsp s->selected++;
6279 6458efa5 2020-11-24 stsp if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL)
6280 6458efa5 2020-11-24 stsp /* can't scroll any further */
6282 3e135950 2020-12-01 naddy ref_scroll_down(s, 1);
6284 6458efa5 2020-11-24 stsp case KEY_NPAGE:
6285 6458efa5 2020-11-24 stsp case CTRL('f'):
6286 6458efa5 2020-11-24 stsp if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL) {
6287 6458efa5 2020-11-24 stsp /* can't scroll any further; move cursor down */
6288 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1)
6289 6458efa5 2020-11-24 stsp s->selected = s->ndisplayed - 1;
6292 3e135950 2020-12-01 naddy ref_scroll_down(s, view->nlines - 1);
6294 6458efa5 2020-11-24 stsp case CTRL('l'):
6295 8924d611 2020-12-26 stsp tog_free_refs();
6296 8924d611 2020-12-26 stsp err = tog_load_refs(s->repo);
6299 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
6300 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
6302 6458efa5 2020-11-24 stsp case KEY_RESIZE:
6303 8b5b8d0c 2020-12-06 stsp if (view->nlines >= 2 && s->selected >= view->nlines - 1)
6304 8b5b8d0c 2020-12-06 stsp s->selected = view->nlines - 2;
6310 6458efa5 2020-11-24 stsp return err;
6313 6458efa5 2020-11-24 stsp __dead static void
6314 6458efa5 2020-11-24 stsp usage_ref(void)
6317 6458efa5 2020-11-24 stsp fprintf(stderr, "usage: %s ref [-r repository-path]\n",
6318 6458efa5 2020-11-24 stsp getprogname());
6322 6458efa5 2020-11-24 stsp static const struct got_error *
6323 6458efa5 2020-11-24 stsp cmd_ref(int argc, char *argv[])
6325 6458efa5 2020-11-24 stsp const struct got_error *error;
6326 6458efa5 2020-11-24 stsp struct got_repository *repo = NULL;
6327 6458efa5 2020-11-24 stsp struct got_worktree *worktree = NULL;
6328 6458efa5 2020-11-24 stsp char *cwd = NULL, *repo_path = NULL;
6330 6458efa5 2020-11-24 stsp struct tog_view *view;
6332 6458efa5 2020-11-24 stsp while ((ch = getopt(argc, argv, "r:")) != -1) {
6333 6458efa5 2020-11-24 stsp switch (ch) {
6335 6458efa5 2020-11-24 stsp repo_path = realpath(optarg, NULL);
6336 6458efa5 2020-11-24 stsp if (repo_path == NULL)
6337 6458efa5 2020-11-24 stsp return got_error_from_errno2("realpath",
6341 e99e2d15 2020-11-24 naddy usage_ref();
6342 6458efa5 2020-11-24 stsp /* NOTREACHED */
6346 6458efa5 2020-11-24 stsp argc -= optind;
6347 6458efa5 2020-11-24 stsp argv += optind;
6349 6458efa5 2020-11-24 stsp if (argc > 1)
6350 e99e2d15 2020-11-24 naddy usage_ref();
6352 6458efa5 2020-11-24 stsp if (repo_path == NULL) {
6353 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
6354 c156c7a4 2020-12-18 stsp if (cwd == NULL)
6355 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
6356 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
6357 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6358 c156c7a4 2020-12-18 stsp goto done;
6359 6458efa5 2020-11-24 stsp if (worktree)
6360 6458efa5 2020-11-24 stsp repo_path =
6361 6458efa5 2020-11-24 stsp strdup(got_worktree_get_repo_path(worktree));
6363 6458efa5 2020-11-24 stsp repo_path = strdup(cwd);
6364 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
6365 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
6366 c156c7a4 2020-12-18 stsp goto done;
6370 6458efa5 2020-11-24 stsp error = got_repo_open(&repo, repo_path, NULL);
6371 6458efa5 2020-11-24 stsp if (error != NULL)
6372 6458efa5 2020-11-24 stsp goto done;
6374 6458efa5 2020-11-24 stsp init_curses();
6376 6458efa5 2020-11-24 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
6377 51a10b52 2020-12-26 stsp if (error)
6378 51a10b52 2020-12-26 stsp goto done;
6380 51a10b52 2020-12-26 stsp error = tog_load_refs(repo);
6381 6458efa5 2020-11-24 stsp if (error)
6382 6458efa5 2020-11-24 stsp goto done;
6384 6458efa5 2020-11-24 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_REF);
6385 6458efa5 2020-11-24 stsp if (view == NULL) {
6386 6458efa5 2020-11-24 stsp error = got_error_from_errno("view_open");
6387 6458efa5 2020-11-24 stsp goto done;
6390 6458efa5 2020-11-24 stsp error = open_ref_view(view, repo);
6391 6458efa5 2020-11-24 stsp if (error)
6392 6458efa5 2020-11-24 stsp goto done;
6394 6458efa5 2020-11-24 stsp if (worktree) {
6395 6458efa5 2020-11-24 stsp /* Release work tree lock. */
6396 6458efa5 2020-11-24 stsp got_worktree_close(worktree);
6397 6458efa5 2020-11-24 stsp worktree = NULL;
6399 6458efa5 2020-11-24 stsp error = view_loop(view);
6401 6458efa5 2020-11-24 stsp free(repo_path);
6402 6458efa5 2020-11-24 stsp free(cwd);
6403 1d0f4054 2021-06-17 stsp if (repo) {
6404 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
6405 1d0f4054 2021-06-17 stsp if (close_err)
6406 1d0f4054 2021-06-17 stsp error = close_err;
6408 51a10b52 2020-12-26 stsp tog_free_refs();
6409 6458efa5 2020-11-24 stsp return error;
6412 6458efa5 2020-11-24 stsp static void
6413 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
6417 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
6418 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
6419 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
6420 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->name);
6422 6879ba42 2020-10-01 naddy fputc('\n', fp);
6425 4ed7e80c 2018-05-20 stsp __dead static void
6426 6879ba42 2020-10-01 naddy usage(int hflag, int status)
6428 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
6430 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
6431 6879ba42 2020-10-01 naddy getprogname());
6432 6879ba42 2020-10-01 naddy if (hflag) {
6433 6879ba42 2020-10-01 naddy fprintf(fp, "lazy usage: %s path\n", getprogname());
6434 6879ba42 2020-10-01 naddy list_commands(fp);
6436 6879ba42 2020-10-01 naddy exit(status);
6439 c2301be8 2018-04-30 stsp static char **
6440 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
6442 ee85c5e8 2020-02-29 stsp va_list ap;
6443 c2301be8 2018-04-30 stsp char **argv;
6446 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
6448 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
6449 c2301be8 2018-04-30 stsp if (argv == NULL)
6450 c2301be8 2018-04-30 stsp err(1, "calloc");
6451 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
6452 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
6453 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
6454 e10c916e 2019-09-15 hiltjo err(1, "strdup");
6457 ee85c5e8 2020-02-29 stsp va_end(ap);
6458 c2301be8 2018-04-30 stsp return argv;
6462 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
6463 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
6464 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
6465 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
6466 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
6468 ee85c5e8 2020-02-29 stsp static const struct got_error *
6469 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
6471 1d0f4054 2021-06-17 stsp const struct got_error *error = NULL, *close_err;
6472 ee85c5e8 2020-02-29 stsp struct tog_cmd *cmd = NULL;
6473 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
6474 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
6475 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
6476 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6477 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
6479 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
6480 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
6481 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
6483 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
6484 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6485 ee85c5e8 2020-02-29 stsp goto done;
6487 ee85c5e8 2020-02-29 stsp if (worktree)
6488 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
6490 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
6491 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
6492 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
6493 ee85c5e8 2020-02-29 stsp goto done;
6496 ee85c5e8 2020-02-29 stsp error = got_repo_open(&repo, repo_path, NULL);
6497 ee85c5e8 2020-02-29 stsp if (error != NULL)
6498 ee85c5e8 2020-02-29 stsp goto done;
6500 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
6501 ee85c5e8 2020-02-29 stsp repo, worktree);
6502 ee85c5e8 2020-02-29 stsp if (error)
6503 ee85c5e8 2020-02-29 stsp goto done;
6505 87670572 2020-12-26 naddy error = tog_load_refs(repo);
6506 84de9106 2020-12-26 stsp if (error)
6507 84de9106 2020-12-26 stsp goto done;
6508 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
6509 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
6510 87670572 2020-12-26 naddy GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
6511 ee85c5e8 2020-02-29 stsp if (error)
6512 ee85c5e8 2020-02-29 stsp goto done;
6514 ee85c5e8 2020-02-29 stsp if (worktree) {
6515 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
6516 ee85c5e8 2020-02-29 stsp worktree = NULL;
6519 ee85c5e8 2020-02-29 stsp error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
6520 ee85c5e8 2020-02-29 stsp if (error) {
6521 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
6522 ee85c5e8 2020-02-29 stsp goto done;
6523 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
6524 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
6525 6879ba42 2020-10-01 naddy usage(1, 1);
6526 ee85c5e8 2020-02-29 stsp /* not reached */
6529 1d0f4054 2021-06-17 stsp close_err = got_repo_close(repo);
6530 1d0f4054 2021-06-17 stsp if (error == NULL)
6531 1d0f4054 2021-06-17 stsp error = close_err;
6532 ee85c5e8 2020-02-29 stsp repo = NULL;
6534 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
6535 ee85c5e8 2020-02-29 stsp if (error)
6536 ee85c5e8 2020-02-29 stsp goto done;
6538 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
6540 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
6541 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
6543 1d0f4054 2021-06-17 stsp if (repo) {
6544 1d0f4054 2021-06-17 stsp close_err = got_repo_close(repo);
6545 1d0f4054 2021-06-17 stsp if (error == NULL)
6546 1d0f4054 2021-06-17 stsp error = close_err;
6548 ee85c5e8 2020-02-29 stsp if (worktree)
6549 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
6551 ee85c5e8 2020-02-29 stsp free(commit_id_str);
6552 ee85c5e8 2020-02-29 stsp free(commit_id);
6553 ee85c5e8 2020-02-29 stsp free(cwd);
6554 ee85c5e8 2020-02-29 stsp free(repo_path);
6555 ee85c5e8 2020-02-29 stsp free(in_repo_path);
6556 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
6558 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
6559 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
6560 ee85c5e8 2020-02-29 stsp free(cmd_argv);
6562 87670572 2020-12-26 naddy tog_free_refs();
6563 ee85c5e8 2020-02-29 stsp return error;
6567 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
6569 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
6570 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
6571 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
6572 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
6573 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
6574 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
6575 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0}
6578 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
6580 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
6581 9f7d7167 2018-04-29 stsp switch (ch) {
6583 9f7d7167 2018-04-29 stsp hflag = 1;
6586 53ccebc2 2019-07-30 stsp Vflag = 1;
6589 6879ba42 2020-10-01 naddy usage(hflag, 1);
6590 9f7d7167 2018-04-29 stsp /* NOTREACHED */
6594 9f7d7167 2018-04-29 stsp argc -= optind;
6595 9f7d7167 2018-04-29 stsp argv += optind;
6596 9814e6a3 2020-09-27 naddy optind = 1;
6597 c2301be8 2018-04-30 stsp optreset = 1;
6599 53ccebc2 2019-07-30 stsp if (Vflag) {
6600 53ccebc2 2019-07-30 stsp got_version_print_str();
6601 6879ba42 2020-10-01 naddy return 0;
6604 4010e238 2020-12-04 stsp #ifndef PROFILE
6605 4010e238 2020-12-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
6606 4010e238 2020-12-04 stsp NULL) == -1)
6607 4010e238 2020-12-04 stsp err(1, "pledge");
6610 c2301be8 2018-04-30 stsp if (argc == 0) {
6611 f29d3e89 2018-06-23 stsp if (hflag)
6612 6879ba42 2020-10-01 naddy usage(hflag, 0);
6613 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
6614 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
6616 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
6620 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
6621 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
6622 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
6623 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
6624 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
6630 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
6631 ee85c5e8 2020-02-29 stsp if (argc != 1)
6632 6879ba42 2020-10-01 naddy usage(0, 1);
6633 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
6634 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
6636 ee85c5e8 2020-02-29 stsp if (hflag)
6637 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
6639 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
6643 b46c1e04 2020-09-20 naddy putchar('\n');
6644 a2f4a359 2020-02-28 stsp if (cmd_argv) {
6646 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
6647 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
6648 a2f4a359 2020-02-28 stsp free(cmd_argv);
6651 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
6652 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
