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 6062e8ea 2021-09-21 stsp #define _XOPEN_SOURCE_EXTENDED /* for ncurses wide-character functions */
24 9f7d7167 2018-04-29 stsp #include <curses.h>
25 9f7d7167 2018-04-29 stsp #include <panel.h>
26 9f7d7167 2018-04-29 stsp #include <locale.h>
27 d7b5a0e8 2022-04-20 stsp #include <sha1.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>
42 3da8ef85 2021-09-21 stsp #include <sched.h>
44 53ccebc2 2019-07-30 stsp #include "got_version.h"
45 9f7d7167 2018-04-29 stsp #include "got_error.h"
46 80ddbec8 2018-04-29 stsp #include "got_object.h"
47 80ddbec8 2018-04-29 stsp #include "got_reference.h"
48 80ddbec8 2018-04-29 stsp #include "got_repository.h"
49 80ddbec8 2018-04-29 stsp #include "got_diff.h"
50 511a516b 2018-05-19 stsp #include "got_opentemp.h"
51 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
52 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
53 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
54 a70480e0 2018-06-23 stsp #include "got_blame.h"
55 c2db6724 2019-01-04 stsp #include "got_privsep.h"
56 1dd54920 2019-05-11 stsp #include "got_path.h"
57 b7165be3 2019-02-05 stsp #include "got_worktree.h"
60 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
67 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
69 9f7d7167 2018-04-29 stsp #ifndef nitems
70 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
73 9f7d7167 2018-04-29 stsp struct tog_cmd {
74 c2301be8 2018-04-30 stsp const char *name;
75 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
76 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
79 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
83 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
84 6458efa5 2020-11-24 stsp __dead static void usage_ref(void);
86 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
87 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
88 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
89 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
90 6458efa5 2020-11-24 stsp static const struct got_error* cmd_ref(int, char *[]);
92 3e166534 2022-02-16 naddy static const struct tog_cmd tog_commands[] = {
93 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
94 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
95 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
96 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
97 6458efa5 2020-11-24 stsp { "ref", cmd_ref, usage_ref },
100 d6b05b5b 2018-08-04 stsp enum tog_view_type {
101 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
102 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
103 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
104 6458efa5 2020-11-24 stsp TOG_VIEW_TREE,
105 6458efa5 2020-11-24 stsp TOG_VIEW_REF,
108 9b058f45 2022-06-30 mark enum tog_view_mode {
109 9b058f45 2022-06-30 mark TOG_VIEW_SPLIT_NONE,
110 9b058f45 2022-06-30 mark TOG_VIEW_SPLIT_VERT,
111 9b058f45 2022-06-30 mark TOG_VIEW_SPLIT_HRZN
114 9b058f45 2022-06-30 mark #define HSPLIT_SCALE 0.3 /* default horizontal split scale */
116 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
118 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
119 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
120 ba4f502b 2018-08-04 stsp struct got_object_id *id;
121 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
124 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
125 ba4f502b 2018-08-04 stsp struct commit_queue {
126 ba4f502b 2018-08-04 stsp int ncommits;
127 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
130 f26dddb7 2019-11-08 stsp struct tog_color {
131 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tog_color) entry;
132 6d17833f 2019-11-08 stsp regex_t regex;
133 6d17833f 2019-11-08 stsp short colorpair;
135 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tog_colors, tog_color);
137 d9dff0e5 2020-12-26 stsp static struct got_reflist_head tog_refs = TAILQ_HEAD_INITIALIZER(tog_refs);
138 51a10b52 2020-12-26 stsp static struct got_reflist_object_id_map *tog_refs_idmap;
139 917d79a7 2022-07-01 stsp static enum got_diff_algorithm tog_diff_algo = GOT_DIFF_ALGORITHM_MYERS;
141 cc488aa7 2022-01-23 stsp static const struct got_error *
142 cc488aa7 2022-01-23 stsp tog_ref_cmp_by_name(void *arg, int *cmp, struct got_reference *re1,
143 cc488aa7 2022-01-23 stsp struct got_reference* re2)
145 cc488aa7 2022-01-23 stsp const char *name1 = got_ref_get_name(re1);
146 cc488aa7 2022-01-23 stsp const char *name2 = got_ref_get_name(re2);
147 cc488aa7 2022-01-23 stsp int isbackup1, isbackup2;
149 cc488aa7 2022-01-23 stsp /* Sort backup refs towards the bottom of the list. */
150 cc488aa7 2022-01-23 stsp isbackup1 = strncmp(name1, "refs/got/backup/", 16) == 0;
151 cc488aa7 2022-01-23 stsp isbackup2 = strncmp(name2, "refs/got/backup/", 16) == 0;
152 cc488aa7 2022-01-23 stsp if (!isbackup1 && isbackup2) {
154 cc488aa7 2022-01-23 stsp return NULL;
155 cc488aa7 2022-01-23 stsp } else if (isbackup1 && !isbackup2) {
157 cc488aa7 2022-01-23 stsp return NULL;
160 cc488aa7 2022-01-23 stsp *cmp = got_path_cmp(name1, name2, strlen(name1), strlen(name2));
161 cc488aa7 2022-01-23 stsp return NULL;
164 11b20872 2019-11-08 stsp static const struct got_error *
165 7f66531d 2021-11-16 stsp tog_load_refs(struct got_repository *repo, int sort_by_date)
167 51a10b52 2020-12-26 stsp const struct got_error *err;
169 7f66531d 2021-11-16 stsp err = got_ref_list(&tog_refs, repo, NULL, sort_by_date ?
170 cc488aa7 2022-01-23 stsp got_ref_cmp_by_commit_timestamp_descending : tog_ref_cmp_by_name,
173 51a10b52 2020-12-26 stsp return err;
175 51a10b52 2020-12-26 stsp return got_reflist_object_id_map_create(&tog_refs_idmap, &tog_refs,
179 51a10b52 2020-12-26 stsp static void
180 51a10b52 2020-12-26 stsp tog_free_refs(void)
182 51a10b52 2020-12-26 stsp if (tog_refs_idmap) {
183 f193b038 2020-12-26 stsp got_reflist_object_id_map_free(tog_refs_idmap);
184 51a10b52 2020-12-26 stsp tog_refs_idmap = NULL;
186 51a10b52 2020-12-26 stsp got_ref_list_free(&tog_refs);
189 51a10b52 2020-12-26 stsp static const struct got_error *
190 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
191 11b20872 2019-11-08 stsp int idx, short color)
193 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
194 11b20872 2019-11-08 stsp struct tog_color *tc;
195 11b20872 2019-11-08 stsp int regerr = 0;
197 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
198 11b20872 2019-11-08 stsp return NULL;
200 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
202 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
203 11b20872 2019-11-08 stsp if (tc == NULL)
204 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
205 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
206 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
207 11b20872 2019-11-08 stsp if (regerr) {
208 11b20872 2019-11-08 stsp static char regerr_msg[512];
209 11b20872 2019-11-08 stsp static char err_msg[512];
210 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
211 11b20872 2019-11-08 stsp sizeof(regerr_msg));
212 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
213 11b20872 2019-11-08 stsp regerr_msg);
214 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
216 11b20872 2019-11-08 stsp return err;
218 11b20872 2019-11-08 stsp tc->colorpair = idx;
219 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(colors, tc, entry);
220 11b20872 2019-11-08 stsp return NULL;
223 11b20872 2019-11-08 stsp static void
224 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
226 11b20872 2019-11-08 stsp struct tog_color *tc;
228 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(colors)) {
229 dbdddfee 2021-06-23 naddy tc = STAILQ_FIRST(colors);
230 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(colors, entry);
231 11b20872 2019-11-08 stsp regfree(&tc->regex);
236 336075a4 2022-06-25 op static struct tog_color *
237 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
239 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
241 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(tc, colors, entry) {
242 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
246 11b20872 2019-11-08 stsp return NULL;
250 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
252 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
253 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
254 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
255 11b20872 2019-11-08 stsp return COLOR_CYAN;
256 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
257 11b20872 2019-11-08 stsp return COLOR_YELLOW;
258 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
259 11b20872 2019-11-08 stsp return COLOR_GREEN;
260 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
261 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
262 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
263 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
264 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
265 91b8c405 2020-01-25 stsp return COLOR_CYAN;
266 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
267 11b20872 2019-11-08 stsp return COLOR_GREEN;
268 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
269 11b20872 2019-11-08 stsp return COLOR_GREEN;
270 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
271 11b20872 2019-11-08 stsp return COLOR_CYAN;
272 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
273 11b20872 2019-11-08 stsp return COLOR_YELLOW;
274 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_HEADS") == 0)
275 6458efa5 2020-11-24 stsp return COLOR_GREEN;
276 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_TAGS") == 0)
277 6458efa5 2020-11-24 stsp return COLOR_MAGENTA;
278 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_REMOTES") == 0)
279 6458efa5 2020-11-24 stsp return COLOR_YELLOW;
280 cc488aa7 2022-01-23 stsp if (strcmp(envvar, "TOG_COLOR_REFS_BACKUP") == 0)
281 cc488aa7 2022-01-23 stsp return COLOR_CYAN;
287 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
289 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
291 11b20872 2019-11-08 stsp if (val == NULL)
292 11b20872 2019-11-08 stsp return default_color_value(envvar);
294 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
295 11b20872 2019-11-08 stsp return COLOR_BLACK;
296 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
297 11b20872 2019-11-08 stsp return COLOR_RED;
298 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
299 11b20872 2019-11-08 stsp return COLOR_GREEN;
300 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
301 11b20872 2019-11-08 stsp return COLOR_YELLOW;
302 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
303 11b20872 2019-11-08 stsp return COLOR_BLUE;
304 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
305 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
306 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
307 11b20872 2019-11-08 stsp return COLOR_CYAN;
308 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
309 11b20872 2019-11-08 stsp return COLOR_WHITE;
310 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
313 11b20872 2019-11-08 stsp return default_color_value(envvar);
317 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
318 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
319 3dbaef42 2020-11-24 stsp const char *label1, *label2;
320 b72706c3 2022-06-01 stsp FILE *f, *f1, *f2;
321 f9d37699 2022-06-28 stsp int fd1, fd2;
322 15a087fe 2019-02-21 stsp int first_displayed_line;
323 15a087fe 2019-02-21 stsp int last_displayed_line;
325 15a087fe 2019-02-21 stsp int diff_context;
326 3dbaef42 2020-11-24 stsp int ignore_whitespace;
327 64453f7e 2020-11-21 stsp int force_text_diff;
328 15a087fe 2019-02-21 stsp struct got_repository *repo;
329 bddb1296 2019-11-08 stsp struct tog_colors colors;
330 fe621944 2020-11-10 stsp size_t nlines;
331 f44b1f58 2020-02-02 tracey off_t *line_offsets;
332 f44b1f58 2020-02-02 tracey int matched_line;
333 f44b1f58 2020-02-02 tracey int selected_line;
335 c0f61fa4 2022-07-11 mark /* passed from log or blame view; may be NULL */
336 c0f61fa4 2022-07-11 mark struct tog_view *parent_view;
339 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
340 5629093a 2022-07-11 stsp static volatile sig_atomic_t tog_thread_error;
342 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
343 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
344 7c1452c1 2020-03-26 stsp pthread_cond_t commit_loaded;
345 1a76625f 2018-10-22 stsp int commits_needed;
346 fb280deb 2021-08-30 stsp int load_all;
347 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
348 1a76625f 2018-10-22 stsp struct commit_queue *commits;
349 1a76625f 2018-10-22 stsp const char *in_repo_path;
350 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
351 1a76625f 2018-10-22 stsp struct got_repository *repo;
352 74467cc8 2022-06-15 stsp int *pack_fds;
353 1a76625f 2018-10-22 stsp int log_complete;
354 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
355 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
356 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
357 13add988 2019-10-15 stsp int *searching;
358 13add988 2019-10-15 stsp int *search_next_done;
359 13add988 2019-10-15 stsp regex_t *regex;
362 1a76625f 2018-10-22 stsp struct tog_log_view_state {
363 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
364 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
365 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
366 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
367 b01e7d3b 2018-08-04 stsp int selected;
368 b01e7d3b 2018-08-04 stsp char *in_repo_path;
369 9cd7cbd1 2020-12-07 stsp char *head_ref_name;
370 b672a97a 2020-01-27 stsp int log_branches;
371 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
372 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
373 1a76625f 2018-10-22 stsp sig_atomic_t quit;
374 1a76625f 2018-10-22 stsp pthread_t thread;
375 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
376 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
377 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
378 11b20872 2019-11-08 stsp struct tog_colors colors;
379 10aab77f 2022-07-19 op int use_committer;
382 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
383 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
384 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
385 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
386 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
387 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
388 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
389 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
390 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
391 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
392 bf30f154 2020-12-07 naddy #define TOG_COLOR_DATE 11
393 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_HEADS 12
394 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_TAGS 13
395 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_REMOTES 14
396 cc488aa7 2022-01-23 stsp #define TOG_COLOR_REFS_BACKUP 15
398 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
399 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
400 e9424729 2018-08-04 stsp int nlines;
402 e9424729 2018-08-04 stsp struct tog_view *view;
403 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
407 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
408 e9424729 2018-08-04 stsp const char *path;
409 e9424729 2018-08-04 stsp struct got_repository *repo;
410 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
411 e9424729 2018-08-04 stsp int *complete;
412 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
413 fc06ba56 2019-08-22 stsp void *cancel_arg;
416 e9424729 2018-08-04 stsp struct tog_blame {
418 be659d10 2020-11-18 stsp off_t filesize;
419 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
420 6fcac457 2018-11-19 stsp int nlines;
421 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
422 e9424729 2018-08-04 stsp pthread_t thread;
423 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
424 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
425 e9424729 2018-08-04 stsp const char *path;
426 0ae84acc 2022-06-15 tracey int *pack_fds;
429 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
430 7cbe629d 2018-08-04 stsp int first_displayed_line;
431 7cbe629d 2018-08-04 stsp int last_displayed_line;
432 7cbe629d 2018-08-04 stsp int selected_line;
433 c0f61fa4 2022-07-11 mark int last_diffed_line;
434 7cbe629d 2018-08-04 stsp int blame_complete;
437 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
438 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
439 e5a0f69f 2018-08-18 stsp char *path;
440 7cbe629d 2018-08-04 stsp struct got_repository *repo;
441 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
442 136e2bd4 2022-07-23 mark struct got_object_id *id_to_log;
443 e9424729 2018-08-04 stsp struct tog_blame blame;
444 6c4c42e0 2019-06-24 stsp int matched_line;
445 11b20872 2019-11-08 stsp struct tog_colors colors;
448 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
449 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
450 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
451 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
452 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
453 ad80ab7b 2018-08-04 stsp int selected;
456 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
458 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
459 ad80ab7b 2018-08-04 stsp char *tree_label;
460 bc573f3b 2021-07-10 stsp struct got_object_id *commit_id;/* commit which this tree belongs to */
461 bc573f3b 2021-07-10 stsp struct got_tree_object *root; /* the commit's root tree entry */
462 bc573f3b 2021-07-10 stsp struct got_tree_object *tree; /* currently displayed (sub-)tree */
463 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
464 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
465 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
466 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
467 bc573f3b 2021-07-10 stsp struct tog_parent_trees parents; /* parent trees of current sub-tree */
468 9cd7cbd1 2020-12-07 stsp char *head_ref_name;
469 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
470 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
471 6458efa5 2020-11-24 stsp struct tog_colors colors;
474 6458efa5 2020-11-24 stsp struct tog_reflist_entry {
475 6458efa5 2020-11-24 stsp TAILQ_ENTRY(tog_reflist_entry) entry;
476 6458efa5 2020-11-24 stsp struct got_reference *ref;
480 6458efa5 2020-11-24 stsp TAILQ_HEAD(tog_reflist_head, tog_reflist_entry);
482 6458efa5 2020-11-24 stsp struct tog_ref_view_state {
483 dae613fa 2020-12-26 stsp struct tog_reflist_head refs;
484 6458efa5 2020-11-24 stsp struct tog_reflist_entry *first_displayed_entry;
485 6458efa5 2020-11-24 stsp struct tog_reflist_entry *last_displayed_entry;
486 6458efa5 2020-11-24 stsp struct tog_reflist_entry *selected_entry;
487 b4996bee 2022-06-16 stsp int nrefs, ndisplayed, selected, show_date, show_ids, sort_by_date;
488 6458efa5 2020-11-24 stsp struct got_repository *repo;
489 6458efa5 2020-11-24 stsp struct tog_reflist_entry *matched_entry;
490 bddb1296 2019-11-08 stsp struct tog_colors colors;
494 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
496 e78dc838 2020-12-04 stsp * The 'Tab' key switches focus between a parent view and its child view.
497 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
498 669b5ffa 2018-10-07 stsp * there is enough screen estate.
500 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
501 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
503 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
504 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
505 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
507 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
508 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
510 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
512 cc3c9aac 2018-08-01 stsp struct tog_view {
513 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
514 26ed57b2 2018-05-19 stsp WINDOW *window;
515 26ed57b2 2018-05-19 stsp PANEL *panel;
516 9b058f45 2022-06-30 mark int nlines, ncols, begin_y, begin_x; /* based on split height/width */
517 3c1dfe12 2022-07-08 mark int resized_y, resized_x; /* begin_y/x based on user resizing */
518 145b6838 2022-06-16 stsp int maxx, x; /* max column and current start column */
519 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
520 9b058f45 2022-06-30 mark int nscrolled, offset; /* lines scrolled and hsplit line offset */
521 640cd7ff 2022-06-22 mark int ch, count; /* current keymap and count prefix */
522 571ccd73 2022-07-19 mark int resized; /* set when in a resize event */
523 e78dc838 2020-12-04 stsp int focussed; /* Only set on one parent or child view at a time. */
525 669b5ffa 2018-10-07 stsp struct tog_view *parent;
526 669b5ffa 2018-10-07 stsp struct tog_view *child;
529 e78dc838 2020-12-04 stsp * This flag is initially set on parent views when a new child view
530 e78dc838 2020-12-04 stsp * is created. It gets toggled when the 'Tab' key switches focus
531 e78dc838 2020-12-04 stsp * between parent and child.
532 e78dc838 2020-12-04 stsp * The flag indicates whether focus should be passed on to our child
533 e78dc838 2020-12-04 stsp * view if this parent view gets picked for focus after another parent
534 e78dc838 2020-12-04 stsp * view was closed. This prevents child views from losing focus in such
535 e78dc838 2020-12-04 stsp * situations.
537 e78dc838 2020-12-04 stsp int focus_child;
539 9b058f45 2022-06-30 mark enum tog_view_mode mode;
540 5dc9f4bc 2018-08-04 stsp /* type-specific state */
541 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
543 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
544 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
545 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
546 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
547 6458efa5 2020-11-24 stsp struct tog_ref_view_state ref;
550 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
551 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
552 e78dc838 2020-12-04 stsp struct tog_view *, int);
553 917d79a7 2022-07-01 stsp const struct got_error *(*reset)(struct tog_view *);
554 571ccd73 2022-07-19 mark const struct got_error *(*resize)(struct tog_view *, int);
555 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
557 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
558 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
559 c0c4acc8 2021-01-24 stsp int search_started;
560 60493ae3 2019-06-20 stsp int searching;
561 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
562 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
563 60493ae3 2019-06-20 stsp int search_next_done;
564 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_HAVE_MORE 1
565 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_NO_MORE 2
566 f9967bca 2020-03-27 stsp #define TOG_SEARCH_HAVE_NONE 3
567 1803e47f 2019-06-22 stsp regex_t regex;
568 41605754 2020-11-12 stsp regmatch_t regmatch;
571 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
572 3dbaef42 2020-11-24 stsp struct got_object_id *, struct got_object_id *,
573 3dbaef42 2020-11-24 stsp const char *, const char *, int, int, int, struct tog_view *,
574 78756c87 2020-11-24 stsp struct got_repository *);
575 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
576 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
577 e78dc838 2020-12-04 stsp struct tog_view *, int);
578 917d79a7 2022-07-01 stsp static const struct got_error *reset_diff_view(struct tog_view *);
579 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
580 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
581 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
583 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
584 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *,
585 78756c87 2020-11-24 stsp const char *, const char *, int);
586 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
587 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
588 e78dc838 2020-12-04 stsp struct tog_view *, int);
589 571ccd73 2022-07-19 mark static const struct got_error *resize_log_view(struct tog_view *, int);
590 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
591 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
592 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
594 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
595 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *);
596 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
597 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
598 e78dc838 2020-12-04 stsp struct tog_view *, int);
599 917d79a7 2022-07-01 stsp static const struct got_error *reset_blame_view(struct tog_view *);
600 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
601 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
602 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
604 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
605 bc573f3b 2021-07-10 stsp struct got_object_id *, const char *, struct got_repository *);
606 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
607 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
608 e78dc838 2020-12-04 stsp struct tog_view *, int);
609 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
610 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
611 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
613 6458efa5 2020-11-24 stsp static const struct got_error *open_ref_view(struct tog_view *,
614 6458efa5 2020-11-24 stsp struct got_repository *);
615 6458efa5 2020-11-24 stsp static const struct got_error *show_ref_view(struct tog_view *);
616 6458efa5 2020-11-24 stsp static const struct got_error *input_ref_view(struct tog_view **,
617 e78dc838 2020-12-04 stsp struct tog_view *, int);
618 6458efa5 2020-11-24 stsp static const struct got_error *close_ref_view(struct tog_view *);
619 6458efa5 2020-11-24 stsp static const struct got_error *search_start_ref_view(struct tog_view *);
620 6458efa5 2020-11-24 stsp static const struct got_error *search_next_ref_view(struct tog_view *);
622 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
623 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
624 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
625 2497f032 2022-05-31 stsp static volatile sig_atomic_t tog_sigint_received;
626 2497f032 2022-05-31 stsp static volatile sig_atomic_t tog_sigterm_received;
628 25791caa 2018-10-24 stsp static void
629 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
631 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
634 83baff54 2019-08-12 stsp static void
635 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
637 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
640 61266923 2020-01-14 stsp static void
641 61266923 2020-01-14 stsp tog_sigcont(int signo)
643 61266923 2020-01-14 stsp tog_sigcont_received = 1;
646 2497f032 2022-05-31 stsp static void
647 2497f032 2022-05-31 stsp tog_sigint(int signo)
649 2497f032 2022-05-31 stsp tog_sigint_received = 1;
652 2497f032 2022-05-31 stsp static void
653 2497f032 2022-05-31 stsp tog_sigterm(int signo)
655 2497f032 2022-05-31 stsp tog_sigterm_received = 1;
659 dd6e31d7 2022-06-17 stsp tog_fatal_signal_received(void)
661 2497f032 2022-05-31 stsp return (tog_sigpipe_received ||
662 2497f032 2022-05-31 stsp tog_sigint_received || tog_sigint_received);
665 e5a0f69f 2018-08-18 stsp static const struct got_error *
666 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
668 5629093a 2022-07-11 stsp const struct got_error *err = NULL, *child_err = NULL;
670 669b5ffa 2018-10-07 stsp if (view->child) {
671 5629093a 2022-07-11 stsp child_err = view_close(view->child);
672 669b5ffa 2018-10-07 stsp view->child = NULL;
674 e5a0f69f 2018-08-18 stsp if (view->close)
675 e5a0f69f 2018-08-18 stsp err = view->close(view);
676 ea5e7bb5 2018-08-01 stsp if (view->panel)
677 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
678 ea5e7bb5 2018-08-01 stsp if (view->window)
679 ea5e7bb5 2018-08-01 stsp delwin(view->window);
680 ea5e7bb5 2018-08-01 stsp free(view);
681 5629093a 2022-07-11 stsp return err ? err : child_err;
684 ea5e7bb5 2018-08-01 stsp static struct tog_view *
685 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
686 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
688 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
690 ea5e7bb5 2018-08-01 stsp if (view == NULL)
691 ea5e7bb5 2018-08-01 stsp return NULL;
693 d6b05b5b 2018-08-04 stsp view->type = type;
694 f7d12f7e 2018-08-01 stsp view->lines = LINES;
695 f7d12f7e 2018-08-01 stsp view->cols = COLS;
696 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
697 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
698 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
699 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
700 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
701 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
702 96a765a8 2018-08-04 stsp view_close(view);
703 ea5e7bb5 2018-08-01 stsp return NULL;
705 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
706 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
707 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
708 96a765a8 2018-08-04 stsp view_close(view);
709 ea5e7bb5 2018-08-01 stsp return NULL;
712 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
713 ea5e7bb5 2018-08-01 stsp return view;
717 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
719 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
721 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
724 9b058f45 2022-06-30 mark /* XXX Stub till we decide what to do. */
726 9b058f45 2022-06-30 mark view_split_begin_y(int lines)
728 9b058f45 2022-06-30 mark return lines * HSPLIT_SCALE;
731 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
733 5c60c32a 2018-10-18 stsp static const struct got_error *
734 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
736 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
738 571ccd73 2022-07-19 mark if (!view->resized && view->mode == TOG_VIEW_SPLIT_HRZN) {
739 3c1dfe12 2022-07-08 mark if (view->resized_y && view->resized_y < view->lines)
740 3c1dfe12 2022-07-08 mark view->begin_y = view->resized_y;
742 3c1dfe12 2022-07-08 mark view->begin_y = view_split_begin_y(view->nlines);
743 9b058f45 2022-06-30 mark view->begin_x = 0;
744 571ccd73 2022-07-19 mark } else if (!view->resized) {
745 3c1dfe12 2022-07-08 mark if (view->resized_x && view->resized_x < view->cols - 1 &&
746 3c1dfe12 2022-07-08 mark view->cols > 119)
747 3c1dfe12 2022-07-08 mark view->begin_x = view->resized_x;
749 3c1dfe12 2022-07-08 mark view->begin_x = view_split_begin_x(0);
750 9b058f45 2022-06-30 mark view->begin_y = 0;
752 9b058f45 2022-06-30 mark view->nlines = LINES - view->begin_y;
753 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
754 5c60c32a 2018-10-18 stsp view->lines = LINES;
755 5c60c32a 2018-10-18 stsp view->cols = COLS;
756 5c60c32a 2018-10-18 stsp err = view_resize(view);
758 5c60c32a 2018-10-18 stsp return err;
760 9b058f45 2022-06-30 mark if (view->parent && view->mode == TOG_VIEW_SPLIT_HRZN)
761 9b058f45 2022-06-30 mark view->parent->nlines = view->begin_y;
763 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
764 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
766 5c60c32a 2018-10-18 stsp return NULL;
769 5c60c32a 2018-10-18 stsp static const struct got_error *
770 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
772 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
774 5c60c32a 2018-10-18 stsp view->begin_x = 0;
775 571ccd73 2022-07-19 mark view->begin_y = view->resized ? view->begin_y : 0;
776 571ccd73 2022-07-19 mark view->nlines = view->resized ? view->nlines : LINES;
777 5c60c32a 2018-10-18 stsp view->ncols = COLS;
778 5c60c32a 2018-10-18 stsp view->lines = LINES;
779 5c60c32a 2018-10-18 stsp view->cols = COLS;
780 5c60c32a 2018-10-18 stsp err = view_resize(view);
782 5c60c32a 2018-10-18 stsp return err;
784 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
785 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
787 5c60c32a 2018-10-18 stsp return NULL;
791 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
793 5c60c32a 2018-10-18 stsp return view->parent == NULL;
797 6131ff18 2022-06-20 mark view_is_splitscreen(struct tog_view *view)
799 9b058f45 2022-06-30 mark return view->begin_x > 0 || view->begin_y > 0;
803 24b9cfdc 2022-06-30 stsp view_is_fullscreen(struct tog_view *view)
805 24b9cfdc 2022-06-30 stsp return view->nlines == LINES && view->ncols == COLS;
809 49b24ee5 2022-07-03 mark view_is_hsplit_top(struct tog_view *view)
811 49b24ee5 2022-07-03 mark return view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
812 49b24ee5 2022-07-03 mark view_is_splitscreen(view->child);
815 9b058f45 2022-06-30 mark static void
816 9b058f45 2022-06-30 mark view_border(struct tog_view *view)
818 9b058f45 2022-06-30 mark PANEL *panel;
819 9b058f45 2022-06-30 mark const struct tog_view *view_above;
821 9b058f45 2022-06-30 mark if (view->parent)
822 9b058f45 2022-06-30 mark return view_border(view->parent);
824 9b058f45 2022-06-30 mark panel = panel_above(view->panel);
825 9b058f45 2022-06-30 mark if (panel == NULL)
828 9b058f45 2022-06-30 mark view_above = panel_userptr(panel);
829 9b058f45 2022-06-30 mark if (view->mode == TOG_VIEW_SPLIT_HRZN)
830 9b058f45 2022-06-30 mark mvwhline(view->window, view_above->begin_y - 1,
831 9b058f45 2022-06-30 mark view->begin_x, got_locale_is_utf8() ?
832 9b058f45 2022-06-30 mark ACS_HLINE : '-', view->ncols);
834 9b058f45 2022-06-30 mark mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
835 9b058f45 2022-06-30 mark got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
838 3c1dfe12 2022-07-08 mark static const struct got_error *view_init_hsplit(struct tog_view *, int);
839 9b058f45 2022-06-30 mark static const struct got_error *request_log_commits(struct tog_view *);
840 9b058f45 2022-06-30 mark static const struct got_error *offset_selection_down(struct tog_view *);
841 9b058f45 2022-06-30 mark static void offset_selection_up(struct tog_view *);
842 3c1dfe12 2022-07-08 mark static void view_get_split(struct tog_view *, int *, int *);
844 4d8c2215 2018-08-19 stsp static const struct got_error *
845 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
847 9b058f45 2022-06-30 mark const struct got_error *err = NULL;
848 9b058f45 2022-06-30 mark int dif, nlines, ncols;
850 9b058f45 2022-06-30 mark dif = LINES - view->lines; /* line difference */
852 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
853 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
855 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
856 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
857 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
859 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
861 4dd27a72 2022-06-29 stsp if (view->child) {
862 9b058f45 2022-06-30 mark int hs = view->child->begin_y;
864 24b9cfdc 2022-06-30 stsp if (!view_is_fullscreen(view))
865 c71ed39a 2022-06-29 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
866 9b058f45 2022-06-30 mark if (view->mode == TOG_VIEW_SPLIT_HRZN ||
867 9b058f45 2022-06-30 mark view->child->begin_x == 0) {
868 0dbbbe90 2022-06-17 op ncols = COLS;
870 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
871 5c60c32a 2018-10-18 stsp if (view->child->focussed)
872 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
874 5c60c32a 2018-10-18 stsp show_panel(view->panel);
876 0dbbbe90 2022-06-17 op ncols = view->child->begin_x;
878 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
879 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
882 9b058f45 2022-06-30 mark * XXX This is ugly and needs to be moved into the above
883 9b058f45 2022-06-30 mark * logic but "works" for now and my attempts at moving it
884 9b058f45 2022-06-30 mark * break either 'tab' or 'F' key maps in horizontal splits.
887 9b058f45 2022-06-30 mark err = view_splitscreen(view->child);
889 9b058f45 2022-06-30 mark return err;
890 9b058f45 2022-06-30 mark if (dif < 0) { /* top split decreased */
891 9b058f45 2022-06-30 mark err = offset_selection_down(view);
893 9b058f45 2022-06-30 mark return err;
895 9b058f45 2022-06-30 mark view_border(view);
896 9b058f45 2022-06-30 mark update_panels();
897 9b058f45 2022-06-30 mark doupdate();
898 9b058f45 2022-06-30 mark show_panel(view->child->panel);
899 9b058f45 2022-06-30 mark nlines = view->nlines;
901 0dbbbe90 2022-06-17 op } else if (view->parent == NULL)
902 0dbbbe90 2022-06-17 op ncols = COLS;
904 571ccd73 2022-07-19 mark if (view->resize && dif > 0) {
905 571ccd73 2022-07-19 mark err = view->resize(view, dif);
907 571ccd73 2022-07-19 mark return err;
910 0dbbbe90 2022-06-17 op if (wresize(view->window, nlines, ncols) == ERR)
911 0dbbbe90 2022-06-17 op return got_error_from_errno("wresize");
912 0dbbbe90 2022-06-17 op if (replace_panel(view->panel, view->window) == ERR)
913 0dbbbe90 2022-06-17 op return got_error_from_errno("replace_panel");
914 0dbbbe90 2022-06-17 op wclear(view->window);
916 0dbbbe90 2022-06-17 op view->nlines = nlines;
917 0dbbbe90 2022-06-17 op view->ncols = ncols;
918 0dbbbe90 2022-06-17 op view->lines = LINES;
919 0dbbbe90 2022-06-17 op view->cols = COLS;
921 5c60c32a 2018-10-18 stsp return NULL;
924 571ccd73 2022-07-19 mark static const struct got_error *
925 571ccd73 2022-07-19 mark resize_log_view(struct tog_view *view, int increase)
927 6fe51fee 2022-07-22 mark struct tog_log_view_state *s = &view->state.log;
928 6fe51fee 2022-07-22 mark const struct got_error *err = NULL;
931 6fe51fee 2022-07-22 mark if (s->selected_entry)
932 6fe51fee 2022-07-22 mark n = s->selected_entry->idx + view->lines - s->selected;
935 571ccd73 2022-07-19 mark * Request commits to account for the increased
936 571ccd73 2022-07-19 mark * height so we have enough to populate the view.
938 571ccd73 2022-07-19 mark if (s->commits.ncommits < n) {
939 571ccd73 2022-07-19 mark view->nscrolled = n - s->commits.ncommits + increase + 1;
940 571ccd73 2022-07-19 mark err = request_log_commits(view);
943 571ccd73 2022-07-19 mark return err;
946 d9a7ab53 2022-07-11 mark static void
947 d9a7ab53 2022-07-11 mark view_adjust_offset(struct tog_view *view, int n)
949 d9a7ab53 2022-07-11 mark if (n == 0)
952 d9a7ab53 2022-07-11 mark if (view->parent && view->parent->offset) {
953 d9a7ab53 2022-07-11 mark if (view->parent->offset + n >= 0)
954 d9a7ab53 2022-07-11 mark view->parent->offset += n;
956 d9a7ab53 2022-07-11 mark view->parent->offset = 0;
957 d9a7ab53 2022-07-11 mark } else if (view->offset) {
958 d9a7ab53 2022-07-11 mark if (view->offset - n >= 0)
959 d9a7ab53 2022-07-11 mark view->offset -= n;
961 d9a7ab53 2022-07-11 mark view->offset = 0;
965 3c1dfe12 2022-07-08 mark static const struct got_error *
966 3c1dfe12 2022-07-08 mark view_resize_split(struct tog_view *view, int resize)
968 3c1dfe12 2022-07-08 mark const struct got_error *err = NULL;
969 3c1dfe12 2022-07-08 mark struct tog_view *v = NULL;
971 3c1dfe12 2022-07-08 mark if (view->parent)
972 3c1dfe12 2022-07-08 mark v = view->parent;
976 3c1dfe12 2022-07-08 mark if (!v->child || !view_is_splitscreen(v->child))
977 3c1dfe12 2022-07-08 mark return NULL;
979 571ccd73 2022-07-19 mark v->resized = v->child->resized = resize; /* lock for resize event */
981 3c1dfe12 2022-07-08 mark if (view->mode == TOG_VIEW_SPLIT_HRZN) {
982 3c1dfe12 2022-07-08 mark if (v->child->resized_y)
983 3c1dfe12 2022-07-08 mark v->child->begin_y = v->child->resized_y;
984 3c1dfe12 2022-07-08 mark if (view->parent)
985 3c1dfe12 2022-07-08 mark v->child->begin_y -= resize;
987 3c1dfe12 2022-07-08 mark v->child->begin_y += resize;
988 3c1dfe12 2022-07-08 mark if (v->child->begin_y < 3) {
989 3c1dfe12 2022-07-08 mark view->count = 0;
990 3c1dfe12 2022-07-08 mark v->child->begin_y = 3;
991 3c1dfe12 2022-07-08 mark } else if (v->child->begin_y > LINES - 1) {
992 3c1dfe12 2022-07-08 mark view->count = 0;
993 3c1dfe12 2022-07-08 mark v->child->begin_y = LINES - 1;
995 3c1dfe12 2022-07-08 mark v->ncols = COLS;
996 3c1dfe12 2022-07-08 mark v->child->ncols = COLS;
997 d9a7ab53 2022-07-11 mark view_adjust_offset(view, resize);
998 3c1dfe12 2022-07-08 mark err = view_init_hsplit(v, v->child->begin_y);
1000 3c1dfe12 2022-07-08 mark return err;
1001 3c1dfe12 2022-07-08 mark v->child->resized_y = v->child->begin_y;
1003 3c1dfe12 2022-07-08 mark if (v->child->resized_x)
1004 3c1dfe12 2022-07-08 mark v->child->begin_x = v->child->resized_x;
1005 3c1dfe12 2022-07-08 mark if (view->parent)
1006 3c1dfe12 2022-07-08 mark v->child->begin_x -= resize;
1008 3c1dfe12 2022-07-08 mark v->child->begin_x += resize;
1009 3c1dfe12 2022-07-08 mark if (v->child->begin_x < 11) {
1010 3c1dfe12 2022-07-08 mark view->count = 0;
1011 3c1dfe12 2022-07-08 mark v->child->begin_x = 11;
1012 3c1dfe12 2022-07-08 mark } else if (v->child->begin_x > COLS - 1) {
1013 3c1dfe12 2022-07-08 mark view->count = 0;
1014 3c1dfe12 2022-07-08 mark v->child->begin_x = COLS - 1;
1016 3c1dfe12 2022-07-08 mark v->child->resized_x = v->child->begin_x;
1019 3c1dfe12 2022-07-08 mark v->child->mode = v->mode;
1020 3c1dfe12 2022-07-08 mark v->child->nlines = v->lines - v->child->begin_y;
1021 3c1dfe12 2022-07-08 mark v->child->ncols = v->cols - v->child->begin_x;
1022 3c1dfe12 2022-07-08 mark v->focus_child = 1;
1024 3c1dfe12 2022-07-08 mark err = view_fullscreen(v);
1026 3c1dfe12 2022-07-08 mark return err;
1027 3c1dfe12 2022-07-08 mark err = view_splitscreen(v->child);
1029 3c1dfe12 2022-07-08 mark return err;
1031 3c1dfe12 2022-07-08 mark if (v->mode == TOG_VIEW_SPLIT_HRZN) {
1032 3c1dfe12 2022-07-08 mark err = offset_selection_down(v->child);
1034 3c1dfe12 2022-07-08 mark return err;
1037 6fe51fee 2022-07-22 mark if (v->resize)
1038 6fe51fee 2022-07-22 mark err = v->resize(v, 0);
1039 6fe51fee 2022-07-22 mark else if (v->child->resize)
1040 6fe51fee 2022-07-22 mark err = v->child->resize(v->child, 0);
1042 571ccd73 2022-07-19 mark v->resized = v->child->resized = 0;
1044 3c1dfe12 2022-07-08 mark return err;
1047 3c1dfe12 2022-07-08 mark static void
1048 3c1dfe12 2022-07-08 mark view_transfer_size(struct tog_view *dst, struct tog_view *src)
1050 3c1dfe12 2022-07-08 mark struct tog_view *v = src->child ? src->child : src;
1052 3c1dfe12 2022-07-08 mark dst->resized_x = v->resized_x;
1053 3c1dfe12 2022-07-08 mark dst->resized_y = v->resized_y;
1056 669b5ffa 2018-10-07 stsp static const struct got_error *
1057 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
1059 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1061 669b5ffa 2018-10-07 stsp if (view->child == NULL)
1062 669b5ffa 2018-10-07 stsp return NULL;
1064 669b5ffa 2018-10-07 stsp err = view_close(view->child);
1065 669b5ffa 2018-10-07 stsp view->child = NULL;
1066 669b5ffa 2018-10-07 stsp return err;
1069 0dbbbe90 2022-06-17 op static const struct got_error *
1070 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
1072 3c1dfe12 2022-07-08 mark const struct got_error *err = NULL;
1074 669b5ffa 2018-10-07 stsp view->child = child;
1075 669b5ffa 2018-10-07 stsp child->parent = view;
1077 3c1dfe12 2022-07-08 mark err = view_resize(view);
1079 3c1dfe12 2022-07-08 mark return err;
1081 3c1dfe12 2022-07-08 mark if (view->child->resized_x || view->child->resized_y)
1082 3c1dfe12 2022-07-08 mark err = view_resize_split(view, 0);
1084 3c1dfe12 2022-07-08 mark return err;
1087 136e2bd4 2022-07-23 mark static const struct got_error *view_dispatch_request(struct tog_view **,
1088 136e2bd4 2022-07-23 mark struct tog_view *, enum tog_view_type, int, int);
1090 136e2bd4 2022-07-23 mark static const struct got_error *
1091 136e2bd4 2022-07-23 mark view_request_new(struct tog_view **requested, struct tog_view *view,
1092 136e2bd4 2022-07-23 mark enum tog_view_type request)
1094 136e2bd4 2022-07-23 mark struct tog_view *new_view = NULL;
1095 136e2bd4 2022-07-23 mark const struct got_error *err;
1096 136e2bd4 2022-07-23 mark int y = 0, x = 0;
1098 136e2bd4 2022-07-23 mark *requested = NULL;
1100 136e2bd4 2022-07-23 mark if (view_is_parent_view(view))
1101 136e2bd4 2022-07-23 mark view_get_split(view, &y, &x);
1103 136e2bd4 2022-07-23 mark err = view_dispatch_request(&new_view, view, request, y, x);
1105 136e2bd4 2022-07-23 mark return err;
1107 136e2bd4 2022-07-23 mark if (view_is_parent_view(view) && view->mode == TOG_VIEW_SPLIT_HRZN) {
1108 136e2bd4 2022-07-23 mark err = view_init_hsplit(view, y);
1110 136e2bd4 2022-07-23 mark return err;
1113 136e2bd4 2022-07-23 mark view->focussed = 0;
1114 136e2bd4 2022-07-23 mark new_view->focussed = 1;
1115 136e2bd4 2022-07-23 mark new_view->mode = view->mode;
1116 136e2bd4 2022-07-23 mark new_view->nlines = view->lines - y;
1118 136e2bd4 2022-07-23 mark if (view_is_parent_view(view)) {
1119 136e2bd4 2022-07-23 mark view_transfer_size(new_view, view);
1120 136e2bd4 2022-07-23 mark err = view_close_child(view);
1122 136e2bd4 2022-07-23 mark return err;
1123 136e2bd4 2022-07-23 mark err = view_set_child(view, new_view);
1125 136e2bd4 2022-07-23 mark return err;
1126 136e2bd4 2022-07-23 mark view->focus_child = 1;
1128 136e2bd4 2022-07-23 mark *requested = new_view;
1130 136e2bd4 2022-07-23 mark return NULL;
1133 34bc9ec9 2019-02-22 stsp static void
1134 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
1136 25791caa 2018-10-24 stsp int cols, lines;
1137 25791caa 2018-10-24 stsp struct winsize size;
1139 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
1140 25791caa 2018-10-24 stsp cols = 80; /* Default */
1141 25791caa 2018-10-24 stsp lines = 24;
1143 25791caa 2018-10-24 stsp cols = size.ws_col;
1144 25791caa 2018-10-24 stsp lines = size.ws_row;
1146 25791caa 2018-10-24 stsp resize_term(lines, cols);
1149 2b49a8ae 2019-06-22 stsp static const struct got_error *
1150 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
1152 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
1153 9b058f45 2022-06-30 mark struct tog_view *v = view;
1154 2b49a8ae 2019-06-22 stsp char pattern[1024];
1157 c0c4acc8 2021-01-24 stsp if (view->search_started) {
1158 c0c4acc8 2021-01-24 stsp regfree(&view->regex);
1159 c0c4acc8 2021-01-24 stsp view->searching = 0;
1160 c0c4acc8 2021-01-24 stsp memset(&view->regmatch, 0, sizeof(view->regmatch));
1162 c0c4acc8 2021-01-24 stsp view->search_started = 0;
1164 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
1165 2b49a8ae 2019-06-22 stsp return NULL;
1167 49b24ee5 2022-07-03 mark if (view_is_hsplit_top(view))
1168 9b058f45 2022-06-30 mark v = view->child;
1170 9b058f45 2022-06-30 mark mvwaddstr(v->window, v->nlines - 1, 0, "/");
1171 9b058f45 2022-06-30 mark wclrtoeol(v->window);
1173 a6d37fac 2022-07-03 mark nodelay(view->window, FALSE); /* block for search term input */
1174 2b49a8ae 2019-06-22 stsp nocbreak();
1176 9b058f45 2022-06-30 mark ret = wgetnstr(v->window, pattern, sizeof(pattern));
1177 9b058f45 2022-06-30 mark wrefresh(v->window);
1180 a6d37fac 2022-07-03 mark nodelay(view->window, TRUE);
1181 2b49a8ae 2019-06-22 stsp if (ret == ERR)
1182 2b49a8ae 2019-06-22 stsp return NULL;
1184 41605754 2020-11-12 stsp if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) {
1185 7c32bd05 2019-06-22 stsp err = view->search_start(view);
1186 7c32bd05 2019-06-22 stsp if (err) {
1187 7c32bd05 2019-06-22 stsp regfree(&view->regex);
1188 7c32bd05 2019-06-22 stsp return err;
1190 c0c4acc8 2021-01-24 stsp view->search_started = 1;
1191 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
1192 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
1193 2b49a8ae 2019-06-22 stsp view->search_next(view);
1196 2b49a8ae 2019-06-22 stsp return NULL;
1199 7532ccda 2022-07-11 mark /* Switch split mode. If view is a parent or child, draw the new splitscreen. */
1200 d2366e29 2022-07-07 mark static const struct got_error *
1201 d2366e29 2022-07-07 mark switch_split(struct tog_view *view)
1203 d2366e29 2022-07-07 mark const struct got_error *err = NULL;
1204 d2366e29 2022-07-07 mark struct tog_view *v = NULL;
1206 d2366e29 2022-07-07 mark if (view->parent)
1207 d2366e29 2022-07-07 mark v = view->parent;
1211 7532ccda 2022-07-11 mark if (v->mode == TOG_VIEW_SPLIT_HRZN)
1212 7532ccda 2022-07-11 mark v->mode = TOG_VIEW_SPLIT_VERT;
1214 d2366e29 2022-07-07 mark v->mode = TOG_VIEW_SPLIT_HRZN;
1216 7532ccda 2022-07-11 mark if (!v->child)
1217 7532ccda 2022-07-11 mark return NULL;
1218 7532ccda 2022-07-11 mark else if (v->mode == TOG_VIEW_SPLIT_VERT && v->cols < 120)
1219 7532ccda 2022-07-11 mark v->mode = TOG_VIEW_SPLIT_NONE;
1221 d2366e29 2022-07-07 mark view_get_split(v, &v->child->begin_y, &v->child->begin_x);
1222 3c1dfe12 2022-07-08 mark if (v->mode == TOG_VIEW_SPLIT_HRZN && v->child->resized_y)
1223 3c1dfe12 2022-07-08 mark v->child->begin_y = v->child->resized_y;
1224 7532ccda 2022-07-11 mark else if (v->mode == TOG_VIEW_SPLIT_VERT && v->child->resized_x)
1225 3c1dfe12 2022-07-08 mark v->child->begin_x = v->child->resized_x;
1228 d2366e29 2022-07-07 mark if (v->mode == TOG_VIEW_SPLIT_HRZN) {
1229 d2366e29 2022-07-07 mark v->ncols = COLS;
1230 d2366e29 2022-07-07 mark v->child->ncols = COLS;
1231 7532ccda 2022-07-11 mark v->child->nscrolled = LINES - v->child->nlines;
1233 d2366e29 2022-07-07 mark err = view_init_hsplit(v, v->child->begin_y);
1235 d2366e29 2022-07-07 mark return err;
1237 d2366e29 2022-07-07 mark v->child->mode = v->mode;
1238 d2366e29 2022-07-07 mark v->child->nlines = v->lines - v->child->begin_y;
1239 d2366e29 2022-07-07 mark v->focus_child = 1;
1241 d2366e29 2022-07-07 mark err = view_fullscreen(v);
1243 d2366e29 2022-07-07 mark return err;
1244 d2366e29 2022-07-07 mark err = view_splitscreen(v->child);
1246 d2366e29 2022-07-07 mark return err;
1248 7532ccda 2022-07-11 mark if (v->mode == TOG_VIEW_SPLIT_NONE)
1249 7532ccda 2022-07-11 mark v->mode = TOG_VIEW_SPLIT_VERT;
1250 7532ccda 2022-07-11 mark if (v->mode == TOG_VIEW_SPLIT_HRZN) {
1251 7532ccda 2022-07-11 mark err = offset_selection_down(v);
1253 279d2047 2022-07-29 stsp return err;
1254 d2366e29 2022-07-07 mark err = offset_selection_down(v->child);
1256 279d2047 2022-07-29 stsp return err;
1258 7532ccda 2022-07-11 mark offset_selection_up(v);
1259 7532ccda 2022-07-11 mark offset_selection_up(v->child);
1261 dff91825 2022-07-22 mark if (v->resize)
1262 dff91825 2022-07-22 mark err = v->resize(v, 0);
1263 dff91825 2022-07-22 mark else if (v->child->resize)
1264 dff91825 2022-07-22 mark err = v->child->resize(v->child, 0);
1266 d2366e29 2022-07-07 mark return err;
1270 f0032ce6 2022-07-02 mark * Compute view->count from numeric input. Assign total to view->count and
1271 f0032ce6 2022-07-02 mark * return first non-numeric key entered.
1273 640cd7ff 2022-06-22 mark static int
1274 640cd7ff 2022-06-22 mark get_compound_key(struct tog_view *view, int c)
1276 9b058f45 2022-06-30 mark struct tog_view *v = view;
1277 9b058f45 2022-06-30 mark int x, n = 0;
1279 49b24ee5 2022-07-03 mark if (view_is_hsplit_top(view))
1280 9b058f45 2022-06-30 mark v = view->child;
1281 9b058f45 2022-06-30 mark else if (view->mode == TOG_VIEW_SPLIT_VERT && view->parent)
1282 9b058f45 2022-06-30 mark v = view->parent;
1284 640cd7ff 2022-06-22 mark view->count = 0;
1285 f0032ce6 2022-07-02 mark cbreak(); /* block for input */
1286 9b058f45 2022-06-30 mark wmove(v->window, v->nlines - 1, 0);
1287 9b058f45 2022-06-30 mark wclrtoeol(v->window);
1288 9b058f45 2022-06-30 mark waddch(v->window, ':');
1291 9b058f45 2022-06-30 mark x = getcurx(v->window);
1292 9b058f45 2022-06-30 mark if (x != ERR && x < view->ncols) {
1293 9b058f45 2022-06-30 mark waddch(v->window, c);
1294 9b058f45 2022-06-30 mark wrefresh(v->window);
1298 640cd7ff 2022-06-22 mark * Don't overflow. Max valid request should be the greatest
1299 640cd7ff 2022-06-22 mark * between the longest and total lines; cap at 10 million.
1301 640cd7ff 2022-06-22 mark if (n >= 9999999)
1302 640cd7ff 2022-06-22 mark n = 9999999;
1304 640cd7ff 2022-06-22 mark n = n * 10 + (c - '0');
1305 640cd7ff 2022-06-22 mark } while (((c = wgetch(view->window))) >= '0' && c <= '9' && c != ERR);
1307 640cd7ff 2022-06-22 mark /* Massage excessive or inapplicable values at the input handler. */
1308 640cd7ff 2022-06-22 mark view->count = n;
1313 0cf4efb1 2018-09-29 stsp static const struct got_error *
1314 e78dc838 2020-12-04 stsp view_input(struct tog_view **new, int *done, struct tog_view *view,
1315 e78dc838 2020-12-04 stsp struct tog_view_list_head *views)
1317 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1318 669b5ffa 2018-10-07 stsp struct tog_view *v;
1319 1a76625f 2018-10-22 stsp int ch, errcode;
1321 e5a0f69f 2018-08-18 stsp *new = NULL;
1323 f9967bca 2020-03-27 stsp /* Clear "no matches" indicator. */
1324 f9967bca 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE ||
1325 640cd7ff 2022-06-22 mark view->search_next_done == TOG_SEARCH_HAVE_NONE) {
1326 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
1327 640cd7ff 2022-06-22 mark view->count = 0;
1330 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
1331 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1332 82954512 2020-02-03 stsp if (errcode)
1333 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1334 82954512 2020-02-03 stsp "pthread_mutex_unlock");
1335 3da8ef85 2021-09-21 stsp sched_yield();
1336 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
1337 82954512 2020-02-03 stsp if (errcode)
1338 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1339 82954512 2020-02-03 stsp "pthread_mutex_lock");
1340 60493ae3 2019-06-20 stsp view->search_next(view);
1341 60493ae3 2019-06-20 stsp return NULL;
1344 a6d37fac 2022-07-03 mark nodelay(view->window, FALSE);
1345 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
1346 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1347 1a76625f 2018-10-22 stsp if (errcode)
1348 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
1349 a6d37fac 2022-07-03 mark /* If we have an unfinished count, let C-g or backspace abort. */
1350 a6d37fac 2022-07-03 mark if (view->count && --view->count) {
1352 a6d37fac 2022-07-03 mark nodelay(view->window, TRUE);
1353 640cd7ff 2022-06-22 mark ch = wgetch(view->window);
1354 a6d37fac 2022-07-03 mark if (ch == CTRL('g') || ch == KEY_BACKSPACE)
1355 a6d37fac 2022-07-03 mark view->count = 0;
1357 a6d37fac 2022-07-03 mark ch = view->ch;
1359 a6d37fac 2022-07-03 mark ch = wgetch(view->window);
1360 640cd7ff 2022-06-22 mark if (ch >= '1' && ch <= '9')
1361 640cd7ff 2022-06-22 mark view->ch = ch = get_compound_key(view, ch);
1363 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1364 1a76625f 2018-10-22 stsp if (errcode)
1365 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
1366 a6d37fac 2022-07-03 mark nodelay(view->window, TRUE);
1368 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
1369 25791caa 2018-10-24 stsp tog_resizeterm();
1370 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
1371 61266923 2020-01-14 stsp tog_sigcont_received = 0;
1372 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
1373 25791caa 2018-10-24 stsp err = view_resize(v);
1375 25791caa 2018-10-24 stsp return err;
1376 e78dc838 2020-12-04 stsp err = v->input(new, v, KEY_RESIZE);
1378 25791caa 2018-10-24 stsp return err;
1379 cdfcfb03 2020-12-06 stsp if (v->child) {
1380 cdfcfb03 2020-12-06 stsp err = view_resize(v->child);
1382 cdfcfb03 2020-12-06 stsp return err;
1383 cdfcfb03 2020-12-06 stsp err = v->child->input(new, v->child,
1384 cdfcfb03 2020-12-06 stsp KEY_RESIZE);
1386 cdfcfb03 2020-12-06 stsp return err;
1387 3c1dfe12 2022-07-08 mark if (v->child->resized_x || v->child->resized_y) {
1388 3c1dfe12 2022-07-08 mark err = view_resize_split(v, 0);
1390 3c1dfe12 2022-07-08 mark return err;
1396 e5a0f69f 2018-08-18 stsp switch (ch) {
1398 640cd7ff 2022-06-22 mark view->count = 0;
1399 1e37a5c2 2019-05-12 jcs if (view->child) {
1400 e78dc838 2020-12-04 stsp view->focussed = 0;
1401 e78dc838 2020-12-04 stsp view->child->focussed = 1;
1402 e78dc838 2020-12-04 stsp view->focus_child = 1;
1403 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
1404 e78dc838 2020-12-04 stsp view->focussed = 0;
1405 e78dc838 2020-12-04 stsp view->parent->focussed = 1;
1406 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
1407 9b058f45 2022-06-30 mark if (!view_is_splitscreen(view)) {
1408 6fe51fee 2022-07-22 mark if (view->parent->resize) {
1409 6fe51fee 2022-07-22 mark err = view->parent->resize(view->parent,
1412 9b058f45 2022-06-30 mark return err;
1414 9b058f45 2022-06-30 mark offset_selection_up(view->parent);
1415 6131ff18 2022-06-20 mark err = view_fullscreen(view->parent);
1417 9b058f45 2022-06-30 mark return err;
1422 9b058f45 2022-06-30 mark if (view->parent && view->mode == TOG_VIEW_SPLIT_HRZN) {
1423 6fe51fee 2022-07-22 mark if (view->parent->resize) {
1424 9b058f45 2022-06-30 mark /* might need more commits to fill fullscreen */
1425 6fe51fee 2022-07-22 mark err = view->parent->resize(view->parent, 0);
1429 9b058f45 2022-06-30 mark offset_selection_up(view->parent);
1431 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
1432 9970f7fc 2020-12-03 stsp view->dying = 1;
1438 640cd7ff 2022-06-22 mark view->count = 0;
1439 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
1440 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
1442 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
1443 e78dc838 2020-12-04 stsp view->focussed = 0;
1444 e78dc838 2020-12-04 stsp view->child->focussed = 1;
1445 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
1447 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
1449 3c1dfe12 2022-07-08 mark err = view_resize_split(view, 0);
1453 e78dc838 2020-12-04 stsp err = view->child->input(new, view->child,
1454 9970f7fc 2020-12-03 stsp KEY_RESIZE);
1456 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
1457 e78dc838 2020-12-04 stsp view->parent->focussed = 0;
1458 e78dc838 2020-12-04 stsp view->focussed = 1;
1459 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
1461 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
1462 9b058f45 2022-06-30 mark if (!err && view->mode != TOG_VIEW_SPLIT_HRZN)
1463 6131ff18 2022-06-20 mark err = view_resize(view->parent);
1465 3c1dfe12 2022-07-08 mark err = view_resize_split(view, 0);
1469 e78dc838 2020-12-04 stsp err = view->input(new, view, KEY_RESIZE);
1473 6fe51fee 2022-07-22 mark if (view->resize) {
1474 6fe51fee 2022-07-22 mark err = view->resize(view, 0);
1478 9b058f45 2022-06-30 mark if (view->parent)
1479 9b058f45 2022-06-30 mark err = offset_selection_down(view->parent);
1481 9b058f45 2022-06-30 mark err = offset_selection_down(view);
1484 3c1dfe12 2022-07-08 mark view->count = 0;
1485 d2366e29 2022-07-07 mark err = switch_split(view);
1488 3c1dfe12 2022-07-08 mark err = view_resize_split(view, -1);
1491 3c1dfe12 2022-07-08 mark err = view_resize_split(view, 1);
1493 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
1496 640cd7ff 2022-06-22 mark view->count = 0;
1497 60493ae3 2019-06-20 stsp if (view->search_start)
1498 2b49a8ae 2019-06-22 stsp view_search_start(view);
1500 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
1504 c0c4acc8 2021-01-24 stsp if (view->search_started && view->search_next) {
1505 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
1506 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
1507 60493ae3 2019-06-20 stsp view->search_next_done = 0;
1508 60493ae3 2019-06-20 stsp view->search_next(view);
1510 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
1513 917d79a7 2022-07-01 stsp if (tog_diff_algo == GOT_DIFF_ALGORITHM_MYERS)
1514 917d79a7 2022-07-01 stsp tog_diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
1516 917d79a7 2022-07-01 stsp tog_diff_algo = GOT_DIFF_ALGORITHM_MYERS;
1517 917d79a7 2022-07-01 stsp TAILQ_FOREACH(v, views, entry) {
1518 917d79a7 2022-07-01 stsp if (v->reset) {
1519 917d79a7 2022-07-01 stsp err = v->reset(v);
1521 917d79a7 2022-07-01 stsp return err;
1523 917d79a7 2022-07-01 stsp if (v->child && v->child->reset) {
1524 917d79a7 2022-07-01 stsp err = v->child->reset(v->child);
1526 917d79a7 2022-07-01 stsp return err;
1531 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
1535 e5a0f69f 2018-08-18 stsp return err;
1539 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
1541 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1542 acdafe9c 2020-12-03 stsp if (view->child == NULL || view->child->focussed)
1544 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
1546 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
1549 669b5ffa 2018-10-07 stsp return view->focussed;
1552 bcbd79e2 2018-08-19 stsp static const struct got_error *
1553 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
1555 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1556 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
1557 fb59748f 2020-12-05 stsp struct tog_view *new_view;
1558 d2366e29 2022-07-07 mark char *mode;
1559 fd823528 2018-10-22 stsp int fast_refresh = 10;
1560 1a76625f 2018-10-22 stsp int done = 0, errcode;
1562 d2366e29 2022-07-07 mark mode = getenv("TOG_VIEW_SPLIT_MODE");
1563 d2366e29 2022-07-07 mark if (!mode || !(*mode == 'h' || *mode == 'H'))
1564 d2366e29 2022-07-07 mark view->mode = TOG_VIEW_SPLIT_VERT;
1566 d2366e29 2022-07-07 mark view->mode = TOG_VIEW_SPLIT_HRZN;
1568 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1569 1a76625f 2018-10-22 stsp if (errcode)
1570 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
1572 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
1573 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
1575 1004088d 2018-09-29 stsp view->focussed = 1;
1576 878940b7 2018-09-29 stsp err = view->show(view);
1578 0cf4efb1 2018-09-29 stsp return err;
1579 0cf4efb1 2018-09-29 stsp update_panels();
1580 0cf4efb1 2018-09-29 stsp doupdate();
1581 5629093a 2022-07-11 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_thread_error &&
1582 5629093a 2022-07-11 stsp !tog_fatal_signal_received()) {
1583 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
1584 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
1585 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
1587 e78dc838 2020-12-04 stsp err = view_input(&new_view, &done, view, &views);
1590 9970f7fc 2020-12-03 stsp if (view->dying) {
1591 e78dc838 2020-12-04 stsp struct tog_view *v, *prev = NULL;
1593 9970f7fc 2020-12-03 stsp if (view_is_parent_view(view))
1594 9970f7fc 2020-12-03 stsp prev = TAILQ_PREV(view, tog_view_list_head,
1596 e78dc838 2020-12-04 stsp else if (view->parent)
1597 669b5ffa 2018-10-07 stsp prev = view->parent;
1599 e78dc838 2020-12-04 stsp if (view->parent) {
1600 9970f7fc 2020-12-03 stsp view->parent->child = NULL;
1601 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
1602 9b058f45 2022-06-30 mark /* Restore fullscreen line height. */
1603 9b058f45 2022-06-30 mark view->parent->nlines = view->parent->lines;
1604 0dbbbe90 2022-06-17 op err = view_resize(view->parent);
1607 3c1dfe12 2022-07-08 mark /* Make resized splits persist. */
1608 3c1dfe12 2022-07-08 mark view_transfer_size(view->parent, view);
1610 9970f7fc 2020-12-03 stsp TAILQ_REMOVE(&views, view, entry);
1612 9970f7fc 2020-12-03 stsp err = view_close(view);
1614 e5a0f69f 2018-08-18 stsp goto done;
1616 e78dc838 2020-12-04 stsp view = NULL;
1617 e78dc838 2020-12-04 stsp TAILQ_FOREACH(v, &views, entry) {
1618 e78dc838 2020-12-04 stsp if (v->focussed)
1621 e78dc838 2020-12-04 stsp if (view == NULL && new_view == NULL) {
1622 e78dc838 2020-12-04 stsp /* No view has focus. Try to pick one. */
1624 e78dc838 2020-12-04 stsp view = prev;
1625 e78dc838 2020-12-04 stsp else if (!TAILQ_EMPTY(&views)) {
1626 e78dc838 2020-12-04 stsp view = TAILQ_LAST(&views,
1627 e78dc838 2020-12-04 stsp tog_view_list_head);
1629 e78dc838 2020-12-04 stsp if (view) {
1630 e78dc838 2020-12-04 stsp if (view->focus_child) {
1631 e78dc838 2020-12-04 stsp view->child->focussed = 1;
1632 e78dc838 2020-12-04 stsp view = view->child;
1634 e78dc838 2020-12-04 stsp view->focussed = 1;
1638 bcbd79e2 2018-08-19 stsp if (new_view) {
1639 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
1640 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
1641 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
1642 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
1644 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
1645 86c66b02 2018-10-18 stsp err = view_close(v);
1647 86c66b02 2018-10-18 stsp goto done;
1650 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
1651 fed7eaa8 2018-10-24 stsp view = new_view;
1653 669b5ffa 2018-10-07 stsp if (view) {
1654 e78dc838 2020-12-04 stsp if (view_is_parent_view(view)) {
1655 e78dc838 2020-12-04 stsp if (view->child && view->child->focussed)
1656 e78dc838 2020-12-04 stsp view = view->child;
1658 e78dc838 2020-12-04 stsp if (view->parent && view->parent->focussed)
1659 e78dc838 2020-12-04 stsp view = view->parent;
1661 e78dc838 2020-12-04 stsp show_panel(view->panel);
1662 e78dc838 2020-12-04 stsp if (view->child && view_is_splitscreen(view->child))
1663 e78dc838 2020-12-04 stsp show_panel(view->child->panel);
1664 e78dc838 2020-12-04 stsp if (view->parent && view_is_splitscreen(view)) {
1665 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1667 1a76625f 2018-10-22 stsp goto done;
1669 669b5ffa 2018-10-07 stsp err = view->show(view);
1671 1a76625f 2018-10-22 stsp goto done;
1672 669b5ffa 2018-10-07 stsp if (view->child) {
1673 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1675 1a76625f 2018-10-22 stsp goto done;
1677 1a76625f 2018-10-22 stsp update_panels();
1678 1a76625f 2018-10-22 stsp doupdate();
1682 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1683 5629093a 2022-07-11 stsp const struct got_error *close_err;
1684 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1685 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1686 5629093a 2022-07-11 stsp close_err = view_close(view);
1687 5629093a 2022-07-11 stsp if (close_err && err == NULL)
1688 5629093a 2022-07-11 stsp err = close_err;
1691 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1692 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1693 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1695 e5a0f69f 2018-08-18 stsp return err;
1698 4ed7e80c 2018-05-20 stsp __dead static void
1699 9f7d7167 2018-04-29 stsp usage_log(void)
1702 c70c5802 2018-08-01 stsp fprintf(stderr,
1703 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1704 9f7d7167 2018-04-29 stsp getprogname());
1708 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1709 80ddbec8 2018-04-29 stsp static const struct got_error *
1710 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1712 00dfcb92 2018-06-11 stsp char *vis = NULL;
1713 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1715 963b370f 2018-05-20 stsp *ws = NULL;
1716 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1717 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1718 00dfcb92 2018-06-11 stsp int vislen;
1719 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1720 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1722 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1723 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1725 00dfcb92 2018-06-11 stsp return err;
1726 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1727 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1728 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1729 a7f50699 2018-06-11 stsp goto done;
1733 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1734 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1735 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1736 a7f50699 2018-06-11 stsp goto done;
1739 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1740 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1742 00dfcb92 2018-06-11 stsp free(vis);
1743 963b370f 2018-05-20 stsp if (err) {
1744 963b370f 2018-05-20 stsp free(*ws);
1745 963b370f 2018-05-20 stsp *ws = NULL;
1746 963b370f 2018-05-20 stsp *wlen = 0;
1748 963b370f 2018-05-20 stsp return err;
1751 145b6838 2022-06-16 stsp static const struct got_error *
1752 145b6838 2022-06-16 stsp expand_tab(char **ptr, const char *src)
1754 145b6838 2022-06-16 stsp char *dst;
1755 145b6838 2022-06-16 stsp size_t len, n, idx = 0, sz = 0;
1757 145b6838 2022-06-16 stsp *ptr = NULL;
1758 145b6838 2022-06-16 stsp n = len = strlen(src);
1759 6e1c41ad 2022-06-16 mark dst = malloc(n + 1);
1760 145b6838 2022-06-16 stsp if (dst == NULL)
1761 145b6838 2022-06-16 stsp return got_error_from_errno("malloc");
1763 145b6838 2022-06-16 stsp while (idx < len && src[idx]) {
1764 145b6838 2022-06-16 stsp const char c = src[idx];
1766 145b6838 2022-06-16 stsp if (c == '\t') {
1767 145b6838 2022-06-16 stsp size_t nb = TABSIZE - sz % TABSIZE;
1770 367ddf28 2022-06-16 mark p = realloc(dst, n + nb);
1771 6e1c41ad 2022-06-16 mark if (p == NULL) {
1772 6e1c41ad 2022-06-16 mark free(dst);
1773 6e1c41ad 2022-06-16 mark return got_error_from_errno("realloc");
1778 6e1c41ad 2022-06-16 mark memset(dst + sz, ' ', nb);
1781 145b6838 2022-06-16 stsp dst[sz++] = src[idx];
1785 145b6838 2022-06-16 stsp dst[sz] = '\0';
1786 145b6838 2022-06-16 stsp *ptr = dst;
1787 145b6838 2022-06-16 stsp return NULL;
1791 4e4a9ac8 2022-06-17 op * Advance at most n columns from wline starting at offset off.
1792 4e4a9ac8 2022-06-17 op * Return the index to the first character after the span operation.
1793 4e4a9ac8 2022-06-17 op * Return the combined column width of all spanned wide character in
1797 4e4a9ac8 2022-06-17 op span_wline(int *rcol, int off, wchar_t *wline, int n, int col_tab_align)
1799 4e4a9ac8 2022-06-17 op int width, i, cols = 0;
1801 4e4a9ac8 2022-06-17 op if (n == 0) {
1802 4e4a9ac8 2022-06-17 op *rcol = cols;
1806 4e4a9ac8 2022-06-17 op for (i = off; wline[i] != L'\0'; ++i) {
1807 4e4a9ac8 2022-06-17 op if (wline[i] == L'\t')
1808 4e4a9ac8 2022-06-17 op width = TABSIZE - ((cols + col_tab_align) % TABSIZE);
1810 4e4a9ac8 2022-06-17 op width = wcwidth(wline[i]);
1812 4e4a9ac8 2022-06-17 op if (width == -1) {
1814 4e4a9ac8 2022-06-17 op wline[i] = L'.';
1817 4e4a9ac8 2022-06-17 op if (cols + width > n)
1819 4e4a9ac8 2022-06-17 op cols += width;
1822 4e4a9ac8 2022-06-17 op *rcol = cols;
1827 ccda2f4d 2022-06-16 stsp * Format a line for display, ensuring that it won't overflow a width limit.
1828 ccda2f4d 2022-06-16 stsp * With scrolling, the width returned refers to the scrolled version of the
1829 ccda2f4d 2022-06-16 stsp * line, which starts at (*wlinep)[*scrollxp]. The caller must free *wlinep.
1831 ccda2f4d 2022-06-16 stsp static const struct got_error *
1832 ccda2f4d 2022-06-16 stsp format_line(wchar_t **wlinep, int *widthp, int *scrollxp,
1833 ccda2f4d 2022-06-16 stsp const char *line, int nscroll, int wlimit, int col_tab_align, int expand)
1835 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1837 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1838 145b6838 2022-06-16 stsp char *exstr = NULL;
1839 963b370f 2018-05-20 stsp size_t wlen;
1840 4e4a9ac8 2022-06-17 op int i, scrollx;
1842 963b370f 2018-05-20 stsp *wlinep = NULL;
1843 b700b5d6 2018-07-10 stsp *widthp = 0;
1845 145b6838 2022-06-16 stsp if (expand) {
1846 145b6838 2022-06-16 stsp err = expand_tab(&exstr, line);
1848 145b6838 2022-06-16 stsp return err;
1851 145b6838 2022-06-16 stsp err = mbs2ws(&wline, &wlen, expand ? exstr : line);
1852 145b6838 2022-06-16 stsp free(exstr);
1854 963b370f 2018-05-20 stsp return err;
1856 4e4a9ac8 2022-06-17 op scrollx = span_wline(&cols, 0, wline, nscroll, col_tab_align);
1858 3f670bfb 2020-12-10 stsp if (wlen > 0 && wline[wlen - 1] == L'\n') {
1859 3f670bfb 2020-12-10 stsp wline[wlen - 1] = L'\0';
1862 3f670bfb 2020-12-10 stsp if (wlen > 0 && wline[wlen - 1] == L'\r') {
1863 3f670bfb 2020-12-10 stsp wline[wlen - 1] = L'\0';
1867 4e4a9ac8 2022-06-17 op i = span_wline(&cols, scrollx, wline, wlimit, col_tab_align);
1868 4e4a9ac8 2022-06-17 op wline[i] = L'\0';
1870 b700b5d6 2018-07-10 stsp if (widthp)
1871 b700b5d6 2018-07-10 stsp *widthp = cols;
1872 ccda2f4d 2022-06-16 stsp if (scrollxp)
1873 ccda2f4d 2022-06-16 stsp *scrollxp = scrollx;
1875 963b370f 2018-05-20 stsp free(wline);
1877 963b370f 2018-05-20 stsp *wlinep = wline;
1878 963b370f 2018-05-20 stsp return err;
1881 8b473291 2019-02-21 stsp static const struct got_error*
1882 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1883 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1885 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1886 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1888 8b473291 2019-02-21 stsp const char *name;
1890 8b473291 2019-02-21 stsp *refs_str = NULL;
1892 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, refs, entry) {
1893 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1894 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
1897 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1898 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1900 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1901 8b473291 2019-02-21 stsp name += 5;
1902 cc488aa7 2022-01-23 stsp if (strncmp(name, "got/", 4) == 0 &&
1903 cc488aa7 2022-01-23 stsp strncmp(name, "got/backup/", 11) != 0)
1905 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1906 8b473291 2019-02-21 stsp name += 6;
1907 79cc719f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
1908 8b473291 2019-02-21 stsp name += 8;
1909 79cc719f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
1910 79cc719f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
1913 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
1916 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1917 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
1918 5d844a1e 2019-08-13 stsp if (err) {
1919 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
1920 48cae60d 2020-09-22 stsp free(ref_id);
1923 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1924 5d844a1e 2019-08-13 stsp err = NULL;
1925 5d844a1e 2019-08-13 stsp tag = NULL;
1928 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1929 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
1930 48cae60d 2020-09-22 stsp free(ref_id);
1932 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1933 52b5abe1 2019-08-13 stsp if (cmp != 0)
1935 8b473291 2019-02-21 stsp s = *refs_str;
1936 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1937 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1938 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1940 8b473291 2019-02-21 stsp *refs_str = NULL;
1946 8b473291 2019-02-21 stsp return err;
1949 963b370f 2018-05-20 stsp static const struct got_error *
1950 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1951 27a741e5 2019-09-11 stsp int col_tab_align)
1953 e6b8b890 2020-12-29 naddy char *smallerthan;
1955 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1956 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1957 5813d178 2019-03-09 stsp author = smallerthan + 1;
1958 e6b8b890 2020-12-29 naddy author[strcspn(author, "@>")] = '\0';
1959 ccda2f4d 2022-06-16 stsp return format_line(wauthor, author_width, NULL, author, 0, limit,
1960 ccda2f4d 2022-06-16 stsp col_tab_align, 0);
1963 5813d178 2019-03-09 stsp static const struct got_error *
1964 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1965 8fdc79fe 2020-12-01 naddy struct got_object_id *id, const size_t date_display_cols,
1966 8fdc79fe 2020-12-01 naddy int author_display_cols)
1968 8fdc79fe 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
1969 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1970 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1971 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1972 5813d178 2019-03-09 stsp char *author = NULL;
1973 ccda2f4d 2022-06-16 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1974 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1975 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1976 ccda2f4d 2022-06-16 stsp int col, limit, scrollx;
1977 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1978 ccb26ccd 2018-11-05 stsp struct tm tm;
1979 45d799e2 2018-12-23 stsp time_t committer_time;
1980 11b20872 2019-11-08 stsp struct tog_color *tc;
1982 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1983 e385fc42 2021-08-30 stsp if (gmtime_r(&committer_time, &tm) == NULL)
1984 e385fc42 2021-08-30 stsp return got_error_from_errno("gmtime_r");
1985 ec6d1a36 2021-03-21 jrick if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0)
1986 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1988 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1989 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1991 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1992 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_DATE);
1994 11b20872 2019-11-08 stsp wattr_on(view->window,
1995 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1996 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1998 11b20872 2019-11-08 stsp wattr_off(view->window,
1999 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2000 27a741e5 2019-09-11 stsp col = limit;
2001 b39d25c7 2018-07-10 stsp if (col > avail)
2002 b39d25c7 2018-07-10 stsp goto done;
2004 6570a66d 2019-11-08 stsp if (avail >= 120) {
2005 6570a66d 2019-11-08 stsp char *id_str;
2006 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
2008 6570a66d 2019-11-08 stsp goto done;
2009 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
2011 11b20872 2019-11-08 stsp wattr_on(view->window,
2012 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2013 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
2015 11b20872 2019-11-08 stsp wattr_off(view->window,
2016 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2017 6570a66d 2019-11-08 stsp free(id_str);
2019 6570a66d 2019-11-08 stsp if (col > avail)
2020 6570a66d 2019-11-08 stsp goto done;
2023 10aab77f 2022-07-19 op if (s->use_committer)
2024 10aab77f 2022-07-19 op author = strdup(got_object_commit_get_committer(commit));
2026 10aab77f 2022-07-19 op author = strdup(got_object_commit_get_author(commit));
2027 5813d178 2019-03-09 stsp if (author == NULL) {
2028 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2029 80ddbec8 2018-04-29 stsp goto done;
2031 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
2033 bb737323 2018-05-20 stsp goto done;
2034 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_AUTHOR);
2036 11b20872 2019-11-08 stsp wattr_on(view->window,
2037 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2038 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
2040 11b20872 2019-11-08 stsp wattr_off(view->window,
2041 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2042 bb737323 2018-05-20 stsp col += author_width;
2043 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
2044 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
2046 bb737323 2018-05-20 stsp author_width++;
2048 9c2eaf34 2018-05-20 stsp if (col > avail)
2049 9c2eaf34 2018-05-20 stsp goto done;
2051 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
2053 6d9fbc00 2018-04-29 stsp goto done;
2054 bb737323 2018-05-20 stsp logmsg = logmsg0;
2055 bb737323 2018-05-20 stsp while (*logmsg == '\n')
2057 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
2058 bb737323 2018-05-20 stsp if (newline)
2059 bb737323 2018-05-20 stsp *newline = '\0';
2060 ccda2f4d 2022-06-16 stsp limit = avail - col;
2061 49b24ee5 2022-07-03 mark if (view->child && !view_is_hsplit_top(view) && limit > 0)
2062 4d1f6af3 2022-06-17 op limit--; /* for the border */
2063 ccda2f4d 2022-06-16 stsp err = format_line(&wlogmsg, &logmsg_width, &scrollx, logmsg, view->x,
2064 ccda2f4d 2022-06-16 stsp limit, col, 1);
2066 29688b02 2022-06-16 stsp goto done;
2067 ccda2f4d 2022-06-16 stsp waddwstr(view->window, &wlogmsg[scrollx]);
2068 29688b02 2022-06-16 stsp col += MAX(logmsg_width, 0);
2069 27a741e5 2019-09-11 stsp while (col < avail) {
2070 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
2074 80ddbec8 2018-04-29 stsp free(logmsg0);
2075 bb737323 2018-05-20 stsp free(wlogmsg);
2076 5813d178 2019-03-09 stsp free(author);
2077 bb737323 2018-05-20 stsp free(wauthor);
2078 80ddbec8 2018-04-29 stsp free(line);
2079 80ddbec8 2018-04-29 stsp return err;
2082 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
2083 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
2084 899d86c2 2018-05-10 stsp struct got_object_id *id)
2086 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
2088 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
2089 80ddbec8 2018-04-29 stsp if (entry == NULL)
2090 899d86c2 2018-05-10 stsp return NULL;
2092 899d86c2 2018-05-10 stsp entry->id = id;
2093 99db9666 2018-05-07 stsp entry->commit = commit;
2094 899d86c2 2018-05-10 stsp return entry;
2097 99db9666 2018-05-07 stsp static void
2098 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
2100 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
2102 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
2103 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
2104 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
2105 ecb28ae0 2018-07-16 stsp commits->ncommits--;
2106 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
2107 99db9666 2018-05-07 stsp free(entry);
2110 99db9666 2018-05-07 stsp static void
2111 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
2113 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
2114 99db9666 2018-05-07 stsp pop_commit(commits);
2117 c4972b91 2018-05-07 stsp static const struct got_error *
2118 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
2119 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
2121 13add988 2019-10-15 stsp const struct got_error *err = NULL;
2122 13add988 2019-10-15 stsp regmatch_t regmatch;
2123 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
2125 13add988 2019-10-15 stsp *have_match = 0;
2127 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
2129 13add988 2019-10-15 stsp return err;
2131 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
2133 13add988 2019-10-15 stsp goto done;
2135 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
2136 13add988 2019-10-15 stsp ®match, 0) == 0 ||
2137 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
2138 13add988 2019-10-15 stsp ®match, 0) == 0 ||
2139 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
2140 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
2141 13add988 2019-10-15 stsp *have_match = 1;
2143 13add988 2019-10-15 stsp free(id_str);
2144 13add988 2019-10-15 stsp free(logmsg);
2145 13add988 2019-10-15 stsp return err;
2148 13add988 2019-10-15 stsp static const struct got_error *
2149 4e0d2870 2020-12-07 naddy queue_commits(struct tog_log_thread_args *a)
2151 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
2154 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
2155 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
2156 1a76625f 2018-10-22 stsp * while updating the display.
2159 93e45b7c 2018-09-24 stsp struct got_object_id *id;
2160 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
2161 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
2162 1a76625f 2018-10-22 stsp int errcode;
2164 4e0d2870 2020-12-07 naddy err = got_commit_graph_iter_next(&id, a->graph, a->repo,
2165 4e0d2870 2020-12-07 naddy NULL, NULL);
2166 ee780d5c 2020-01-04 stsp if (err || id == NULL)
2169 4e0d2870 2020-12-07 naddy err = got_object_open_as_commit(&commit, a->repo, id);
2172 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
2173 9ba79e04 2018-06-11 stsp if (entry == NULL) {
2174 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
2178 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2179 1a76625f 2018-10-22 stsp if (errcode) {
2180 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
2181 13add988 2019-10-15 stsp "pthread_mutex_lock");
2185 4e0d2870 2020-12-07 naddy entry->idx = a->commits->ncommits;
2186 4e0d2870 2020-12-07 naddy TAILQ_INSERT_TAIL(&a->commits->head, entry, entry);
2187 4e0d2870 2020-12-07 naddy a->commits->ncommits++;
2189 4e0d2870 2020-12-07 naddy if (*a->searching == TOG_SEARCH_FORWARD &&
2190 4e0d2870 2020-12-07 naddy !*a->search_next_done) {
2191 7c1452c1 2020-03-26 stsp int have_match;
2192 4e0d2870 2020-12-07 naddy err = match_commit(&have_match, id, commit, a->regex);
2195 7c1452c1 2020-03-26 stsp if (have_match)
2196 4e0d2870 2020-12-07 naddy *a->search_next_done = TOG_SEARCH_HAVE_MORE;
2199 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2200 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2201 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2202 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2205 4e0d2870 2020-12-07 naddy } while (*a->searching == TOG_SEARCH_FORWARD && !*a->search_next_done);
2207 9ba79e04 2018-06-11 stsp return err;
2210 2b779855 2020-12-05 naddy static void
2211 2b779855 2020-12-05 naddy select_commit(struct tog_log_view_state *s)
2213 2b779855 2020-12-05 naddy struct commit_queue_entry *entry;
2214 2b779855 2020-12-05 naddy int ncommits = 0;
2216 2b779855 2020-12-05 naddy entry = s->first_displayed_entry;
2217 2b779855 2020-12-05 naddy while (entry) {
2218 2b779855 2020-12-05 naddy if (ncommits == s->selected) {
2219 2b779855 2020-12-05 naddy s->selected_entry = entry;
2222 2b779855 2020-12-05 naddy entry = TAILQ_NEXT(entry, entry);
2223 2b779855 2020-12-05 naddy ncommits++;
2227 0553a4e3 2018-04-30 stsp static const struct got_error *
2228 8fdc79fe 2020-12-01 naddy draw_commits(struct tog_view *view)
2230 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
2231 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
2232 2b779855 2020-12-05 naddy struct commit_queue_entry *entry = s->selected_entry;
2233 8fdc79fe 2020-12-01 naddy const int limit = view->nlines;
2234 60493ae3 2019-06-20 stsp int width;
2235 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
2236 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
2237 8b473291 2019-02-21 stsp char *refs_str = NULL;
2238 ecb28ae0 2018-07-16 stsp wchar_t *wline;
2239 11b20872 2019-11-08 stsp struct tog_color *tc;
2240 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
2242 8fdc79fe 2020-12-01 naddy if (s->selected_entry &&
2243 8fdc79fe 2020-12-01 naddy !(view->searching && view->search_next_done == 0)) {
2244 d2075bf3 2020-12-25 stsp struct got_reflist_head *refs;
2245 8fdc79fe 2020-12-01 naddy err = got_object_id_str(&id_str, s->selected_entry->id);
2247 ecb28ae0 2018-07-16 stsp return err;
2248 51a10b52 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(tog_refs_idmap,
2249 d2075bf3 2020-12-25 stsp s->selected_entry->id);
2250 d2075bf3 2020-12-25 stsp if (refs) {
2251 d2075bf3 2020-12-25 stsp err = build_refs_str(&refs_str, refs,
2252 d2075bf3 2020-12-25 stsp s->selected_entry->id, s->repo);
2254 d2075bf3 2020-12-25 stsp goto done;
2258 8fdc79fe 2020-12-01 naddy if (s->thread_args.commits_needed == 0)
2259 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
2261 fb280deb 2021-08-30 stsp if (s->thread_args.commits_needed > 0 || s->thread_args.load_all) {
2262 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
2263 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
2264 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
2265 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
2266 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
2267 8f4ed634 2020-03-26 stsp goto done;
2270 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
2272 f9686aa5 2020-03-27 stsp if (view->searching) {
2273 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
2274 f9686aa5 2020-03-27 stsp search_str = "no more matches";
2275 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
2276 f9686aa5 2020-03-27 stsp search_str = "no matches found";
2277 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
2278 f9686aa5 2020-03-27 stsp search_str = "searching...";
2281 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
2282 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
2283 f9686aa5 2020-03-27 stsp search_str ? search_str :
2284 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
2285 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
2286 8f4ed634 2020-03-26 stsp goto done;
2290 8fdc79fe 2020-12-01 naddy if (s->in_repo_path && strcmp(s->in_repo_path, "/") != 0) {
2291 87411fa9 2022-06-16 stsp if (asprintf(&header, "commit %s %s%s", id_str ? id_str :
2292 87411fa9 2022-06-16 stsp "........................................",
2293 8fdc79fe 2020-12-01 naddy s->in_repo_path, ncommits_str) == -1) {
2294 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2295 1a76625f 2018-10-22 stsp header = NULL;
2296 1a76625f 2018-10-22 stsp goto done;
2298 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
2299 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
2300 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
2301 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2302 1a76625f 2018-10-22 stsp header = NULL;
2303 1a76625f 2018-10-22 stsp goto done;
2305 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, header, 0, view->ncols, 0, 0);
2307 1a76625f 2018-10-22 stsp goto done;
2309 2814baeb 2018-08-01 stsp werase(view->window);
2311 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2312 a3404814 2018-09-02 stsp wstandout(view->window);
2313 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
2315 11b20872 2019-11-08 stsp wattr_on(view->window,
2316 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2317 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
2319 11b20872 2019-11-08 stsp wattr_off(view->window,
2320 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2321 1a76625f 2018-10-22 stsp while (width < view->ncols) {
2322 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
2325 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2326 a3404814 2018-09-02 stsp wstandend(view->window);
2327 ecb28ae0 2018-07-16 stsp free(wline);
2328 ecb28ae0 2018-07-16 stsp if (limit <= 1)
2329 1a76625f 2018-10-22 stsp goto done;
2331 29688b02 2022-06-16 stsp /* Grow author column size if necessary, and set view->maxx. */
2332 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
2333 5813d178 2019-03-09 stsp ncommits = 0;
2334 145b6838 2022-06-16 stsp view->maxx = 0;
2335 5813d178 2019-03-09 stsp while (entry) {
2336 10aab77f 2022-07-19 op struct got_commit_object *c = entry->commit;
2337 145b6838 2022-06-16 stsp char *author, *eol, *msg, *msg0;
2338 29688b02 2022-06-16 stsp wchar_t *wauthor, *wmsg;
2339 5813d178 2019-03-09 stsp int width;
2340 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
2342 10aab77f 2022-07-19 op if (s->use_committer)
2343 10aab77f 2022-07-19 op author = strdup(got_object_commit_get_committer(c));
2345 10aab77f 2022-07-19 op author = strdup(got_object_commit_get_author(c));
2346 5813d178 2019-03-09 stsp if (author == NULL) {
2347 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2348 5813d178 2019-03-09 stsp goto done;
2350 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
2351 27a741e5 2019-09-11 stsp date_display_cols);
2352 5813d178 2019-03-09 stsp if (author_cols < width)
2353 5813d178 2019-03-09 stsp author_cols = width;
2354 5813d178 2019-03-09 stsp free(wauthor);
2355 5813d178 2019-03-09 stsp free(author);
2356 a310d9c3 2022-07-21 florian if (err)
2357 a310d9c3 2022-07-21 florian goto done;
2358 10aab77f 2022-07-19 op err = got_object_commit_get_logmsg(&msg0, c);
2360 145b6838 2022-06-16 stsp goto done;
2361 145b6838 2022-06-16 stsp msg = msg0;
2362 145b6838 2022-06-16 stsp while (*msg == '\n')
2364 145b6838 2022-06-16 stsp if ((eol = strchr(msg, '\n')))
2365 29688b02 2022-06-16 stsp *eol = '\0';
2366 ccda2f4d 2022-06-16 stsp err = format_line(&wmsg, &width, NULL, msg, 0, INT_MAX,
2367 29688b02 2022-06-16 stsp date_display_cols + author_cols, 0);
2369 29688b02 2022-06-16 stsp goto done;
2370 29688b02 2022-06-16 stsp view->maxx = MAX(view->maxx, width);
2371 145b6838 2022-06-16 stsp free(msg0);
2372 29688b02 2022-06-16 stsp free(wmsg);
2373 7ca04879 2019-10-19 stsp ncommits++;
2374 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
2377 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
2378 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = s->first_displayed_entry;
2379 867c6645 2018-07-10 stsp ncommits = 0;
2380 899d86c2 2018-05-10 stsp while (entry) {
2381 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
2383 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
2384 2814baeb 2018-08-01 stsp wstandout(view->window);
2385 8fdc79fe 2020-12-01 naddy err = draw_commit(view, entry->commit, entry->id,
2386 8fdc79fe 2020-12-01 naddy date_display_cols, author_cols);
2387 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
2388 2814baeb 2018-08-01 stsp wstandend(view->window);
2390 60493ae3 2019-06-20 stsp goto done;
2391 0553a4e3 2018-04-30 stsp ncommits++;
2392 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = entry;
2393 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
2396 9b058f45 2022-06-30 mark view_border(view);
2398 1a76625f 2018-10-22 stsp free(id_str);
2399 8b473291 2019-02-21 stsp free(refs_str);
2400 1a76625f 2018-10-22 stsp free(ncommits_str);
2401 1a76625f 2018-10-22 stsp free(header);
2402 80ddbec8 2018-04-29 stsp return err;
2405 07b55e75 2018-05-10 stsp static void
2406 3e135950 2020-12-01 naddy log_scroll_up(struct tog_log_view_state *s, int maxscroll)
2408 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
2409 07b55e75 2018-05-10 stsp int nscrolled = 0;
2411 ffe38506 2020-12-01 naddy entry = TAILQ_FIRST(&s->commits.head);
2412 ffe38506 2020-12-01 naddy if (s->first_displayed_entry == entry)
2415 ffe38506 2020-12-01 naddy entry = s->first_displayed_entry;
2416 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
2417 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2418 07b55e75 2018-05-10 stsp if (entry) {
2419 ffe38506 2020-12-01 naddy s->first_displayed_entry = entry;
2420 07b55e75 2018-05-10 stsp nscrolled++;
2425 aa075928 2018-05-10 stsp static const struct got_error *
2426 ffe38506 2020-12-01 naddy trigger_log_thread(struct tog_view *view, int wait)
2428 ffe38506 2020-12-01 naddy struct tog_log_thread_args *ta = &view->state.log.thread_args;
2429 5e224a3e 2019-02-22 stsp int errcode;
2431 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
2433 5629093a 2022-07-11 stsp while (!ta->log_complete && !tog_thread_error &&
2434 5629093a 2022-07-11 stsp (ta->commits_needed > 0 || ta->load_all)) {
2435 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
2436 ffe38506 2020-12-01 naddy errcode = pthread_cond_signal(&ta->need_commits);
2437 7aafa0d1 2019-02-22 stsp if (errcode)
2438 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2439 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2442 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
2443 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
2445 7c1452c1 2020-03-26 stsp if (!wait)
2448 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
2449 ffe38506 2020-12-01 naddy show_log_view(view);
2450 7c1452c1 2020-03-26 stsp update_panels();
2451 7c1452c1 2020-03-26 stsp doupdate();
2453 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
2454 ffe38506 2020-12-01 naddy errcode = pthread_cond_wait(&ta->commit_loaded, &tog_mutex);
2455 82954512 2020-02-03 stsp if (errcode)
2456 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
2457 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
2459 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
2460 ffe38506 2020-12-01 naddy show_log_view(view);
2461 7c1452c1 2020-03-26 stsp update_panels();
2462 7c1452c1 2020-03-26 stsp doupdate();
2465 5e224a3e 2019-02-22 stsp return NULL;
2468 5e224a3e 2019-02-22 stsp static const struct got_error *
2469 9b058f45 2022-06-30 mark request_log_commits(struct tog_view *view)
2471 9b058f45 2022-06-30 mark struct tog_log_view_state *state = &view->state.log;
2472 9b058f45 2022-06-30 mark const struct got_error *err = NULL;
2474 2525dccb 2022-07-13 mark if (state->thread_args.log_complete)
2475 2525dccb 2022-07-13 mark return NULL;
2477 27187d45 2022-07-11 mark state->thread_args.commits_needed += view->nscrolled;
2478 9b058f45 2022-06-30 mark err = trigger_log_thread(view, 1);
2479 9b058f45 2022-06-30 mark view->nscrolled = 0;
2481 9b058f45 2022-06-30 mark return err;
2484 9b058f45 2022-06-30 mark static const struct got_error *
2485 ffe38506 2020-12-01 naddy log_scroll_down(struct tog_view *view, int maxscroll)
2487 ffe38506 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
2488 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
2489 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
2490 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
2492 ffe38506 2020-12-01 naddy if (s->last_displayed_entry == NULL)
2493 5e224a3e 2019-02-22 stsp return NULL;
2495 bf30f154 2020-12-07 naddy ncommits_needed = s->last_displayed_entry->idx + 1 + maxscroll;
2496 ffe38506 2020-12-01 naddy if (s->commits.ncommits < ncommits_needed &&
2497 ffe38506 2020-12-01 naddy !s->thread_args.log_complete) {
2499 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
2501 ffe38506 2020-12-01 naddy s->thread_args.commits_needed += maxscroll;
2502 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
2504 5e224a3e 2019-02-22 stsp return err;
2508 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->last_displayed_entry, entry);
2509 9b058f45 2022-06-30 mark if (pentry == NULL && view->mode != TOG_VIEW_SPLIT_HRZN)
2512 9b058f45 2022-06-30 mark s->last_displayed_entry = pentry ?
2513 9b058f45 2022-06-30 mark pentry : s->last_displayed_entry;;
2515 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->first_displayed_entry, entry);
2516 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
2518 ffe38506 2020-12-01 naddy s->first_displayed_entry = pentry;
2519 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
2521 2525dccb 2022-07-13 mark if (view->mode == TOG_VIEW_SPLIT_HRZN && !s->thread_args.log_complete)
2522 9b058f45 2022-06-30 mark view->nscrolled += nscrolled;
2524 9b058f45 2022-06-30 mark view->nscrolled = 0;
2526 dd0a52c1 2018-05-20 stsp return err;
2529 cd0acaa7 2018-05-20 stsp static const struct got_error *
2530 9b058f45 2022-06-30 mark open_diff_view_for_commit(struct tog_view **new_view, int begin_y, int begin_x,
2531 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
2532 78756c87 2020-11-24 stsp struct tog_view *log_view, struct got_repository *repo)
2534 cd0acaa7 2018-05-20 stsp const struct got_error *err;
2535 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
2536 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
2538 9b058f45 2022-06-30 mark diff_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_DIFF);
2539 15a94983 2018-12-23 stsp if (diff_view == NULL)
2540 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
2542 dbdddfee 2021-06-23 naddy parent_id = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
2543 d7b5a0e8 2022-04-20 stsp err = open_diff_view(diff_view, parent_id ? &parent_id->id : NULL,
2544 78756c87 2020-11-24 stsp commit_id, NULL, NULL, 3, 0, 0, log_view, repo);
2545 e5a0f69f 2018-08-18 stsp if (err == NULL)
2546 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
2547 cd0acaa7 2018-05-20 stsp return err;
2550 80ddbec8 2018-04-29 stsp static const struct got_error *
2551 42a2230c 2020-12-01 naddy tree_view_visit_subtree(struct tog_tree_view_state *s,
2552 42a2230c 2020-12-01 naddy struct got_tree_object *subtree)
2554 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
2556 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
2557 941e9f74 2019-05-21 stsp if (parent == NULL)
2558 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
2560 941e9f74 2019-05-21 stsp parent->tree = s->tree;
2561 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
2562 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
2563 941e9f74 2019-05-21 stsp parent->selected = s->selected;
2564 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
2565 941e9f74 2019-05-21 stsp s->tree = subtree;
2566 941e9f74 2019-05-21 stsp s->selected = 0;
2567 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
2568 941e9f74 2019-05-21 stsp return NULL;
2571 941e9f74 2019-05-21 stsp static const struct got_error *
2572 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
2573 a44927cc 2022-04-07 stsp struct got_commit_object *commit, const char *path)
2575 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
2576 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
2577 941e9f74 2019-05-21 stsp const char *p;
2578 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
2580 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
2582 941e9f74 2019-05-21 stsp while (*p) {
2583 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2584 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
2585 56e0773d 2019-11-28 stsp char *te_name;
2587 33cbf02b 2020-01-12 stsp while (p[0] == '/')
2590 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
2591 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
2592 941e9f74 2019-05-21 stsp if (slash == NULL)
2593 33cbf02b 2020-01-12 stsp te_name = strdup(p);
2595 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
2596 56e0773d 2019-11-28 stsp if (te_name == NULL) {
2597 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
2600 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
2601 56e0773d 2019-11-28 stsp if (te == NULL) {
2602 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
2603 56e0773d 2019-11-28 stsp free(te_name);
2606 56e0773d 2019-11-28 stsp free(te_name);
2607 9a1d5146 2020-11-27 naddy s->first_displayed_entry = s->selected_entry = te;
2609 9a1d5146 2020-11-27 naddy if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry)))
2610 9a1d5146 2020-11-27 naddy break; /* jump to this file's entry */
2612 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
2613 941e9f74 2019-05-21 stsp if (slash)
2614 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
2616 941e9f74 2019-05-21 stsp subpath = strdup(path);
2617 941e9f74 2019-05-21 stsp if (subpath == NULL) {
2618 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
2622 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, s->repo, commit,
2627 d91faf3b 2020-12-01 naddy err = got_object_open_as_tree(&tree, s->repo, tree_id);
2628 941e9f74 2019-05-21 stsp free(tree_id);
2632 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, tree);
2633 941e9f74 2019-05-21 stsp if (err) {
2634 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
2637 941e9f74 2019-05-21 stsp if (slash == NULL)
2639 941e9f74 2019-05-21 stsp free(subpath);
2640 941e9f74 2019-05-21 stsp subpath = NULL;
2641 941e9f74 2019-05-21 stsp p = slash;
2644 941e9f74 2019-05-21 stsp free(subpath);
2645 1a76625f 2018-10-22 stsp return err;
2648 61266923 2020-01-14 stsp static const struct got_error *
2649 49b24ee5 2022-07-03 mark browse_commit_tree(struct tog_view **new_view, int begin_y, int begin_x,
2650 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
2651 4e97c21c 2020-12-06 stsp const char *head_ref_name, struct got_repository *repo)
2653 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
2654 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
2655 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
2657 49b24ee5 2022-07-03 mark tree_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_TREE);
2658 55cccc34 2020-02-20 stsp if (tree_view == NULL)
2659 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
2661 bc573f3b 2021-07-10 stsp err = open_tree_view(tree_view, entry->id, head_ref_name, repo);
2663 55cccc34 2020-02-20 stsp return err;
2664 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
2666 55cccc34 2020-02-20 stsp *new_view = tree_view;
2668 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
2669 55cccc34 2020-02-20 stsp return NULL;
2671 a44927cc 2022-04-07 stsp return tree_view_walk_path(s, entry->commit, path);
2674 55cccc34 2020-02-20 stsp static const struct got_error *
2675 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
2677 61266923 2020-01-14 stsp sigset_t sigset;
2678 61266923 2020-01-14 stsp int errcode;
2680 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
2681 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
2683 2497f032 2022-05-31 stsp /* tog handles SIGWINCH, SIGCONT, SIGINT, SIGTERM */
2684 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
2685 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2686 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
2687 2497f032 2022-05-31 stsp return got_error_from_errno("sigaddset");
2688 2497f032 2022-05-31 stsp if (sigaddset(&sigset, SIGINT) == -1)
2689 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2690 2497f032 2022-05-31 stsp if (sigaddset(&sigset, SIGTERM) == -1)
2691 2497f032 2022-05-31 stsp return got_error_from_errno("sigaddset");
2693 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
2694 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
2695 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2697 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
2698 61266923 2020-01-14 stsp if (errcode)
2699 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
2701 61266923 2020-01-14 stsp return NULL;
2704 1a76625f 2018-10-22 stsp static void *
2705 1a76625f 2018-10-22 stsp log_thread(void *arg)
2707 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2708 1a76625f 2018-10-22 stsp int errcode = 0;
2709 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
2710 1a76625f 2018-10-22 stsp int done = 0;
2713 5629093a 2022-07-11 stsp * Sync startup with main thread such that we begin our
2714 5629093a 2022-07-11 stsp * work once view_input() has released the mutex.
2716 5629093a 2022-07-11 stsp errcode = pthread_mutex_lock(&tog_mutex);
2717 5629093a 2022-07-11 stsp if (errcode) {
2718 5629093a 2022-07-11 stsp err = got_error_set_errno(errcode, "pthread_mutex_lock");
2719 61266923 2020-01-14 stsp return (void *)err;
2722 5629093a 2022-07-11 stsp err = block_signals_used_by_main_thread();
2723 5629093a 2022-07-11 stsp if (err) {
2724 5629093a 2022-07-11 stsp pthread_mutex_unlock(&tog_mutex);
2725 5629093a 2022-07-11 stsp goto done;
2728 2497f032 2022-05-31 stsp while (!done && !err && !tog_fatal_signal_received()) {
2729 5629093a 2022-07-11 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2730 5629093a 2022-07-11 stsp if (errcode) {
2731 5629093a 2022-07-11 stsp err = got_error_set_errno(errcode,
2732 5629093a 2022-07-11 stsp "pthread_mutex_unlock");
2733 5629093a 2022-07-11 stsp goto done;
2735 4e0d2870 2020-12-07 naddy err = queue_commits(a);
2736 1a76625f 2018-10-22 stsp if (err) {
2737 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
2738 5629093a 2022-07-11 stsp goto done;
2739 1a76625f 2018-10-22 stsp err = NULL;
2741 fb280deb 2021-08-30 stsp } else if (a->commits_needed > 0 && !a->load_all)
2742 1a76625f 2018-10-22 stsp a->commits_needed--;
2744 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2745 3abe8080 2019-04-10 stsp if (errcode) {
2746 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2747 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2748 5629093a 2022-07-11 stsp goto done;
2749 3abe8080 2019-04-10 stsp } else if (*a->quit)
2751 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
2752 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
2753 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
2754 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
2757 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
2758 7c1452c1 2020-03-26 stsp if (errcode) {
2759 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2760 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
2761 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
2762 5629093a 2022-07-11 stsp goto done;
2766 1a76625f 2018-10-22 stsp a->commits_needed = 0;
2768 fb280deb 2021-08-30 stsp if (a->commits_needed == 0 && !a->load_all) {
2769 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
2770 7c1452c1 2020-03-26 stsp &tog_mutex);
2771 5629093a 2022-07-11 stsp if (errcode) {
2772 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2773 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
2774 5629093a 2022-07-11 stsp pthread_mutex_unlock(&tog_mutex);
2775 5629093a 2022-07-11 stsp goto done;
2777 21355643 2020-12-06 stsp if (*a->quit)
2782 3abe8080 2019-04-10 stsp a->log_complete = 1;
2783 5629093a 2022-07-11 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2784 5629093a 2022-07-11 stsp if (errcode)
2785 5629093a 2022-07-11 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
2787 5629093a 2022-07-11 stsp if (err) {
2788 5629093a 2022-07-11 stsp tog_thread_error = 1;
2789 5629093a 2022-07-11 stsp pthread_cond_signal(&a->commit_loaded);
2791 1a76625f 2018-10-22 stsp return (void *)err;
2794 1a76625f 2018-10-22 stsp static const struct got_error *
2795 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2797 5629093a 2022-07-11 stsp const struct got_error *err = NULL, *thread_err = NULL;
2798 1a76625f 2018-10-22 stsp int errcode;
2800 1a76625f 2018-10-22 stsp if (s->thread) {
2801 1a76625f 2018-10-22 stsp s->quit = 1;
2802 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2803 1a76625f 2018-10-22 stsp if (errcode)
2804 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2805 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2806 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2807 1a76625f 2018-10-22 stsp if (errcode)
2808 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2809 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2810 5629093a 2022-07-11 stsp errcode = pthread_join(s->thread, (void **)&thread_err);
2811 1a76625f 2018-10-22 stsp if (errcode)
2812 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2813 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2814 1a76625f 2018-10-22 stsp if (errcode)
2815 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2816 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2817 1a76625f 2018-10-22 stsp s->thread = NULL;
2820 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2821 1d0f4054 2021-06-17 stsp err = got_repo_close(s->thread_args.repo);
2822 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2825 74467cc8 2022-06-15 stsp if (s->thread_args.pack_fds) {
2826 74467cc8 2022-06-15 stsp const struct got_error *pack_err =
2827 74467cc8 2022-06-15 stsp got_repo_pack_fds_close(s->thread_args.pack_fds);
2828 74467cc8 2022-06-15 stsp if (err == NULL)
2829 74467cc8 2022-06-15 stsp err = pack_err;
2830 74467cc8 2022-06-15 stsp s->thread_args.pack_fds = NULL;
2833 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2834 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2835 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2838 5629093a 2022-07-11 stsp return err ? err : thread_err;
2841 9343a5fb 2018-06-23 stsp static const struct got_error *
2842 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2844 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2845 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2846 276b94a1 2020-11-13 naddy int errcode;
2848 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2850 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2851 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2852 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2854 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.commit_loaded);
2855 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2856 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2858 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2859 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2860 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2861 1a76625f 2018-10-22 stsp free(s->start_id);
2862 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2863 9cd7cbd1 2020-12-07 stsp free(s->head_ref_name);
2864 9cd7cbd1 2020-12-07 stsp s->head_ref_name = NULL;
2865 1a76625f 2018-10-22 stsp return err;
2868 1a76625f 2018-10-22 stsp static const struct got_error *
2869 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2871 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2873 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2874 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2875 60493ae3 2019-06-20 stsp return NULL;
2878 60493ae3 2019-06-20 stsp static const struct got_error *
2879 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2881 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2882 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2883 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2885 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2886 f9686aa5 2020-03-27 stsp show_log_view(view);
2887 f9686aa5 2020-03-27 stsp update_panels();
2888 f9686aa5 2020-03-27 stsp doupdate();
2890 96e2b566 2019-07-08 stsp if (s->search_entry) {
2891 13add988 2019-10-15 stsp int errcode, ch;
2892 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2893 13add988 2019-10-15 stsp if (errcode)
2894 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2895 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2896 13add988 2019-10-15 stsp ch = wgetch(view->window);
2897 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2898 13add988 2019-10-15 stsp if (errcode)
2899 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2900 13add988 2019-10-15 stsp "pthread_mutex_lock");
2901 a6d37fac 2022-07-03 mark if (ch == CTRL('g') || ch == KEY_BACKSPACE) {
2902 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2903 678cbce5 2019-07-28 stsp return NULL;
2905 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2906 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2908 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2909 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2910 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2911 364ac6fd 2022-06-18 stsp int matched_idx = s->matched_entry->idx;
2912 364ac6fd 2022-06-18 stsp int selected_idx = s->selected_entry->idx;
2915 f704b35c 2022-06-18 stsp * If the user has moved the cursor after we hit a match,
2916 f704b35c 2022-06-18 stsp * the position from where we should continue searching
2917 f704b35c 2022-06-18 stsp * might have changed.
2919 4bfe9f0a 2022-06-18 stsp if (view->searching == TOG_SEARCH_FORWARD) {
2920 364ac6fd 2022-06-18 stsp if (matched_idx > selected_idx)
2921 364ac6fd 2022-06-18 stsp entry = TAILQ_NEXT(s->selected_entry, entry);
2923 364ac6fd 2022-06-18 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2925 364ac6fd 2022-06-18 stsp if (matched_idx < selected_idx)
2926 364ac6fd 2022-06-18 stsp entry = TAILQ_PREV(s->selected_entry,
2927 364ac6fd 2022-06-18 stsp commit_queue_head, entry);
2929 364ac6fd 2022-06-18 stsp entry = TAILQ_PREV(s->matched_entry,
2930 364ac6fd 2022-06-18 stsp commit_queue_head, entry);
2933 5a5ede53 2021-12-09 stsp entry = s->selected_entry;
2936 60493ae3 2019-06-20 stsp while (1) {
2937 13add988 2019-10-15 stsp int have_match = 0;
2939 60493ae3 2019-06-20 stsp if (entry == NULL) {
2940 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2941 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2942 f9967bca 2020-03-27 stsp view->search_next_done =
2943 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2944 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2945 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2946 f801134a 2019-06-25 stsp return NULL;
2949 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2950 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2951 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2953 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2954 ffe38506 2020-12-01 naddy return trigger_log_thread(view, 0);
2957 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2958 13add988 2019-10-15 stsp &view->regex);
2961 13add988 2019-10-15 stsp if (have_match) {
2962 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2963 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2967 96e2b566 2019-07-08 stsp s->search_entry = entry;
2968 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2969 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2971 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2974 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2975 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2976 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2977 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_DOWN);
2979 60493ae3 2019-06-20 stsp return err;
2982 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2983 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_UP);
2985 60493ae3 2019-06-20 stsp return err;
2990 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2992 60493ae3 2019-06-20 stsp return NULL;
2995 60493ae3 2019-06-20 stsp static const struct got_error *
2996 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2997 78756c87 2020-11-24 stsp struct got_repository *repo, const char *head_ref_name,
2998 78756c87 2020-11-24 stsp const char *in_repo_path, int log_branches)
3000 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
3001 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
3002 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
3003 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
3004 1a76625f 2018-10-22 stsp int errcode;
3006 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
3007 f135c941 2020-02-20 stsp free(s->in_repo_path);
3008 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
3009 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
3010 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
3013 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
3014 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
3015 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
3017 fb2756b9 2018-08-04 stsp s->repo = repo;
3018 9cd7cbd1 2020-12-07 stsp if (head_ref_name) {
3019 9cd7cbd1 2020-12-07 stsp s->head_ref_name = strdup(head_ref_name);
3020 9cd7cbd1 2020-12-07 stsp if (s->head_ref_name == NULL) {
3021 9cd7cbd1 2020-12-07 stsp err = got_error_from_errno("strdup");
3022 9cd7cbd1 2020-12-07 stsp goto done;
3025 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
3026 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
3027 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3028 5036bf37 2018-09-24 stsp goto done;
3030 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
3032 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
3033 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3034 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
3035 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
3037 11b20872 2019-11-08 stsp goto done;
3038 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
3039 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3040 11b20872 2019-11-08 stsp if (err) {
3041 11b20872 2019-11-08 stsp free_colors(&s->colors);
3042 11b20872 2019-11-08 stsp goto done;
3044 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
3045 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3046 11b20872 2019-11-08 stsp if (err) {
3047 11b20872 2019-11-08 stsp free_colors(&s->colors);
3048 11b20872 2019-11-08 stsp goto done;
3052 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
3053 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
3054 571ccd73 2022-07-19 mark view->resize = resize_log_view;
3055 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
3056 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
3057 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
3059 74467cc8 2022-06-15 stsp if (s->thread_args.pack_fds == NULL) {
3060 74467cc8 2022-06-15 stsp err = got_repo_pack_fds_open(&s->thread_args.pack_fds);
3062 74467cc8 2022-06-15 stsp goto done;
3064 0ae84acc 2022-06-15 tracey err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL,
3065 74467cc8 2022-06-15 stsp s->thread_args.pack_fds);
3066 0ae84acc 2022-06-15 tracey if (err)
3067 0ae84acc 2022-06-15 tracey goto done;
3068 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
3069 b672a97a 2020-01-27 stsp !s->log_branches);
3071 1a76625f 2018-10-22 stsp goto done;
3072 62d463ca 2020-10-20 naddy err = got_commit_graph_iter_start(thread_graph, s->start_id,
3073 62d463ca 2020-10-20 naddy s->repo, NULL, NULL);
3075 c5b78334 2020-01-12 stsp goto done;
3077 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
3078 1a76625f 2018-10-22 stsp if (errcode) {
3079 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
3080 1a76625f 2018-10-22 stsp goto done;
3082 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
3083 7c1452c1 2020-03-26 stsp if (errcode) {
3084 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
3085 7c1452c1 2020-03-26 stsp goto done;
3088 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
3089 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
3090 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
3091 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
3092 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
3093 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
3094 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
3095 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
3096 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
3097 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
3098 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
3099 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
3100 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
3103 1a76625f 2018-10-22 stsp close_log_view(view);
3104 ba4f502b 2018-08-04 stsp return err;
3107 e5a0f69f 2018-08-18 stsp static const struct got_error *
3108 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
3110 f2f6d207 2020-11-24 stsp const struct got_error *err;
3111 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
3113 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
3114 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
3115 2b380cc8 2018-10-24 stsp &s->thread_args);
3116 2b380cc8 2018-10-24 stsp if (errcode)
3117 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
3118 f2f6d207 2020-11-24 stsp if (s->thread_args.commits_needed > 0) {
3119 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
3121 f2f6d207 2020-11-24 stsp return err;
3125 8fdc79fe 2020-12-01 naddy return draw_commits(view);
3128 b880cc75 2022-06-30 mark static void
3129 b880cc75 2022-06-30 mark log_move_cursor_up(struct tog_view *view, int page, int home)
3131 b880cc75 2022-06-30 mark struct tog_log_view_state *s = &view->state.log;
3133 b880cc75 2022-06-30 mark if (s->selected_entry->idx == 0)
3134 b880cc75 2022-06-30 mark view->count = 0;
3135 b880cc75 2022-06-30 mark if (s->first_displayed_entry == NULL)
3138 b880cc75 2022-06-30 mark if ((page && TAILQ_FIRST(&s->commits.head) == s->first_displayed_entry)
3140 b880cc75 2022-06-30 mark s->selected = home ? 0 : MAX(0, s->selected - page - 1);
3142 b880cc75 2022-06-30 mark if (!page && !home && s->selected > 0)
3143 b880cc75 2022-06-30 mark --s->selected;
3145 b880cc75 2022-06-30 mark log_scroll_up(s, home ? s->commits.ncommits : MAX(page, 1));
3147 b880cc75 2022-06-30 mark select_commit(s);
3151 b880cc75 2022-06-30 mark static const struct got_error *
3152 b880cc75 2022-06-30 mark log_move_cursor_down(struct tog_view *view, int page)
3154 b880cc75 2022-06-30 mark struct tog_log_view_state *s = &view->state.log;
3155 b880cc75 2022-06-30 mark struct commit_queue_entry *first;
3156 b880cc75 2022-06-30 mark const struct got_error *err = NULL;
3158 b880cc75 2022-06-30 mark first = s->first_displayed_entry;
3159 b880cc75 2022-06-30 mark if (first == NULL) {
3160 b880cc75 2022-06-30 mark view->count = 0;
3161 b880cc75 2022-06-30 mark return NULL;
3164 b880cc75 2022-06-30 mark if (s->thread_args.log_complete &&
3165 b880cc75 2022-06-30 mark s->selected_entry->idx >= s->commits.ncommits - 1)
3166 b880cc75 2022-06-30 mark return NULL;
3168 b880cc75 2022-06-30 mark if (!page) {
3169 b880cc75 2022-06-30 mark int eos = view->nlines - 2;
3171 49b24ee5 2022-07-03 mark if (view_is_hsplit_top(view))
3172 9b058f45 2022-06-30 mark --eos; /* border consumes the last line */
3173 b880cc75 2022-06-30 mark if (s->selected < MIN(eos, s->commits.ncommits - 1))
3174 b880cc75 2022-06-30 mark ++s->selected;
3176 b880cc75 2022-06-30 mark err = log_scroll_down(view, 1);
3177 0dca135e 2022-06-30 mark } else if (s->thread_args.load_all) {
3178 b880cc75 2022-06-30 mark if (s->last_displayed_entry->idx == s->commits.ncommits - 1)
3179 b880cc75 2022-06-30 mark s->selected += MIN(s->last_displayed_entry->idx -
3180 b880cc75 2022-06-30 mark s->selected_entry->idx, page + 1);
3182 b880cc75 2022-06-30 mark err = log_scroll_down(view, MIN(page,
3183 b880cc75 2022-06-30 mark s->commits.ncommits - s->selected_entry->idx - 1));
3184 b880cc75 2022-06-30 mark s->selected = MIN(view->nlines - 2, s->commits.ncommits - 1);
3186 b880cc75 2022-06-30 mark err = log_scroll_down(view, page);
3188 b880cc75 2022-06-30 mark return err;
3189 b880cc75 2022-06-30 mark if (first == s->first_displayed_entry && s->selected <
3190 b880cc75 2022-06-30 mark MIN(view->nlines - 2, s->commits.ncommits - 1)) {
3191 b880cc75 2022-06-30 mark s->selected = MIN(s->commits.ncommits - 1, page);
3195 b880cc75 2022-06-30 mark return err;
3198 9b058f45 2022-06-30 mark * We might necessarily overshoot in horizontal
3199 9b058f45 2022-06-30 mark * splits; if so, select the last displayed commit.
3201 9b058f45 2022-06-30 mark s->selected = MIN(s->selected,
3202 9b058f45 2022-06-30 mark s->last_displayed_entry->idx - s->first_displayed_entry->idx);
3204 b880cc75 2022-06-30 mark select_commit(s);
3206 b880cc75 2022-06-30 mark if (s->thread_args.log_complete &&
3207 b880cc75 2022-06-30 mark s->selected_entry->idx == s->commits.ncommits - 1)
3208 b880cc75 2022-06-30 mark view->count = 0;
3210 b880cc75 2022-06-30 mark return NULL;
3213 9b058f45 2022-06-30 mark static void
3214 9b058f45 2022-06-30 mark view_get_split(struct tog_view *view, int *y, int *x)
3219 3c1dfe12 2022-07-08 mark if (view->mode == TOG_VIEW_SPLIT_HRZN) {
3220 3c1dfe12 2022-07-08 mark if (view->child && view->child->resized_y)
3221 3c1dfe12 2022-07-08 mark *y = view->child->resized_y;
3222 7532ccda 2022-07-11 mark else if (view->resized_y)
3223 7532ccda 2022-07-11 mark *y = view->resized_y;
3225 3c1dfe12 2022-07-08 mark *y = view_split_begin_y(view->lines);
3226 7532ccda 2022-07-11 mark } else if (view->mode == TOG_VIEW_SPLIT_VERT) {
3227 3c1dfe12 2022-07-08 mark if (view->child && view->child->resized_x)
3228 3c1dfe12 2022-07-08 mark *x = view->child->resized_x;
3229 7532ccda 2022-07-11 mark else if (view->resized_x)
3230 7532ccda 2022-07-11 mark *x = view->resized_x;
3232 3c1dfe12 2022-07-08 mark *x = view_split_begin_x(view->begin_x);
3236 9b058f45 2022-06-30 mark /* Split view horizontally at y and offset view->state->selected line. */
3237 e5a0f69f 2018-08-18 stsp static const struct got_error *
3238 9b058f45 2022-06-30 mark view_init_hsplit(struct tog_view *view, int y)
3240 9b058f45 2022-06-30 mark const struct got_error *err = NULL;
3242 9b058f45 2022-06-30 mark view->nlines = y;
3243 d2366e29 2022-07-07 mark view->ncols = COLS;
3244 9b058f45 2022-06-30 mark err = view_resize(view);
3246 9b058f45 2022-06-30 mark return err;
3248 9b058f45 2022-06-30 mark err = offset_selection_down(view);
3250 9b058f45 2022-06-30 mark return err;
3253 9b058f45 2022-06-30 mark static const struct got_error *
3254 e78dc838 2020-12-04 stsp input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
3256 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3257 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
3258 f3bc9f1d 2021-09-05 naddy struct commit_queue_entry *entry;
3259 136e2bd4 2022-07-23 mark int eos, n, nscroll;
3261 528dedf3 2021-08-30 stsp if (s->thread_args.load_all) {
3262 a6d37fac 2022-07-03 mark if (ch == CTRL('g') || ch == KEY_BACKSPACE)
3263 fb280deb 2021-08-30 stsp s->thread_args.load_all = 0;
3264 528dedf3 2021-08-30 stsp else if (s->thread_args.log_complete) {
3265 b880cc75 2022-06-30 mark err = log_move_cursor_down(view, s->commits.ncommits);
3266 0dca135e 2022-06-30 mark s->thread_args.load_all = 0;
3268 b880cc75 2022-06-30 mark return err;
3271 0dca135e 2022-06-30 mark eos = nscroll = view->nlines - 1;
3272 49b24ee5 2022-07-03 mark if (view_is_hsplit_top(view))
3273 0dca135e 2022-06-30 mark --eos; /* border */
3275 528dedf3 2021-08-30 stsp switch (ch) {
3277 1e37a5c2 2019-05-12 jcs s->quit = 1;
3280 145b6838 2022-06-16 stsp view->x = 0;
3283 145b6838 2022-06-16 stsp view->x = MAX(view->maxx - view->ncols / 2, 0);
3284 640cd7ff 2022-06-22 mark view->count = 0;
3286 145b6838 2022-06-16 stsp case KEY_RIGHT:
3288 145b6838 2022-06-16 stsp if (view->x + view->ncols / 2 < view->maxx)
3289 145b6838 2022-06-16 stsp view->x += 2; /* move two columns right */
3291 640cd7ff 2022-06-22 mark view->count = 0;
3293 145b6838 2022-06-16 stsp case KEY_LEFT:
3295 145b6838 2022-06-16 stsp view->x -= MIN(view->x, 2); /* move two columns back */
3296 640cd7ff 2022-06-22 mark if (view->x <= 0)
3297 640cd7ff 2022-06-22 mark view->count = 0;
3300 1e37a5c2 2019-05-12 jcs case KEY_UP:
3303 02ffd0d5 2021-10-17 stsp case CTRL('p'):
3304 b880cc75 2022-06-30 mark log_move_cursor_up(view, 0, 0);
3307 912a3f79 2021-08-30 j case KEY_HOME:
3308 b880cc75 2022-06-30 mark log_move_cursor_up(view, 0, 1);
3309 640cd7ff 2022-06-22 mark view->count = 0;
3311 83cc4199 2022-06-13 stsp case CTRL('u'):
3313 83cc4199 2022-06-13 stsp nscroll /= 2;
3314 83cc4199 2022-06-13 stsp /* FALL THROUGH */
3315 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3316 a4292ac5 2019-05-12 jcs case CTRL('b'):
3318 b880cc75 2022-06-30 mark log_move_cursor_up(view, nscroll, 0);
3321 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3324 02ffd0d5 2021-10-17 stsp case CTRL('n'):
3325 b880cc75 2022-06-30 mark err = log_move_cursor_down(view, 0);
3328 10aab77f 2022-07-19 op s->use_committer = !s->use_committer;
3331 912a3f79 2021-08-30 j case KEY_END: {
3332 912a3f79 2021-08-30 j /* We don't know yet how many commits, so we're forced to
3333 912a3f79 2021-08-30 j * traverse them all. */
3334 640cd7ff 2022-06-22 mark view->count = 0;
3335 fb280deb 2021-08-30 stsp if (!s->thread_args.log_complete) {
3336 fb280deb 2021-08-30 stsp s->thread_args.load_all = 1;
3337 fb280deb 2021-08-30 stsp return trigger_log_thread(view, 0);
3340 f3bc9f1d 2021-09-05 naddy s->selected = 0;
3341 f3bc9f1d 2021-09-05 naddy entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
3342 0dca135e 2022-06-30 mark for (n = 0; n < eos; n++) {
3343 f3bc9f1d 2021-09-05 naddy if (entry == NULL)
3345 f3bc9f1d 2021-09-05 naddy s->first_displayed_entry = entry;
3346 f3bc9f1d 2021-09-05 naddy entry = TAILQ_PREV(entry, commit_queue_head, entry);
3348 f3bc9f1d 2021-09-05 naddy if (n > 0)
3349 f3bc9f1d 2021-09-05 naddy s->selected = n - 1;
3350 2b779855 2020-12-05 naddy select_commit(s);
3353 80b7e8da 2022-06-11 stsp case CTRL('d'):
3355 83cc4199 2022-06-13 stsp nscroll /= 2;
3356 83cc4199 2022-06-13 stsp /* FALL THROUGH */
3357 83cc4199 2022-06-13 stsp case KEY_NPAGE:
3358 61417565 2022-06-20 mark case CTRL('f'):
3359 48bb96f0 2022-06-20 naddy case 'f':
3361 b880cc75 2022-06-30 mark err = log_move_cursor_down(view, nscroll);
3363 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
3364 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
3365 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
3366 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
3367 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
3368 2b779855 2020-12-05 naddy select_commit(s);
3369 0bf7f153 2020-12-02 naddy if (s->commits.ncommits < view->nlines - 1 &&
3370 0bf7f153 2020-12-02 naddy !s->thread_args.log_complete) {
3371 0bf7f153 2020-12-02 naddy s->thread_args.commits_needed += (view->nlines - 1) -
3372 0bf7f153 2020-12-02 naddy s->commits.ncommits;
3373 0bf7f153 2020-12-02 naddy err = trigger_log_thread(view, 1);
3376 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
3377 49b24ee5 2022-07-03 mark case '\r':
3378 640cd7ff 2022-06-22 mark view->count = 0;
3379 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
3381 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_DIFF);
3384 640cd7ff 2022-06-22 mark view->count = 0;
3385 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
3387 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_TREE);
3389 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
3390 21355643 2020-12-06 stsp case CTRL('l'):
3392 640cd7ff 2022-06-22 mark view->count = 0;
3393 21355643 2020-12-06 stsp if (ch == KEY_BACKSPACE &&
3394 21355643 2020-12-06 stsp got_path_is_root_dir(s->in_repo_path))
3396 21355643 2020-12-06 stsp err = stop_log_thread(s);
3398 74cfe85e 2020-10-20 stsp return err;
3399 21355643 2020-12-06 stsp if (ch == KEY_BACKSPACE) {
3400 21355643 2020-12-06 stsp char *parent_path;
3401 21355643 2020-12-06 stsp err = got_path_dirname(&parent_path, s->in_repo_path);
3403 21355643 2020-12-06 stsp return err;
3404 21355643 2020-12-06 stsp free(s->in_repo_path);
3405 21355643 2020-12-06 stsp s->in_repo_path = parent_path;
3406 21355643 2020-12-06 stsp s->thread_args.in_repo_path = s->in_repo_path;
3407 21355643 2020-12-06 stsp } else if (ch == CTRL('l')) {
3408 21355643 2020-12-06 stsp struct got_object_id *start_id;
3409 21355643 2020-12-06 stsp err = got_repo_match_object_id(&start_id, NULL,
3410 21355643 2020-12-06 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
3411 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_COMMIT, &tog_refs, s->repo);
3413 21355643 2020-12-06 stsp return err;
3414 21355643 2020-12-06 stsp free(s->start_id);
3415 21355643 2020-12-06 stsp s->start_id = start_id;
3416 21355643 2020-12-06 stsp s->thread_args.start_id = s->start_id;
3417 21355643 2020-12-06 stsp } else /* 'B' */
3418 21355643 2020-12-06 stsp s->log_branches = !s->log_branches;
3420 b0dd8d27 2022-06-16 stsp if (s->thread_args.pack_fds == NULL) {
3421 b0dd8d27 2022-06-16 stsp err = got_repo_pack_fds_open(&s->thread_args.pack_fds);
3423 b0dd8d27 2022-06-16 stsp return err;
3425 74467cc8 2022-06-15 stsp err = got_repo_open(&s->thread_args.repo,
3426 74467cc8 2022-06-15 stsp got_repo_get_path(s->repo), NULL,
3427 74467cc8 2022-06-15 stsp s->thread_args.pack_fds);
3429 21355643 2020-12-06 stsp return err;
3430 51a10b52 2020-12-26 stsp tog_free_refs();
3431 7f66531d 2021-11-16 stsp err = tog_load_refs(s->repo, 0);
3433 ca51c541 2020-12-07 stsp return err;
3434 21355643 2020-12-06 stsp err = got_commit_graph_open(&s->thread_args.graph,
3435 21355643 2020-12-06 stsp s->in_repo_path, !s->log_branches);
3437 d01904d4 2019-06-25 stsp return err;
3438 21355643 2020-12-06 stsp err = got_commit_graph_iter_start(s->thread_args.graph,
3439 21355643 2020-12-06 stsp s->start_id, s->repo, NULL, NULL);
3441 b672a97a 2020-01-27 stsp return err;
3442 21355643 2020-12-06 stsp free_commits(&s->commits);
3443 21355643 2020-12-06 stsp s->first_displayed_entry = NULL;
3444 21355643 2020-12-06 stsp s->last_displayed_entry = NULL;
3445 21355643 2020-12-06 stsp s->selected_entry = NULL;
3446 21355643 2020-12-06 stsp s->selected = 0;
3447 21355643 2020-12-06 stsp s->thread_args.log_complete = 0;
3448 21355643 2020-12-06 stsp s->quit = 0;
3449 9b058f45 2022-06-30 mark s->thread_args.commits_needed = view->lines;
3450 dfee752e 2022-06-18 op s->matched_entry = NULL;
3451 dfee752e 2022-06-18 op s->search_entry = NULL;
3452 01a7bcaf 2022-07-22 mark view->offset = 0;
3455 640cd7ff 2022-06-22 mark view->count = 0;
3456 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_REF);
3459 640cd7ff 2022-06-22 mark view->count = 0;
3463 80ddbec8 2018-04-29 stsp return err;
3466 4ed7e80c 2018-05-20 stsp static const struct got_error *
3467 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
3469 c2db6724 2019-01-04 stsp const struct got_error *error;
3471 37c06ea4 2019-07-15 stsp #ifdef PROFILE
3472 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
3473 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
3475 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
3476 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
3478 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
3479 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
3481 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
3482 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
3484 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
3485 c2db6724 2019-01-04 stsp if (error != NULL)
3486 c2db6724 2019-01-04 stsp return error;
3488 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
3489 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
3491 c2db6724 2019-01-04 stsp return NULL;
3494 a915003a 2019-02-05 stsp static void
3495 a915003a 2019-02-05 stsp init_curses(void)
3498 2497f032 2022-05-31 stsp * Override default signal handlers before starting ncurses.
3499 2497f032 2022-05-31 stsp * This should prevent ncurses from installing its own
3500 2497f032 2022-05-31 stsp * broken cleanup() signal handler.
3502 2497f032 2022-05-31 stsp signal(SIGWINCH, tog_sigwinch);
3503 2497f032 2022-05-31 stsp signal(SIGPIPE, tog_sigpipe);
3504 2497f032 2022-05-31 stsp signal(SIGCONT, tog_sigcont);
3505 2497f032 2022-05-31 stsp signal(SIGINT, tog_sigint);
3506 2497f032 2022-05-31 stsp signal(SIGTERM, tog_sigterm);
3508 a915003a 2019-02-05 stsp initscr();
3510 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
3513 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
3514 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
3515 a915003a 2019-02-05 stsp curs_set(0);
3516 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
3517 6d17833f 2019-11-08 stsp start_color();
3518 6d17833f 2019-11-08 stsp use_default_colors();
3522 c2db6724 2019-01-04 stsp static const struct got_error *
3523 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
3524 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
3526 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
3528 f135c941 2020-02-20 stsp if (argc == 0) {
3529 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
3530 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
3531 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
3532 f135c941 2020-02-20 stsp return NULL;
3535 f135c941 2020-02-20 stsp if (worktree) {
3536 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3539 bfd61697 2020-11-14 stsp err = got_worktree_resolve_path(&p, worktree, argv[0]);
3541 f135c941 2020-02-20 stsp return err;
3542 bfd61697 2020-11-14 stsp if (asprintf(in_repo_path, "%s%s%s", prefix,
3543 bfd61697 2020-11-14 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
3544 bfd61697 2020-11-14 stsp p) == -1) {
3545 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
3546 bfd61697 2020-11-14 stsp *in_repo_path = NULL;
3550 8fa913ec 2020-11-14 stsp err = got_repo_map_path(in_repo_path, repo, argv[0]);
3552 f135c941 2020-02-20 stsp return err;
3555 f135c941 2020-02-20 stsp static const struct got_error *
3556 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
3558 80ddbec8 2018-04-29 stsp const struct got_error *error;
3559 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
3560 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
3561 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
3562 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
3563 d8f38dc4 2020-12-05 stsp char *start_commit = NULL, *label = NULL;
3564 d8f38dc4 2020-12-05 stsp struct got_reference *ref = NULL;
3565 d8f38dc4 2020-12-05 stsp const char *head_ref_name = NULL;
3566 f135c941 2020-02-20 stsp int ch, log_branches = 0;
3567 04cc582a 2018-08-01 stsp struct tog_view *view;
3568 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
3570 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
3571 80ddbec8 2018-04-29 stsp switch (ch) {
3573 b672a97a 2020-01-27 stsp log_branches = 1;
3576 80ddbec8 2018-04-29 stsp start_commit = optarg;
3579 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
3580 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
3581 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
3585 17020d27 2019-03-07 stsp usage_log();
3586 80ddbec8 2018-04-29 stsp /* NOTREACHED */
3590 80ddbec8 2018-04-29 stsp argc -= optind;
3591 80ddbec8 2018-04-29 stsp argv += optind;
3593 f135c941 2020-02-20 stsp if (argc > 1)
3594 f135c941 2020-02-20 stsp usage_log();
3596 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
3597 0ae84acc 2022-06-15 tracey if (error != NULL)
3598 0ae84acc 2022-06-15 tracey goto done;
3600 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
3601 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
3602 c156c7a4 2020-12-18 stsp if (cwd == NULL)
3603 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
3604 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
3605 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3606 c156c7a4 2020-12-18 stsp goto done;
3607 a1fbf39a 2019-08-11 stsp if (worktree)
3608 6962eb72 2020-02-20 stsp repo_path =
3609 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
3611 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
3612 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
3613 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
3614 c156c7a4 2020-12-18 stsp goto done;
3618 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3619 80ddbec8 2018-04-29 stsp if (error != NULL)
3620 ecb28ae0 2018-07-16 stsp goto done;
3622 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
3623 f135c941 2020-02-20 stsp repo, worktree);
3624 f135c941 2020-02-20 stsp if (error)
3625 f135c941 2020-02-20 stsp goto done;
3627 f135c941 2020-02-20 stsp init_curses();
3629 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
3630 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3631 c02c541e 2019-03-29 stsp if (error)
3632 c02c541e 2019-03-29 stsp goto done;
3634 87670572 2020-12-26 naddy /* already loaded by tog_log_with_path()? */
3635 d9dff0e5 2020-12-26 stsp if (TAILQ_EMPTY(&tog_refs)) {
3636 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
3637 87670572 2020-12-26 naddy if (error)
3638 87670572 2020-12-26 naddy goto done;
3641 d8f38dc4 2020-12-05 stsp if (start_commit == NULL) {
3642 d8f38dc4 2020-12-05 stsp error = got_repo_match_object_id(&start_id, &label,
3643 d8f38dc4 2020-12-05 stsp worktree ? got_worktree_get_head_ref_name(worktree) :
3644 84de9106 2020-12-26 stsp GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
3645 d8f38dc4 2020-12-05 stsp if (error)
3646 d8f38dc4 2020-12-05 stsp goto done;
3647 d8f38dc4 2020-12-05 stsp head_ref_name = label;
3649 d8f38dc4 2020-12-05 stsp error = got_ref_open(&ref, repo, start_commit, 0);
3650 d8f38dc4 2020-12-05 stsp if (error == NULL)
3651 d8f38dc4 2020-12-05 stsp head_ref_name = got_ref_get_name(ref);
3652 d8f38dc4 2020-12-05 stsp else if (error->code != GOT_ERR_NOT_REF)
3653 d8f38dc4 2020-12-05 stsp goto done;
3654 d8f38dc4 2020-12-05 stsp error = got_repo_match_object_id(&start_id, NULL,
3655 84de9106 2020-12-26 stsp start_commit, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
3656 d8f38dc4 2020-12-05 stsp if (error)
3657 d8f38dc4 2020-12-05 stsp goto done;
3660 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
3661 04cc582a 2018-08-01 stsp if (view == NULL) {
3662 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3663 04cc582a 2018-08-01 stsp goto done;
3665 78756c87 2020-11-24 stsp error = open_log_view(view, start_id, repo, head_ref_name,
3666 f135c941 2020-02-20 stsp in_repo_path, log_branches);
3667 ba4f502b 2018-08-04 stsp if (error)
3668 ba4f502b 2018-08-04 stsp goto done;
3669 2fc00ff4 2019-08-31 stsp if (worktree) {
3670 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
3671 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
3672 2fc00ff4 2019-08-31 stsp worktree = NULL;
3674 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3676 f135c941 2020-02-20 stsp free(in_repo_path);
3677 ecb28ae0 2018-07-16 stsp free(repo_path);
3678 ecb28ae0 2018-07-16 stsp free(cwd);
3679 899d86c2 2018-05-10 stsp free(start_id);
3680 d8f38dc4 2020-12-05 stsp free(label);
3682 d8f38dc4 2020-12-05 stsp got_ref_close(ref);
3683 1d0f4054 2021-06-17 stsp if (repo) {
3684 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
3685 1d0f4054 2021-06-17 stsp if (error == NULL)
3686 1d0f4054 2021-06-17 stsp error = close_err;
3688 ec142235 2019-03-07 stsp if (worktree)
3689 ec142235 2019-03-07 stsp got_worktree_close(worktree);
3690 0ae84acc 2022-06-15 tracey if (pack_fds) {
3691 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
3692 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
3693 0ae84acc 2022-06-15 tracey if (error == NULL)
3694 0ae84acc 2022-06-15 tracey error = pack_err;
3696 51a10b52 2020-12-26 stsp tog_free_refs();
3697 80ddbec8 2018-04-29 stsp return error;
3700 4ed7e80c 2018-05-20 stsp __dead static void
3701 9f7d7167 2018-04-29 stsp usage_diff(void)
3704 3dbaef42 2020-11-24 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
3705 3dbaef42 2020-11-24 stsp "[-w] object1 object2\n", getprogname());
3709 6d17833f 2019-11-08 stsp static int
3710 41605754 2020-11-12 stsp match_line(const char *line, regex_t *regex, size_t nmatch,
3711 41605754 2020-11-12 stsp regmatch_t *regmatch)
3713 41605754 2020-11-12 stsp return regexec(regex, line, nmatch, regmatch, 0) == 0;
3716 336075a4 2022-06-25 op static struct tog_color *
3717 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
3719 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
3721 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(tc, colors, entry) {
3722 41605754 2020-11-12 stsp if (match_line(line, &tc->regex, 0, NULL))
3723 6d17833f 2019-11-08 stsp return tc;
3726 6d17833f 2019-11-08 stsp return NULL;
3729 4ed7e80c 2018-05-20 stsp static const struct got_error *
3730 41605754 2020-11-12 stsp add_matched_line(int *wtotal, const char *line, int wlimit, int col_tab_align,
3731 1853e0f4 2022-06-16 stsp WINDOW *window, int skipcol, regmatch_t *regmatch)
3733 41605754 2020-11-12 stsp const struct got_error *err = NULL;
3734 44a87665 2022-06-16 stsp char *exstr = NULL;
3735 1853e0f4 2022-06-16 stsp wchar_t *wline = NULL;
3736 1853e0f4 2022-06-16 stsp int rme, rms, n, width, scrollx;
3737 1853e0f4 2022-06-16 stsp int width0 = 0, width1 = 0, width2 = 0;
3738 1853e0f4 2022-06-16 stsp char *seg0 = NULL, *seg1 = NULL, *seg2 = NULL;
3740 41605754 2020-11-12 stsp *wtotal = 0;
3742 145b6838 2022-06-16 stsp rms = regmatch->rm_so;
3743 145b6838 2022-06-16 stsp rme = regmatch->rm_eo;
3745 44a87665 2022-06-16 stsp err = expand_tab(&exstr, line);
3747 44a87665 2022-06-16 stsp return err;
3749 1853e0f4 2022-06-16 stsp /* Split the line into 3 segments, according to match offsets. */
3750 44a87665 2022-06-16 stsp seg0 = strndup(exstr, rms);
3751 44a87665 2022-06-16 stsp if (seg0 == NULL) {
3752 44a87665 2022-06-16 stsp err = got_error_from_errno("strndup");
3753 44a87665 2022-06-16 stsp goto done;
3755 44a87665 2022-06-16 stsp seg1 = strndup(exstr + rms, rme - rms);
3756 1853e0f4 2022-06-16 stsp if (seg1 == NULL) {
3757 1853e0f4 2022-06-16 stsp err = got_error_from_errno("strndup");
3758 1853e0f4 2022-06-16 stsp goto done;
3760 44a87665 2022-06-16 stsp seg2 = strdup(exstr + rme);
3761 95d136ac 2022-06-16 stsp if (seg2 == NULL) {
3762 1853e0f4 2022-06-16 stsp err = got_error_from_errno("strndup");
3763 1853e0f4 2022-06-16 stsp goto done;
3766 145b6838 2022-06-16 stsp /* draw up to matched token if we haven't scrolled past it */
3767 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width0, NULL, seg0, 0, wlimit,
3768 1853e0f4 2022-06-16 stsp col_tab_align, 1);
3770 1853e0f4 2022-06-16 stsp goto done;
3771 1853e0f4 2022-06-16 stsp n = MAX(width0 - skipcol, 0);
3773 1853e0f4 2022-06-16 stsp free(wline);
3774 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width, &scrollx, seg0, skipcol,
3775 1853e0f4 2022-06-16 stsp wlimit, col_tab_align, 1);
3777 1853e0f4 2022-06-16 stsp goto done;
3778 1853e0f4 2022-06-16 stsp waddwstr(window, &wline[scrollx]);
3779 1853e0f4 2022-06-16 stsp wlimit -= width;
3780 1853e0f4 2022-06-16 stsp *wtotal += width;
3783 41605754 2020-11-12 stsp if (wlimit > 0) {
3784 1853e0f4 2022-06-16 stsp int i = 0, w = 0;
3785 1853e0f4 2022-06-16 stsp size_t wlen;
3787 1853e0f4 2022-06-16 stsp free(wline);
3788 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width1, NULL, seg1, 0, wlimit,
3789 1853e0f4 2022-06-16 stsp col_tab_align, 1);
3791 1853e0f4 2022-06-16 stsp goto done;
3792 1853e0f4 2022-06-16 stsp wlen = wcslen(wline);
3793 1853e0f4 2022-06-16 stsp while (i < wlen) {
3794 1853e0f4 2022-06-16 stsp width = wcwidth(wline[i]);
3795 1853e0f4 2022-06-16 stsp if (width == -1) {
3796 1853e0f4 2022-06-16 stsp /* should not happen, tabs are expanded */
3797 1853e0f4 2022-06-16 stsp err = got_error(GOT_ERR_RANGE);
3798 1853e0f4 2022-06-16 stsp goto done;
3800 1853e0f4 2022-06-16 stsp if (width0 + w + width > skipcol)
3802 61417565 2022-06-20 mark w += width;
3805 145b6838 2022-06-16 stsp /* draw (visible part of) matched token (if scrolled into it) */
3806 1853e0f4 2022-06-16 stsp if (width1 - w > 0) {
3807 145b6838 2022-06-16 stsp wattron(window, A_STANDOUT);
3808 1853e0f4 2022-06-16 stsp waddwstr(window, &wline[i]);
3809 145b6838 2022-06-16 stsp wattroff(window, A_STANDOUT);
3810 1853e0f4 2022-06-16 stsp wlimit -= (width1 - w);
3811 1853e0f4 2022-06-16 stsp *wtotal += (width1 - w);
3815 1853e0f4 2022-06-16 stsp if (wlimit > 0) { /* draw rest of line */
3816 1853e0f4 2022-06-16 stsp free(wline);
3817 1853e0f4 2022-06-16 stsp if (skipcol > width0 + width1) {
3818 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width2, &scrollx, seg2,
3819 1853e0f4 2022-06-16 stsp skipcol - (width0 + width1), wlimit,
3820 1853e0f4 2022-06-16 stsp col_tab_align, 1);
3822 1853e0f4 2022-06-16 stsp goto done;
3823 1853e0f4 2022-06-16 stsp waddwstr(window, &wline[scrollx]);
3825 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width2, NULL, seg2, 0,
3826 1853e0f4 2022-06-16 stsp wlimit, col_tab_align, 1);
3828 1853e0f4 2022-06-16 stsp goto done;
3829 1853e0f4 2022-06-16 stsp waddwstr(window, wline);
3831 1853e0f4 2022-06-16 stsp *wtotal += width2;
3834 145b6838 2022-06-16 stsp free(wline);
3835 44a87665 2022-06-16 stsp free(exstr);
3836 1853e0f4 2022-06-16 stsp free(seg0);
3837 1853e0f4 2022-06-16 stsp free(seg1);
3838 1853e0f4 2022-06-16 stsp free(seg2);
3839 1853e0f4 2022-06-16 stsp return err;
3842 41605754 2020-11-12 stsp static const struct got_error *
3843 89f1a395 2020-12-01 naddy draw_file(struct tog_view *view, const char *header)
3845 89f1a395 2020-12-01 naddy struct tog_diff_view_state *s = &view->state.diff;
3846 89f1a395 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
3847 61e69b96 2018-05-20 stsp const struct got_error *err;
3848 fe621944 2020-11-10 stsp int nprinted = 0;
3849 b304db33 2018-05-20 stsp char *line;
3850 826082fe 2020-12-10 stsp size_t linesize = 0;
3851 826082fe 2020-12-10 stsp ssize_t linelen;
3852 f26dddb7 2019-11-08 stsp struct tog_color *tc;
3853 61e69b96 2018-05-20 stsp wchar_t *wline;
3854 e0b650dd 2018-05-20 stsp int width;
3855 89f1a395 2020-12-01 naddy int max_lines = view->nlines;
3856 89f1a395 2020-12-01 naddy int nlines = s->nlines;
3857 fe621944 2020-11-10 stsp off_t line_offset;
3859 89f1a395 2020-12-01 naddy line_offset = s->line_offsets[s->first_displayed_line - 1];
3860 89f1a395 2020-12-01 naddy if (fseeko(s->f, line_offset, SEEK_SET) == -1)
3861 fe621944 2020-11-10 stsp return got_error_from_errno("fseek");
3863 f7d12f7e 2018-08-01 stsp werase(view->window);
3865 a3404814 2018-09-02 stsp if (header) {
3866 135a2da0 2020-11-11 stsp if (asprintf(&line, "[%d/%d] %s",
3867 89f1a395 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, nlines,
3868 135a2da0 2020-11-11 stsp header) == -1)
3869 135a2da0 2020-11-11 stsp return got_error_from_errno("asprintf");
3870 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols,
3872 135a2da0 2020-11-11 stsp free(line);
3874 a3404814 2018-09-02 stsp return err;
3876 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3877 a3404814 2018-09-02 stsp wstandout(view->window);
3878 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
3879 e54cc94a 2020-11-11 stsp free(wline);
3880 e54cc94a 2020-11-11 stsp wline = NULL;
3881 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3882 a3404814 2018-09-02 stsp wstandend(view->window);
3883 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
3884 a3404814 2018-09-02 stsp waddch(view->window, '\n');
3886 a3404814 2018-09-02 stsp if (max_lines <= 1)
3887 a3404814 2018-09-02 stsp return NULL;
3888 a3404814 2018-09-02 stsp max_lines--;
3891 89f1a395 2020-12-01 naddy s->eof = 0;
3892 145b6838 2022-06-16 stsp view->maxx = 0;
3893 826082fe 2020-12-10 stsp line = NULL;
3894 fe621944 2020-11-10 stsp while (max_lines > 0 && nprinted < max_lines) {
3895 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
3896 826082fe 2020-12-10 stsp if (linelen == -1) {
3897 826082fe 2020-12-10 stsp if (feof(s->f)) {
3898 826082fe 2020-12-10 stsp s->eof = 1;
3901 826082fe 2020-12-10 stsp free(line);
3902 826082fe 2020-12-10 stsp return got_ferror(s->f, GOT_ERR_IO);
3905 1853e0f4 2022-06-16 stsp /* Set view->maxx based on full line length. */
3906 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, INT_MAX, 0,
3907 1853e0f4 2022-06-16 stsp view->x ? 1 : 0);
3908 1853e0f4 2022-06-16 stsp if (err) {
3909 1853e0f4 2022-06-16 stsp free(line);
3910 1853e0f4 2022-06-16 stsp return err;
3912 1853e0f4 2022-06-16 stsp view->maxx = MAX(view->maxx, width);
3913 1853e0f4 2022-06-16 stsp free(wline);
3914 1853e0f4 2022-06-16 stsp wline = NULL;
3916 89f1a395 2020-12-01 naddy tc = match_color(&s->colors, line);
3918 f26dddb7 2019-11-08 stsp wattr_on(view->window,
3919 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3920 89f1a395 2020-12-01 naddy if (s->first_displayed_line + nprinted == s->matched_line &&
3921 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
3922 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols, 0,
3923 145b6838 2022-06-16 stsp view->window, view->x, regmatch);
3924 41605754 2020-11-12 stsp if (err) {
3925 41605754 2020-11-12 stsp free(line);
3926 41605754 2020-11-12 stsp return err;
3930 969c159c 2022-06-16 stsp err = format_line(&wline, &width, &skip, line,
3931 969c159c 2022-06-16 stsp view->x, view->ncols, 0, view->x ? 1 : 0);
3932 969c159c 2022-06-16 stsp if (err) {
3933 969c159c 2022-06-16 stsp free(line);
3934 969c159c 2022-06-16 stsp return err;
3936 969c159c 2022-06-16 stsp waddwstr(view->window, &wline[skip]);
3937 969c159c 2022-06-16 stsp free(wline);
3938 41605754 2020-11-12 stsp wline = NULL;
3941 6d17833f 2019-11-08 stsp wattr_off(view->window,
3942 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3943 969c159c 2022-06-16 stsp if (width <= view->ncols - 1)
3944 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3945 fe621944 2020-11-10 stsp nprinted++;
3947 826082fe 2020-12-10 stsp free(line);
3948 fe621944 2020-11-10 stsp if (nprinted >= 1)
3949 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line +
3950 89f1a395 2020-12-01 naddy (nprinted - 1);
3952 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line;
3954 9b058f45 2022-06-30 mark view_border(view);
3956 89f1a395 2020-12-01 naddy if (s->eof) {
3957 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
3958 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
3959 c3e9aa98 2019-05-13 jcs nprinted++;
3962 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, TOG_EOF_STRING, 0,
3963 ccda2f4d 2022-06-16 stsp view->ncols, 0, 0);
3965 c3e9aa98 2019-05-13 jcs return err;
3968 c3e9aa98 2019-05-13 jcs wstandout(view->window);
3969 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
3970 e54cc94a 2020-11-11 stsp free(wline);
3971 e54cc94a 2020-11-11 stsp wline = NULL;
3972 c3e9aa98 2019-05-13 jcs wstandend(view->window);
3975 26ed57b2 2018-05-19 stsp return NULL;
3978 abd2672a 2018-12-23 stsp static char *
3979 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
3981 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3982 09867e48 2019-08-13 stsp char *p, *s;
3984 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3985 09867e48 2019-08-13 stsp if (tm == NULL)
3986 09867e48 2019-08-13 stsp return NULL;
3987 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3988 09867e48 2019-08-13 stsp if (s == NULL)
3989 09867e48 2019-08-13 stsp return NULL;
3990 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
3992 abd2672a 2018-12-23 stsp *p = '\0';
3996 4ed7e80c 2018-05-20 stsp static const struct got_error *
3997 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3998 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
4000 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
4001 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
4002 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4003 0208f208 2020-05-05 stsp struct got_object_qid *qid;
4005 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
4006 0208f208 2020-05-05 stsp if (qid != NULL) {
4007 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
4008 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
4009 d7b5a0e8 2022-04-20 stsp &qid->id);
4011 0208f208 2020-05-05 stsp return err;
4013 aa8b5dd0 2021-08-01 stsp tree_id1 = got_object_id_dup(
4014 aa8b5dd0 2021-08-01 stsp got_object_commit_get_tree_id(pcommit));
4015 aa8b5dd0 2021-08-01 stsp if (tree_id1 == NULL) {
4016 aa8b5dd0 2021-08-01 stsp got_object_commit_close(pcommit);
4017 aa8b5dd0 2021-08-01 stsp return got_error_from_errno("got_object_id_dup");
4019 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
4023 0208f208 2020-05-05 stsp if (tree_id1) {
4024 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
4026 0208f208 2020-05-05 stsp goto done;
4029 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
4030 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
4032 0208f208 2020-05-05 stsp goto done;
4034 f9d37699 2022-06-28 stsp err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
4035 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
4037 0208f208 2020-05-05 stsp if (tree1)
4038 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
4039 0208f208 2020-05-05 stsp if (tree2)
4040 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
4041 aa8b5dd0 2021-08-01 stsp free(tree_id1);
4042 0208f208 2020-05-05 stsp return err;
4045 0208f208 2020-05-05 stsp static const struct got_error *
4046 fe621944 2020-11-10 stsp add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
4050 fe621944 2020-11-10 stsp p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
4051 fe621944 2020-11-10 stsp if (p == NULL)
4052 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
4053 fe621944 2020-11-10 stsp *line_offsets = p;
4054 fe621944 2020-11-10 stsp (*line_offsets)[*nlines] = off;
4055 fe621944 2020-11-10 stsp (*nlines)++;
4056 fe621944 2020-11-10 stsp return NULL;
4059 fe621944 2020-11-10 stsp static const struct got_error *
4060 fe621944 2020-11-10 stsp write_commit_info(off_t **line_offsets, size_t *nlines,
4061 fe621944 2020-11-10 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4062 fe621944 2020-11-10 stsp struct got_repository *repo, FILE *outfile)
4064 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
4065 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
4066 15a94983 2018-12-23 stsp struct got_commit_object *commit;
4067 fe621944 2020-11-10 stsp char *id_str = NULL, *logmsg = NULL, *s = NULL, *line;
4068 45d799e2 2018-12-23 stsp time_t committer_time;
4069 45d799e2 2018-12-23 stsp const char *author, *committer;
4070 8b473291 2019-02-21 stsp char *refs_str = NULL;
4071 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
4072 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
4073 fe621944 2020-11-10 stsp off_t outoff = 0;
4076 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
4078 8b473291 2019-02-21 stsp if (refs) {
4079 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
4081 8b473291 2019-02-21 stsp return err;
4084 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
4086 abd2672a 2018-12-23 stsp return err;
4088 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
4089 15a94983 2018-12-23 stsp if (err) {
4090 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
4091 15a94983 2018-12-23 stsp goto done;
4094 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, 0);
4096 fe621944 2020-11-10 stsp goto done;
4098 fe621944 2020-11-10 stsp n = fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4099 fe621944 2020-11-10 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
4100 fe621944 2020-11-10 stsp if (n < 0) {
4101 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
4102 abd2672a 2018-12-23 stsp goto done;
4104 fe621944 2020-11-10 stsp outoff += n;
4105 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
4107 fe621944 2020-11-10 stsp goto done;
4109 fe621944 2020-11-10 stsp n = fprintf(outfile, "from: %s\n",
4110 fe621944 2020-11-10 stsp got_object_commit_get_author(commit));
4111 fe621944 2020-11-10 stsp if (n < 0) {
4112 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
4113 abd2672a 2018-12-23 stsp goto done;
4115 fe621944 2020-11-10 stsp outoff += n;
4116 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
4118 fe621944 2020-11-10 stsp goto done;
4120 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
4121 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
4122 fe621944 2020-11-10 stsp if (datestr) {
4123 fe621944 2020-11-10 stsp n = fprintf(outfile, "date: %s UTC\n", datestr);
4124 fe621944 2020-11-10 stsp if (n < 0) {
4125 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
4126 fe621944 2020-11-10 stsp goto done;
4128 fe621944 2020-11-10 stsp outoff += n;
4129 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
4131 fe621944 2020-11-10 stsp goto done;
4133 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
4134 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
4135 fe621944 2020-11-10 stsp if (strcmp(author, committer) != 0) {
4136 fe621944 2020-11-10 stsp n = fprintf(outfile, "via: %s\n", committer);
4137 fe621944 2020-11-10 stsp if (n < 0) {
4138 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
4139 fe621944 2020-11-10 stsp goto done;
4141 fe621944 2020-11-10 stsp outoff += n;
4142 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
4144 fe621944 2020-11-10 stsp goto done;
4146 9f98ca05 2021-09-24 stsp if (got_object_commit_get_nparents(commit) > 1) {
4147 9f98ca05 2021-09-24 stsp const struct got_object_id_queue *parent_ids;
4148 9f98ca05 2021-09-24 stsp struct got_object_qid *qid;
4149 9f98ca05 2021-09-24 stsp int pn = 1;
4150 9f98ca05 2021-09-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
4151 9f98ca05 2021-09-24 stsp STAILQ_FOREACH(qid, parent_ids, entry) {
4152 d7b5a0e8 2022-04-20 stsp err = got_object_id_str(&id_str, &qid->id);
4154 9f98ca05 2021-09-24 stsp goto done;
4155 9f98ca05 2021-09-24 stsp n = fprintf(outfile, "parent %d: %s\n", pn++, id_str);
4156 9f98ca05 2021-09-24 stsp if (n < 0) {
4157 9f98ca05 2021-09-24 stsp err = got_error_from_errno("fprintf");
4158 9f98ca05 2021-09-24 stsp goto done;
4160 9f98ca05 2021-09-24 stsp outoff += n;
4161 9f98ca05 2021-09-24 stsp err = add_line_offset(line_offsets, nlines, outoff);
4163 9f98ca05 2021-09-24 stsp goto done;
4164 9f98ca05 2021-09-24 stsp free(id_str);
4165 9f98ca05 2021-09-24 stsp id_str = NULL;
4169 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
4171 5943eee2 2019-08-13 stsp goto done;
4172 fe621944 2020-11-10 stsp s = logmsg;
4173 fe621944 2020-11-10 stsp while ((line = strsep(&s, "\n")) != NULL) {
4174 fe621944 2020-11-10 stsp n = fprintf(outfile, "%s\n", line);
4175 fe621944 2020-11-10 stsp if (n < 0) {
4176 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
4177 fe621944 2020-11-10 stsp goto done;
4179 fe621944 2020-11-10 stsp outoff += n;
4180 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
4182 fe621944 2020-11-10 stsp goto done;
4185 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
4187 0208f208 2020-05-05 stsp goto done;
4188 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
4189 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
4190 fe621944 2020-11-10 stsp n = fprintf(outfile, "%c %s\n", cp->status, pe->path);
4191 fe621944 2020-11-10 stsp if (n < 0) {
4192 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
4193 fe621944 2020-11-10 stsp goto done;
4195 fe621944 2020-11-10 stsp outoff += n;
4196 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
4198 fe621944 2020-11-10 stsp goto done;
4199 0208f208 2020-05-05 stsp free((char *)pe->path);
4200 0208f208 2020-05-05 stsp free(pe->data);
4203 0208f208 2020-05-05 stsp fputc('\n', outfile);
4205 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
4207 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
4208 abd2672a 2018-12-23 stsp free(id_str);
4209 5943eee2 2019-08-13 stsp free(logmsg);
4210 8b473291 2019-02-21 stsp free(refs_str);
4211 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4212 7510f233 2020-08-09 stsp if (err) {
4213 ae6a6978 2020-08-09 stsp free(*line_offsets);
4214 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
4215 ae6a6978 2020-08-09 stsp *nlines = 0;
4217 fe621944 2020-11-10 stsp return err;
4220 abd2672a 2018-12-23 stsp static const struct got_error *
4221 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
4223 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
4224 48ae06ee 2018-10-18 stsp FILE *f = NULL;
4225 15a94983 2018-12-23 stsp int obj_type;
4227 fe621944 2020-11-10 stsp free(s->line_offsets);
4228 fe621944 2020-11-10 stsp s->line_offsets = malloc(sizeof(off_t));
4229 fe621944 2020-11-10 stsp if (s->line_offsets == NULL)
4230 fe621944 2020-11-10 stsp return got_error_from_errno("malloc");
4231 fe621944 2020-11-10 stsp s->nlines = 0;
4233 511a516b 2018-05-19 stsp f = got_opentemp();
4234 48ae06ee 2018-10-18 stsp if (f == NULL) {
4235 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
4236 48ae06ee 2018-10-18 stsp goto done;
4238 56b63ca4 2021-01-22 stsp if (s->f && fclose(s->f) == EOF) {
4239 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4240 fb43ecf1 2019-02-11 stsp goto done;
4244 15a94983 2018-12-23 stsp if (s->id1)
4245 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
4247 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
4249 15a94983 2018-12-23 stsp goto done;
4251 15a94983 2018-12-23 stsp switch (obj_type) {
4252 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
4253 fe621944 2020-11-10 stsp err = got_diff_objects_as_blobs(&s->line_offsets, &s->nlines,
4254 f9d37699 2022-06-28 stsp s->f1, s->f2, s->fd1, s->fd2, s->id1, s->id2,
4255 917d79a7 2022-07-01 stsp s->label1, s->label2, tog_diff_algo, s->diff_context,
4256 f9d37699 2022-06-28 stsp s->ignore_whitespace, s->force_text_diff, s->repo, s->f);
4258 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
4259 fe621944 2020-11-10 stsp err = got_diff_objects_as_trees(&s->line_offsets, &s->nlines,
4260 f9d37699 2022-06-28 stsp s->f1, s->f2, s->fd1, s->fd2, s->id1, s->id2, NULL, "", "",
4261 917d79a7 2022-07-01 stsp tog_diff_algo, s->diff_context, s->ignore_whitespace,
4262 4b752015 2022-06-30 stsp s->force_text_diff, s->repo, s->f);
4264 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
4265 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
4266 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
4267 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
4268 d2075bf3 2020-12-25 stsp struct got_reflist_head *refs;
4270 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
4272 3ffacbe1 2020-02-02 tracey goto done;
4273 51a10b52 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(tog_refs_idmap, s->id2);
4274 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
4275 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
4276 fe621944 2020-11-10 stsp err = write_commit_info(&s->line_offsets, &s->nlines,
4277 d2075bf3 2020-12-25 stsp s->id2, refs, s->repo, s->f);
4278 f44b1f58 2020-02-02 tracey if (err)
4279 f44b1f58 2020-02-02 tracey goto done;
4280 f44b1f58 2020-02-02 tracey } else {
4281 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
4282 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(pid, parent_ids, entry) {
4283 d7b5a0e8 2022-04-20 stsp if (got_object_id_cmp(s->id1, &pid->id) == 0) {
4284 fe621944 2020-11-10 stsp err = write_commit_info(
4285 fe621944 2020-11-10 stsp &s->line_offsets, &s->nlines,
4286 d2075bf3 2020-12-25 stsp s->id2, refs, s->repo, s->f);
4287 f44b1f58 2020-02-02 tracey if (err)
4288 f44b1f58 2020-02-02 tracey goto done;
4293 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
4295 fe621944 2020-11-10 stsp err = got_diff_objects_as_commits(&s->line_offsets, &s->nlines,
4296 f9d37699 2022-06-28 stsp s->f1, s->f2, s->fd1, s->fd2, s->id1, s->id2, NULL,
4297 917d79a7 2022-07-01 stsp tog_diff_algo, s->diff_context, s->ignore_whitespace,
4298 4b752015 2022-06-30 stsp s->force_text_diff, s->repo, s->f);
4302 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
4305 f44b1f58 2020-02-02 tracey if (err)
4306 f44b1f58 2020-02-02 tracey goto done;
4308 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
4309 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
4310 48ae06ee 2018-10-18 stsp return err;
4313 f5215bb9 2019-02-22 stsp static void
4314 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
4316 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
4317 f5215bb9 2019-02-22 stsp update_panels();
4318 f5215bb9 2019-02-22 stsp doupdate();
4321 f44b1f58 2020-02-02 tracey static const struct got_error *
4322 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
4324 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
4326 f44b1f58 2020-02-02 tracey s->matched_line = 0;
4327 f44b1f58 2020-02-02 tracey return NULL;
4330 f44b1f58 2020-02-02 tracey static const struct got_error *
4331 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
4333 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
4334 145b6838 2022-06-16 stsp const struct got_error *err = NULL;
4335 f44b1f58 2020-02-02 tracey int lineno;
4336 cb713507 2022-06-16 stsp char *line = NULL;
4337 826082fe 2020-12-10 stsp size_t linesize = 0;
4338 826082fe 2020-12-10 stsp ssize_t linelen;
4340 f44b1f58 2020-02-02 tracey if (!view->searching) {
4341 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4342 f44b1f58 2020-02-02 tracey return NULL;
4345 f44b1f58 2020-02-02 tracey if (s->matched_line) {
4346 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
4347 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
4349 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
4351 487cd7d2 2021-12-17 stsp lineno = s->first_displayed_line;
4353 f44b1f58 2020-02-02 tracey while (1) {
4354 f44b1f58 2020-02-02 tracey off_t offset;
4356 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
4357 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
4358 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4362 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
4363 f44b1f58 2020-02-02 tracey lineno = 1;
4365 f44b1f58 2020-02-02 tracey lineno = s->nlines;
4368 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
4369 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
4370 f44b1f58 2020-02-02 tracey free(line);
4371 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
4373 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
4374 cb713507 2022-06-16 stsp if (linelen != -1) {
4375 cb713507 2022-06-16 stsp char *exstr;
4376 cb713507 2022-06-16 stsp err = expand_tab(&exstr, line);
4379 cb713507 2022-06-16 stsp if (match_line(exstr, &view->regex, 1,
4380 cb713507 2022-06-16 stsp &view->regmatch)) {
4381 cb713507 2022-06-16 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4382 cb713507 2022-06-16 stsp s->matched_line = lineno;
4383 cb713507 2022-06-16 stsp free(exstr);
4386 cb713507 2022-06-16 stsp free(exstr);
4388 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
4389 f44b1f58 2020-02-02 tracey lineno++;
4391 f44b1f58 2020-02-02 tracey lineno--;
4393 826082fe 2020-12-10 stsp free(line);
4395 f44b1f58 2020-02-02 tracey if (s->matched_line) {
4396 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
4397 f44b1f58 2020-02-02 tracey s->selected_line = 1;
4400 145b6838 2022-06-16 stsp return err;
4403 48ae06ee 2018-10-18 stsp static const struct got_error *
4404 b72706c3 2022-06-01 stsp close_diff_view(struct tog_view *view)
4406 b72706c3 2022-06-01 stsp const struct got_error *err = NULL;
4407 b72706c3 2022-06-01 stsp struct tog_diff_view_state *s = &view->state.diff;
4409 b72706c3 2022-06-01 stsp free(s->id1);
4410 b72706c3 2022-06-01 stsp s->id1 = NULL;
4411 b72706c3 2022-06-01 stsp free(s->id2);
4412 b72706c3 2022-06-01 stsp s->id2 = NULL;
4413 b72706c3 2022-06-01 stsp if (s->f && fclose(s->f) == EOF)
4414 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
4415 b72706c3 2022-06-01 stsp s->f = NULL;
4416 f9d37699 2022-06-28 stsp if (s->f1 && fclose(s->f1) == EOF && err == NULL)
4417 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
4418 b72706c3 2022-06-01 stsp s->f1 = NULL;
4419 f9d37699 2022-06-28 stsp if (s->f2 && fclose(s->f2) == EOF && err == NULL)
4420 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
4421 b72706c3 2022-06-01 stsp s->f2 = NULL;
4422 f9d37699 2022-06-28 stsp if (s->fd1 != -1 && close(s->fd1) == -1 && err == NULL)
4423 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
4424 f9d37699 2022-06-28 stsp s->fd1 = -1;
4425 f9d37699 2022-06-28 stsp if (s->fd2 != -1 && close(s->fd2) == -1 && err == NULL)
4426 f9d37699 2022-06-28 stsp err = got_error_from_errno("close");
4427 f9d37699 2022-06-28 stsp s->fd2 = -1;
4428 b72706c3 2022-06-01 stsp free_colors(&s->colors);
4429 b72706c3 2022-06-01 stsp free(s->line_offsets);
4430 b72706c3 2022-06-01 stsp s->line_offsets = NULL;
4431 b72706c3 2022-06-01 stsp s->nlines = 0;
4432 b72706c3 2022-06-01 stsp return err;
4435 b72706c3 2022-06-01 stsp static const struct got_error *
4436 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
4437 3dbaef42 2020-11-24 stsp struct got_object_id *id2, const char *label1, const char *label2,
4438 3dbaef42 2020-11-24 stsp int diff_context, int ignore_whitespace, int force_text_diff,
4439 c0f61fa4 2022-07-11 mark struct tog_view *parent_view, struct got_repository *repo)
4441 48ae06ee 2018-10-18 stsp const struct got_error *err;
4442 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
4444 b72706c3 2022-06-01 stsp memset(s, 0, sizeof(*s));
4445 f9d37699 2022-06-28 stsp s->fd1 = -1;
4446 f9d37699 2022-06-28 stsp s->fd2 = -1;
4448 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
4449 15a94983 2018-12-23 stsp int type1, type2;
4450 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
4452 15a94983 2018-12-23 stsp return err;
4453 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
4455 15a94983 2018-12-23 stsp return err;
4457 15a94983 2018-12-23 stsp if (type1 != type2)
4458 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
4460 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
4461 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
4462 f44b1f58 2020-02-02 tracey s->selected_line = 1;
4463 f44b1f58 2020-02-02 tracey s->repo = repo;
4464 f44b1f58 2020-02-02 tracey s->id1 = id1;
4465 f44b1f58 2020-02-02 tracey s->id2 = id2;
4466 3dbaef42 2020-11-24 stsp s->label1 = label1;
4467 3dbaef42 2020-11-24 stsp s->label2 = label2;
4469 15a94983 2018-12-23 stsp if (id1) {
4470 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
4471 5465d566 2020-02-01 tracey if (s->id1 == NULL)
4472 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
4474 5465d566 2020-02-01 tracey s->id1 = NULL;
4476 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
4477 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
4478 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_object_id_dup");
4479 b72706c3 2022-06-01 stsp goto done;
4482 a00719e9 2022-06-17 stsp s->f1 = got_opentemp();
4483 a00719e9 2022-06-17 stsp if (s->f1 == NULL) {
4484 a00719e9 2022-06-17 stsp err = got_error_from_errno("got_opentemp");
4485 a00719e9 2022-06-17 stsp goto done;
4488 b72706c3 2022-06-01 stsp s->f2 = got_opentemp();
4489 b72706c3 2022-06-01 stsp if (s->f2 == NULL) {
4490 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
4491 b72706c3 2022-06-01 stsp goto done;
4494 f9d37699 2022-06-28 stsp s->fd1 = got_opentempfd();
4495 f9d37699 2022-06-28 stsp if (s->fd1 == -1) {
4496 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
4497 f9d37699 2022-06-28 stsp goto done;
4500 f9d37699 2022-06-28 stsp s->fd2 = got_opentempfd();
4501 f9d37699 2022-06-28 stsp if (s->fd2 == -1) {
4502 f9d37699 2022-06-28 stsp err = got_error_from_errno("got_opentempfd");
4503 f9d37699 2022-06-28 stsp goto done;
4506 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
4507 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
4508 3dbaef42 2020-11-24 stsp s->diff_context = diff_context;
4509 3dbaef42 2020-11-24 stsp s->ignore_whitespace = ignore_whitespace;
4510 64453f7e 2020-11-21 stsp s->force_text_diff = force_text_diff;
4511 c0f61fa4 2022-07-11 mark s->parent_view = parent_view;
4512 5465d566 2020-02-01 tracey s->repo = repo;
4514 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
4515 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4516 5465d566 2020-02-01 tracey err = add_color(&s->colors,
4517 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
4518 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
4520 b72706c3 2022-06-01 stsp goto done;
4521 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
4522 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
4523 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
4525 b72706c3 2022-06-01 stsp goto done;
4526 5465d566 2020-02-01 tracey err = add_color(&s->colors,
4527 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
4528 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
4530 b72706c3 2022-06-01 stsp goto done;
4532 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
4533 8469d821 2022-06-25 stsp "^(commit [0-9a-f]|parent [0-9]|"
4534 8469d821 2022-06-25 stsp "(blob|file|tree|commit) [-+] |"
4535 9f98ca05 2021-09-24 stsp "[MDmA] [^ ])", TOG_COLOR_DIFF_META,
4536 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
4538 b72706c3 2022-06-01 stsp goto done;
4540 5465d566 2020-02-01 tracey err = add_color(&s->colors,
4541 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
4542 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
4544 b72706c3 2022-06-01 stsp goto done;
4546 5465d566 2020-02-01 tracey err = add_color(&s->colors,
4547 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
4548 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
4550 b72706c3 2022-06-01 stsp goto done;
4553 c0f61fa4 2022-07-11 mark if (parent_view && parent_view->type == TOG_VIEW_LOG &&
4554 c0f61fa4 2022-07-11 mark view_is_splitscreen(view))
4555 c0f61fa4 2022-07-11 mark show_log_view(parent_view); /* draw border */
4556 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
4558 5465d566 2020-02-01 tracey err = create_diff(s);
4560 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
4561 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
4562 917d79a7 2022-07-01 stsp view->reset = reset_diff_view;
4563 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
4564 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
4565 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
4568 b72706c3 2022-06-01 stsp close_diff_view(view);
4569 e5a0f69f 2018-08-18 stsp return err;
4572 5dc9f4bc 2018-08-04 stsp static const struct got_error *
4573 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
4575 a3404814 2018-09-02 stsp const struct got_error *err;
4576 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
4577 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
4578 3dbaef42 2020-11-24 stsp const char *label1, *label2;
4580 a3404814 2018-09-02 stsp if (s->id1) {
4581 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
4583 a3404814 2018-09-02 stsp return err;
4584 3dbaef42 2020-11-24 stsp label1 = s->label1 ? : id_str1;
4586 3dbaef42 2020-11-24 stsp label1 = "/dev/null";
4588 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
4590 a3404814 2018-09-02 stsp return err;
4591 3dbaef42 2020-11-24 stsp label2 = s->label2 ? : id_str2;
4593 3dbaef42 2020-11-24 stsp if (asprintf(&header, "diff %s %s", label1, label2) == -1) {
4594 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4595 a3404814 2018-09-02 stsp free(id_str1);
4596 a3404814 2018-09-02 stsp free(id_str2);
4597 a3404814 2018-09-02 stsp return err;
4599 a3404814 2018-09-02 stsp free(id_str1);
4600 a3404814 2018-09-02 stsp free(id_str2);
4602 267bb3b8 2021-08-01 stsp err = draw_file(view, header);
4603 267bb3b8 2021-08-01 stsp free(header);
4604 267bb3b8 2021-08-01 stsp return err;
4607 15a087fe 2019-02-21 stsp static const struct got_error *
4608 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
4609 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
4611 d7a04538 2019-02-21 stsp const struct got_error *err;
4612 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
4613 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
4614 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
4616 15a087fe 2019-02-21 stsp free(s->id2);
4617 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
4618 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
4619 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
4621 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
4623 d7a04538 2019-02-21 stsp return err;
4624 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
4625 15a087fe 2019-02-21 stsp free(s->id1);
4626 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(parent_ids);
4627 d7b5a0e8 2022-04-20 stsp s->id1 = pid ? got_object_id_dup(&pid->id) : NULL;
4628 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
4629 15a087fe 2019-02-21 stsp return NULL;
4632 0cf4efb1 2018-09-29 stsp static const struct got_error *
4633 917d79a7 2022-07-01 stsp reset_diff_view(struct tog_view *view)
4635 917d79a7 2022-07-01 stsp struct tog_diff_view_state *s = &view->state.diff;
4637 917d79a7 2022-07-01 stsp view->count = 0;
4638 917d79a7 2022-07-01 stsp wclear(view->window);
4639 917d79a7 2022-07-01 stsp s->first_displayed_line = 1;
4640 917d79a7 2022-07-01 stsp s->last_displayed_line = view->nlines;
4641 917d79a7 2022-07-01 stsp s->matched_line = 0;
4642 917d79a7 2022-07-01 stsp diff_view_indicate_progress(view);
4643 917d79a7 2022-07-01 stsp return create_diff(s);
4646 c0f61fa4 2022-07-11 mark static struct got_object_id *get_selected_commit_id(struct tog_blame_line *,
4647 c0f61fa4 2022-07-11 mark int, int, int);
4648 c0f61fa4 2022-07-11 mark static struct got_object_id *get_annotation_for_line(struct tog_blame_line *,
4649 c0f61fa4 2022-07-11 mark int, int);
4651 917d79a7 2022-07-01 stsp static const struct got_error *
4652 e78dc838 2020-12-04 stsp input_diff_view(struct tog_view **new_view, struct tog_view *view, int ch)
4654 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
4655 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
4656 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
4657 5a8b5076 2020-12-05 stsp struct commit_queue_entry *old_selected_entry;
4658 826082fe 2020-12-10 stsp char *line = NULL;
4659 826082fe 2020-12-10 stsp size_t linesize = 0;
4660 826082fe 2020-12-10 stsp ssize_t linelen;
4661 c0f61fa4 2022-07-11 mark int i, nscroll = view->nlines - 1, up = 0;
4663 e5a0f69f 2018-08-18 stsp switch (ch) {
4665 145b6838 2022-06-16 stsp view->x = 0;
4668 145b6838 2022-06-16 stsp view->x = MAX(view->maxx - view->ncols / 3, 0);
4669 640cd7ff 2022-06-22 mark view->count = 0;
4671 145b6838 2022-06-16 stsp case KEY_RIGHT:
4673 145b6838 2022-06-16 stsp if (view->x + view->ncols / 3 < view->maxx)
4674 145b6838 2022-06-16 stsp view->x += 2; /* move two columns right */
4676 640cd7ff 2022-06-22 mark view->count = 0;
4678 145b6838 2022-06-16 stsp case KEY_LEFT:
4680 145b6838 2022-06-16 stsp view->x -= MIN(view->x, 2); /* move two columns back */
4681 640cd7ff 2022-06-22 mark if (view->x <= 0)
4682 640cd7ff 2022-06-22 mark view->count = 0;
4686 3dbaef42 2020-11-24 stsp if (ch == 'a')
4687 3dbaef42 2020-11-24 stsp s->force_text_diff = !s->force_text_diff;
4688 3dbaef42 2020-11-24 stsp if (ch == 'w')
4689 3dbaef42 2020-11-24 stsp s->ignore_whitespace = !s->ignore_whitespace;
4690 917d79a7 2022-07-01 stsp err = reset_diff_view(view);
4693 912a3f79 2021-08-30 j case KEY_HOME:
4694 912a3f79 2021-08-30 j s->first_displayed_line = 1;
4695 640cd7ff 2022-06-22 mark view->count = 0;
4698 912a3f79 2021-08-30 j case KEY_END:
4699 640cd7ff 2022-06-22 mark view->count = 0;
4703 912a3f79 2021-08-30 j s->first_displayed_line = (s->nlines - view->nlines) + 2;
4707 1e37a5c2 2019-05-12 jcs case KEY_UP:
4708 02ffd0d5 2021-10-17 stsp case CTRL('p'):
4709 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
4710 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4712 640cd7ff 2022-06-22 mark view->count = 0;
4714 83cc4199 2022-06-13 stsp case CTRL('u'):
4716 83cc4199 2022-06-13 stsp nscroll /= 2;
4717 83cc4199 2022-06-13 stsp /* FALL THROUGH */
4718 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4719 a60a9dc4 2019-05-13 jcs case CTRL('b'):
4721 640cd7ff 2022-06-22 mark if (s->first_displayed_line == 1) {
4722 640cd7ff 2022-06-22 mark view->count = 0;
4726 83cc4199 2022-06-13 stsp while (i++ < nscroll && s->first_displayed_line > 1)
4727 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4730 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4731 02ffd0d5 2021-10-17 stsp case CTRL('n'):
4732 1e37a5c2 2019-05-12 jcs if (!s->eof)
4733 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4735 640cd7ff 2022-06-22 mark view->count = 0;
4737 83cc4199 2022-06-13 stsp case CTRL('d'):
4739 83cc4199 2022-06-13 stsp nscroll /= 2;
4740 83cc4199 2022-06-13 stsp /* FALL THROUGH */
4741 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4742 a60a9dc4 2019-05-13 jcs case CTRL('f'):
4745 640cd7ff 2022-06-22 mark if (s->eof) {
4746 640cd7ff 2022-06-22 mark view->count = 0;
4750 83cc4199 2022-06-13 stsp while (!s->eof && i++ < nscroll) {
4751 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
4752 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4753 826082fe 2020-12-10 stsp if (linelen == -1) {
4754 826082fe 2020-12-10 stsp if (feof(s->f)) {
4755 826082fe 2020-12-10 stsp s->eof = 1;
4757 826082fe 2020-12-10 stsp err = got_ferror(s->f, GOT_ERR_IO);
4761 826082fe 2020-12-10 stsp free(line);
4764 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
4765 1e37a5c2 2019-05-12 jcs s->diff_context--;
4766 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4767 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
4768 1e37a5c2 2019-05-12 jcs err = create_diff(s);
4769 27829c9e 2020-11-21 stsp if (s->first_displayed_line + view->nlines - 1 >
4770 27829c9e 2020-11-21 stsp s->nlines) {
4771 27829c9e 2020-11-21 stsp s->first_displayed_line = 1;
4772 27829c9e 2020-11-21 stsp s->last_displayed_line = view->nlines;
4775 640cd7ff 2022-06-22 mark view->count = 0;
4778 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
4779 1e37a5c2 2019-05-12 jcs s->diff_context++;
4780 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4781 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
4782 1e37a5c2 2019-05-12 jcs err = create_diff(s);
4784 640cd7ff 2022-06-22 mark view->count = 0;
4790 c0f61fa4 2022-07-11 mark /* FALL THROUGH */
4794 c0f61fa4 2022-07-11 mark if (s->parent_view == NULL) {
4795 640cd7ff 2022-06-22 mark view->count = 0;
4798 c0f61fa4 2022-07-11 mark s->parent_view->count = view->count;
4800 c0f61fa4 2022-07-11 mark if (s->parent_view->type == TOG_VIEW_LOG) {
4801 c0f61fa4 2022-07-11 mark ls = &s->parent_view->state.log;
4802 c0f61fa4 2022-07-11 mark old_selected_entry = ls->selected_entry;
4804 c0f61fa4 2022-07-11 mark err = input_log_view(NULL, s->parent_view,
4805 c0f61fa4 2022-07-11 mark up ? KEY_UP : KEY_DOWN);
4808 c0f61fa4 2022-07-11 mark view->count = s->parent_view->count;
4810 c0f61fa4 2022-07-11 mark if (old_selected_entry == ls->selected_entry)
4813 c0f61fa4 2022-07-11 mark err = set_selected_commit(s, ls->selected_entry);
4816 c0f61fa4 2022-07-11 mark } else if (s->parent_view->type == TOG_VIEW_BLAME) {
4817 c0f61fa4 2022-07-11 mark struct tog_blame_view_state *bs;
4818 c0f61fa4 2022-07-11 mark struct got_object_id *id, *prev_id;
4820 c0f61fa4 2022-07-11 mark bs = &s->parent_view->state.blame;
4821 c0f61fa4 2022-07-11 mark prev_id = get_annotation_for_line(bs->blame.lines,
4822 c0f61fa4 2022-07-11 mark bs->blame.nlines, bs->last_diffed_line);
4824 c0f61fa4 2022-07-11 mark err = input_blame_view(&view, s->parent_view,
4825 c0f61fa4 2022-07-11 mark up ? KEY_UP : KEY_DOWN);
4828 c0f61fa4 2022-07-11 mark view->count = s->parent_view->count;
4830 c0f61fa4 2022-07-11 mark if (prev_id == NULL)
4832 c0f61fa4 2022-07-11 mark id = get_selected_commit_id(bs->blame.lines,
4833 c0f61fa4 2022-07-11 mark bs->blame.nlines, bs->first_displayed_line,
4834 c0f61fa4 2022-07-11 mark bs->selected_line);
4835 c0f61fa4 2022-07-11 mark if (id == NULL)
4838 c0f61fa4 2022-07-11 mark if (!got_object_id_cmp(prev_id, id))
4841 c0f61fa4 2022-07-11 mark err = input_blame_view(&view, s->parent_view, KEY_ENTER);
4845 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4846 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
4847 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4848 145b6838 2022-06-16 stsp view->x = 0;
4850 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
4851 1e37a5c2 2019-05-12 jcs err = create_diff(s);
4854 640cd7ff 2022-06-22 mark view->count = 0;
4858 bcbd79e2 2018-08-19 stsp return err;
4861 4ed7e80c 2018-05-20 stsp static const struct got_error *
4862 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
4864 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
4865 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
4866 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
4867 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4868 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
4869 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
4870 3dbaef42 2020-11-24 stsp char *label1 = NULL, *label2 = NULL;
4871 3dbaef42 2020-11-24 stsp int diff_context = 3, ignore_whitespace = 0;
4872 64453f7e 2020-11-21 stsp int ch, force_text_diff = 0;
4873 3dbaef42 2020-11-24 stsp const char *errstr;
4874 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
4875 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
4877 3dbaef42 2020-11-24 stsp while ((ch = getopt(argc, argv, "aC:r:w")) != -1) {
4878 26ed57b2 2018-05-19 stsp switch (ch) {
4880 64453f7e 2020-11-21 stsp force_text_diff = 1;
4883 3dbaef42 2020-11-24 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4885 3dbaef42 2020-11-24 stsp if (errstr != NULL)
4886 5a20d08d 2022-02-09 op errx(1, "number of context lines is %s: %s",
4887 5a20d08d 2022-02-09 op errstr, errstr);
4889 09b5bff8 2020-02-23 naddy case 'r':
4890 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
4891 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
4892 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
4894 3dbaef42 2020-11-24 stsp got_path_strip_trailing_slashes(repo_path);
4897 3dbaef42 2020-11-24 stsp ignore_whitespace = 1;
4900 17020d27 2019-03-07 stsp usage_diff();
4901 26ed57b2 2018-05-19 stsp /* NOTREACHED */
4905 26ed57b2 2018-05-19 stsp argc -= optind;
4906 26ed57b2 2018-05-19 stsp argv += optind;
4908 26ed57b2 2018-05-19 stsp if (argc == 0) {
4909 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
4910 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
4911 15a94983 2018-12-23 stsp id_str1 = argv[0];
4912 15a94983 2018-12-23 stsp id_str2 = argv[1];
4914 26ed57b2 2018-05-19 stsp usage_diff();
4916 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
4917 0ae84acc 2022-06-15 tracey if (error)
4918 0ae84acc 2022-06-15 tracey goto done;
4920 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
4921 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
4922 c156c7a4 2020-12-18 stsp if (cwd == NULL)
4923 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
4924 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
4925 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4926 c156c7a4 2020-12-18 stsp goto done;
4927 a273ac94 2020-02-23 naddy if (worktree)
4928 a273ac94 2020-02-23 naddy repo_path =
4929 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
4931 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
4932 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
4933 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
4934 c156c7a4 2020-12-18 stsp goto done;
4938 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4939 eb6600df 2019-01-04 stsp if (error)
4940 eb6600df 2019-01-04 stsp goto done;
4942 a273ac94 2020-02-23 naddy init_curses();
4944 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4945 51a10b52 2020-12-26 stsp if (error)
4946 51a10b52 2020-12-26 stsp goto done;
4948 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
4949 26ed57b2 2018-05-19 stsp if (error)
4950 26ed57b2 2018-05-19 stsp goto done;
4952 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4953 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &tog_refs, repo);
4954 26ed57b2 2018-05-19 stsp if (error)
4955 26ed57b2 2018-05-19 stsp goto done;
4957 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4958 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &tog_refs, repo);
4959 26ed57b2 2018-05-19 stsp if (error)
4960 26ed57b2 2018-05-19 stsp goto done;
4962 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
4963 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
4964 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4965 ea5e7bb5 2018-08-01 stsp goto done;
4967 3dbaef42 2020-11-24 stsp error = open_diff_view(view, id1, id2, label1, label2, diff_context,
4968 78756c87 2020-11-24 stsp ignore_whitespace, force_text_diff, NULL, repo);
4969 5dc9f4bc 2018-08-04 stsp if (error)
4970 5dc9f4bc 2018-08-04 stsp goto done;
4971 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4973 3dbaef42 2020-11-24 stsp free(label1);
4974 3dbaef42 2020-11-24 stsp free(label2);
4975 c02c541e 2019-03-29 stsp free(repo_path);
4976 a273ac94 2020-02-23 naddy free(cwd);
4977 1d0f4054 2021-06-17 stsp if (repo) {
4978 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
4979 1d0f4054 2021-06-17 stsp if (error == NULL)
4980 1d0f4054 2021-06-17 stsp error = close_err;
4982 a273ac94 2020-02-23 naddy if (worktree)
4983 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
4984 0ae84acc 2022-06-15 tracey if (pack_fds) {
4985 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
4986 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
4987 0ae84acc 2022-06-15 tracey if (error == NULL)
4988 0ae84acc 2022-06-15 tracey error = pack_err;
4990 51a10b52 2020-12-26 stsp tog_free_refs();
4991 26ed57b2 2018-05-19 stsp return error;
4994 4ed7e80c 2018-05-20 stsp __dead static void
4995 9f7d7167 2018-04-29 stsp usage_blame(void)
4998 87411fa9 2022-06-16 stsp fprintf(stderr,
4999 87411fa9 2022-06-16 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
5000 9f7d7167 2018-04-29 stsp getprogname());
5004 84451b3e 2018-07-10 stsp struct tog_blame_line {
5005 84451b3e 2018-07-10 stsp int annotated;
5006 84451b3e 2018-07-10 stsp struct got_object_id *id;
5009 4ed7e80c 2018-05-20 stsp static const struct got_error *
5010 4f7c3e5e 2020-12-01 naddy draw_blame(struct tog_view *view)
5012 4f7c3e5e 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
5013 4f7c3e5e 2020-12-01 naddy struct tog_blame *blame = &s->blame;
5014 4f7c3e5e 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
5015 84451b3e 2018-07-10 stsp const struct got_error *err;
5016 4cb9d869 2022-06-16 stsp int lineno = 0, nprinted = 0;
5017 826082fe 2020-12-10 stsp char *line = NULL;
5018 826082fe 2020-12-10 stsp size_t linesize = 0;
5019 826082fe 2020-12-10 stsp ssize_t linelen;
5020 84451b3e 2018-07-10 stsp wchar_t *wline;
5021 27a741e5 2019-09-11 stsp int width;
5022 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
5023 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
5024 ab089a2a 2018-07-12 stsp char *id_str;
5025 11b20872 2019-11-08 stsp struct tog_color *tc;
5027 d7b5a0e8 2022-04-20 stsp err = got_object_id_str(&id_str, &s->blamed_commit->id);
5029 ab089a2a 2018-07-12 stsp return err;
5031 4f7c3e5e 2020-12-01 naddy rewind(blame->f);
5032 f7d12f7e 2018-08-01 stsp werase(view->window);
5034 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
5035 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5036 ab089a2a 2018-07-12 stsp free(id_str);
5037 ab089a2a 2018-07-12 stsp return err;
5040 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
5041 ab089a2a 2018-07-12 stsp free(line);
5042 2550e4c3 2018-07-13 stsp line = NULL;
5044 1cae65b4 2019-09-22 stsp return err;
5045 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
5046 a3404814 2018-09-02 stsp wstandout(view->window);
5047 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
5049 11b20872 2019-11-08 stsp wattr_on(view->window,
5050 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5051 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
5053 11b20872 2019-11-08 stsp wattr_off(view->window,
5054 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5055 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
5056 a3404814 2018-09-02 stsp wstandend(view->window);
5057 2550e4c3 2018-07-13 stsp free(wline);
5058 2550e4c3 2018-07-13 stsp wline = NULL;
5059 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
5060 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
5062 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
5063 4f7c3e5e 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, blame->nlines,
5064 4f7c3e5e 2020-12-01 naddy s->blame_complete ? "" : "annotating... ", s->path) == -1) {
5065 ab089a2a 2018-07-12 stsp free(id_str);
5066 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5068 ab089a2a 2018-07-12 stsp free(id_str);
5069 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
5070 3f60a8ef 2018-07-10 stsp free(line);
5071 2550e4c3 2018-07-13 stsp line = NULL;
5073 3f60a8ef 2018-07-10 stsp return err;
5074 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
5075 2550e4c3 2018-07-13 stsp free(wline);
5076 2550e4c3 2018-07-13 stsp wline = NULL;
5077 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
5078 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
5080 4f7c3e5e 2020-12-01 naddy s->eof = 0;
5081 145b6838 2022-06-16 stsp view->maxx = 0;
5082 4f7c3e5e 2020-12-01 naddy while (nprinted < view->nlines - 2) {
5083 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, blame->f);
5084 826082fe 2020-12-10 stsp if (linelen == -1) {
5085 826082fe 2020-12-10 stsp if (feof(blame->f)) {
5086 826082fe 2020-12-10 stsp s->eof = 1;
5089 84451b3e 2018-07-10 stsp free(line);
5090 826082fe 2020-12-10 stsp return got_ferror(blame->f, GOT_ERR_IO);
5092 826082fe 2020-12-10 stsp if (++lineno < s->first_displayed_line)
5095 1853e0f4 2022-06-16 stsp /* Set view->maxx based on full line length. */
5096 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, INT_MAX, 9, 1);
5097 1853e0f4 2022-06-16 stsp if (err) {
5098 1853e0f4 2022-06-16 stsp free(line);
5099 1853e0f4 2022-06-16 stsp return err;
5101 1853e0f4 2022-06-16 stsp free(wline);
5102 1853e0f4 2022-06-16 stsp wline = NULL;
5103 1853e0f4 2022-06-16 stsp view->maxx = MAX(view->maxx, width);
5105 c0f61fa4 2022-07-11 mark if (nprinted == s->selected_line - 1)
5106 f7d12f7e 2018-08-01 stsp wstandout(view->window);
5108 4f7c3e5e 2020-12-01 naddy if (blame->nlines > 0) {
5109 4f7c3e5e 2020-12-01 naddy blame_line = &blame->lines[lineno - 1];
5110 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
5111 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
5112 c0f61fa4 2022-07-11 mark !(nprinted == s->selected_line - 1)) {
5113 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
5114 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
5115 8d0fe45a 2019-08-12 stsp char *id_str;
5116 87411fa9 2022-06-16 stsp err = got_object_id_str(&id_str,
5117 87411fa9 2022-06-16 stsp blame_line->id);
5118 8d0fe45a 2019-08-12 stsp if (err) {
5119 8d0fe45a 2019-08-12 stsp free(line);
5120 8d0fe45a 2019-08-12 stsp return err;
5122 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
5124 11b20872 2019-11-08 stsp wattr_on(view->window,
5125 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5126 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
5128 11b20872 2019-11-08 stsp wattr_off(view->window,
5129 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5130 8d0fe45a 2019-08-12 stsp free(id_str);
5131 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
5133 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
5134 8d0fe45a 2019-08-12 stsp prev_id = NULL;
5137 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
5138 ee41ec32 2018-07-10 stsp prev_id = NULL;
5141 c0f61fa4 2022-07-11 mark if (nprinted == s->selected_line - 1)
5142 f7d12f7e 2018-08-01 stsp wstandend(view->window);
5143 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
5145 41605754 2020-11-12 stsp if (view->ncols <= 9) {
5146 41605754 2020-11-12 stsp width = 9;
5147 4f7c3e5e 2020-12-01 naddy } else if (s->first_displayed_line + nprinted ==
5148 4f7c3e5e 2020-12-01 naddy s->matched_line &&
5149 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
5150 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols - 9, 9,
5151 145b6838 2022-06-16 stsp view->window, view->x, regmatch);
5152 41605754 2020-11-12 stsp if (err) {
5153 41605754 2020-11-12 stsp free(line);
5154 41605754 2020-11-12 stsp return err;
5156 41605754 2020-11-12 stsp width += 9;
5159 4cb9d869 2022-06-16 stsp err = format_line(&wline, &width, &skip, line,
5160 4cb9d869 2022-06-16 stsp view->x, view->ncols - 9, 9, 1);
5161 4cb9d869 2022-06-16 stsp if (err) {
5162 4cb9d869 2022-06-16 stsp free(line);
5163 4cb9d869 2022-06-16 stsp return err;
5165 4cb9d869 2022-06-16 stsp waddwstr(view->window, &wline[skip]);
5166 a75b3e2d 2022-06-16 stsp width += 9;
5167 41605754 2020-11-12 stsp free(wline);
5168 41605754 2020-11-12 stsp wline = NULL;
5171 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
5172 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
5173 84451b3e 2018-07-10 stsp if (++nprinted == 1)
5174 4f7c3e5e 2020-12-01 naddy s->first_displayed_line = lineno;
5176 826082fe 2020-12-10 stsp free(line);
5177 4f7c3e5e 2020-12-01 naddy s->last_displayed_line = lineno;
5179 9b058f45 2022-06-30 mark view_border(view);
5181 84451b3e 2018-07-10 stsp return NULL;
5184 84451b3e 2018-07-10 stsp static const struct got_error *
5185 392891ce 2022-04-07 stsp blame_cb(void *arg, int nlines, int lineno,
5186 392891ce 2022-04-07 stsp struct got_commit_object *commit, struct got_object_id *id)
5188 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
5189 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
5190 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
5191 1a76625f 2018-10-22 stsp int errcode;
5193 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
5194 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
5195 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
5197 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
5198 1a76625f 2018-10-22 stsp if (errcode)
5199 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
5201 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
5202 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
5203 d68a0a7d 2018-07-10 stsp goto done;
5206 d68a0a7d 2018-07-10 stsp if (lineno == -1)
5207 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
5209 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
5210 d68a0a7d 2018-07-10 stsp if (line->annotated)
5211 d68a0a7d 2018-07-10 stsp goto done;
5213 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
5214 84451b3e 2018-07-10 stsp if (line->id == NULL) {
5215 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5216 84451b3e 2018-07-10 stsp goto done;
5218 84451b3e 2018-07-10 stsp line->annotated = 1;
5220 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
5221 1a76625f 2018-10-22 stsp if (errcode)
5222 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
5223 84451b3e 2018-07-10 stsp return err;
5226 84451b3e 2018-07-10 stsp static void *
5227 84451b3e 2018-07-10 stsp blame_thread(void *arg)
5229 1d0f4054 2021-06-17 stsp const struct got_error *err, *close_err;
5230 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
5231 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
5232 e6e73e55 2022-06-30 tracey int errcode, fd1 = -1, fd2 = -1;
5233 e6e73e55 2022-06-30 tracey FILE *f1 = NULL, *f2 = NULL;
5235 e6e73e55 2022-06-30 tracey fd1 = got_opentempfd();
5236 e6e73e55 2022-06-30 tracey if (fd1 == -1)
5237 1b484788 2022-06-28 tracey return (void *)got_error_from_errno("got_opentempfd");
5239 e6e73e55 2022-06-30 tracey fd2 = got_opentempfd();
5240 e6e73e55 2022-06-30 tracey if (fd2 == -1) {
5241 e6e73e55 2022-06-30 tracey err = got_error_from_errno("got_opentempfd");
5242 e6e73e55 2022-06-30 tracey goto done;
5245 e6e73e55 2022-06-30 tracey f1 = got_opentemp();
5246 e6e73e55 2022-06-30 tracey if (f1 == NULL) {
5247 e6e73e55 2022-06-30 tracey err = (void *)got_error_from_errno("got_opentemp");
5248 e6e73e55 2022-06-30 tracey goto done;
5250 e6e73e55 2022-06-30 tracey f2 = got_opentemp();
5251 e6e73e55 2022-06-30 tracey if (f2 == NULL) {
5252 e6e73e55 2022-06-30 tracey err = (void *)got_error_from_errno("got_opentemp");
5253 e6e73e55 2022-06-30 tracey goto done;
5256 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
5258 e6e73e55 2022-06-30 tracey goto done;
5260 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
5261 917d79a7 2022-07-01 stsp tog_diff_algo, blame_cb, ta->cb_args,
5262 4b752015 2022-06-30 stsp ta->cancel_cb, ta->cancel_arg, fd1, fd2, f1, f2);
5263 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
5264 fc06ba56 2019-08-22 stsp err = NULL;
5266 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
5267 e6e73e55 2022-06-30 tracey if (errcode) {
5268 e6e73e55 2022-06-30 tracey err = got_error_set_errno(errcode, "pthread_mutex_lock");
5269 e6e73e55 2022-06-30 tracey goto done;
5272 1d0f4054 2021-06-17 stsp close_err = got_repo_close(ta->repo);
5273 1d0f4054 2021-06-17 stsp if (err == NULL)
5274 1d0f4054 2021-06-17 stsp err = close_err;
5275 c9beca56 2018-07-22 stsp ta->repo = NULL;
5276 c9beca56 2018-07-22 stsp *ta->complete = 1;
5278 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
5279 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
5280 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
5283 e6e73e55 2022-06-30 tracey if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5284 1b484788 2022-06-28 tracey err = got_error_from_errno("close");
5285 e6e73e55 2022-06-30 tracey if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5286 e6e73e55 2022-06-30 tracey err = got_error_from_errno("close");
5287 e6e73e55 2022-06-30 tracey if (f1 && fclose(f1) == EOF && err == NULL)
5288 e6e73e55 2022-06-30 tracey err = got_error_from_errno("fclose");
5289 e6e73e55 2022-06-30 tracey if (f2 && fclose(f2) == EOF && err == NULL)
5290 e6e73e55 2022-06-30 tracey err = got_error_from_errno("fclose");
5292 18430de3 2018-07-10 stsp return (void *)err;
5295 245d91c1 2018-07-12 stsp static struct got_object_id *
5296 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
5297 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
5299 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
5301 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
5302 8d0fe45a 2019-08-12 stsp return NULL;
5304 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
5305 c0f61fa4 2022-07-11 mark if (!line->annotated)
5306 c0f61fa4 2022-07-11 mark return NULL;
5308 c0f61fa4 2022-07-11 mark return line->id;
5311 c0f61fa4 2022-07-11 mark static struct got_object_id *
5312 c0f61fa4 2022-07-11 mark get_annotation_for_line(struct tog_blame_line *lines, int nlines,
5313 c0f61fa4 2022-07-11 mark int lineno)
5315 c0f61fa4 2022-07-11 mark struct tog_blame_line *line;
5317 c0f61fa4 2022-07-11 mark if (nlines <= 0 || lineno >= nlines)
5318 c0f61fa4 2022-07-11 mark return NULL;
5320 c0f61fa4 2022-07-11 mark line = &lines[lineno - 1];
5321 245d91c1 2018-07-12 stsp if (!line->annotated)
5322 245d91c1 2018-07-12 stsp return NULL;
5324 245d91c1 2018-07-12 stsp return line->id;
5327 b880a918 2018-07-10 stsp static const struct got_error *
5328 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
5330 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
5333 245d91c1 2018-07-12 stsp if (blame->thread) {
5334 1a76625f 2018-10-22 stsp int errcode;
5335 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
5336 1a76625f 2018-10-22 stsp if (errcode)
5337 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
5338 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
5339 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
5340 1a76625f 2018-10-22 stsp if (errcode)
5341 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
5342 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
5343 1a76625f 2018-10-22 stsp if (errcode)
5344 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
5345 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
5346 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
5347 245d91c1 2018-07-12 stsp err = NULL;
5348 245d91c1 2018-07-12 stsp blame->thread = NULL;
5350 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
5351 1d0f4054 2021-06-17 stsp const struct got_error *close_err;
5352 1d0f4054 2021-06-17 stsp close_err = got_repo_close(blame->thread_args.repo);
5353 1d0f4054 2021-06-17 stsp if (err == NULL)
5354 1d0f4054 2021-06-17 stsp err = close_err;
5355 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
5357 245d91c1 2018-07-12 stsp if (blame->f) {
5358 56b63ca4 2021-01-22 stsp if (fclose(blame->f) == EOF && err == NULL)
5359 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
5360 245d91c1 2018-07-12 stsp blame->f = NULL;
5362 57670559 2018-12-23 stsp if (blame->lines) {
5363 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
5364 57670559 2018-12-23 stsp free(blame->lines[i].id);
5365 57670559 2018-12-23 stsp free(blame->lines);
5366 57670559 2018-12-23 stsp blame->lines = NULL;
5368 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
5369 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
5370 0ae84acc 2022-06-15 tracey if (blame->pack_fds) {
5371 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
5372 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(blame->pack_fds);
5373 0ae84acc 2022-06-15 tracey if (err == NULL)
5374 0ae84acc 2022-06-15 tracey err = pack_err;
5375 8b195234 2022-06-15 stsp blame->pack_fds = NULL;
5377 245d91c1 2018-07-12 stsp return err;
5380 245d91c1 2018-07-12 stsp static const struct got_error *
5381 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
5383 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
5384 fc06ba56 2019-08-22 stsp int *done = arg;
5385 fc06ba56 2019-08-22 stsp int errcode;
5387 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
5388 fc06ba56 2019-08-22 stsp if (errcode)
5389 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
5390 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
5392 fc06ba56 2019-08-22 stsp if (*done)
5393 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
5395 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
5396 fc06ba56 2019-08-22 stsp if (errcode)
5397 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
5398 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
5400 fc06ba56 2019-08-22 stsp return err;
5403 fc06ba56 2019-08-22 stsp static const struct got_error *
5404 a5388363 2020-12-01 naddy run_blame(struct tog_view *view)
5406 a5388363 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
5407 a5388363 2020-12-01 naddy struct tog_blame *blame = &s->blame;
5408 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
5409 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
5410 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
5411 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
5412 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
5413 eb81bc23 2022-06-28 tracey int obj_type, fd = -1;
5414 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
5416 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, s->repo,
5417 d7b5a0e8 2022-04-20 stsp &s->blamed_commit->id);
5419 15a94983 2018-12-23 stsp return err;
5421 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
5422 eb81bc23 2022-06-28 tracey if (fd == -1) {
5423 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
5424 eb81bc23 2022-06-28 tracey goto done;
5427 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&obj_id, s->repo, commit, s->path);
5429 a44927cc 2022-04-07 stsp goto done;
5431 a5388363 2020-12-01 naddy err = got_object_get_type(&obj_type, s->repo, obj_id);
5433 84451b3e 2018-07-10 stsp goto done;
5435 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
5436 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
5437 84451b3e 2018-07-10 stsp goto done;
5440 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, s->repo, obj_id, 8192, fd);
5442 a70480e0 2018-06-23 stsp goto done;
5443 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
5444 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
5445 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
5446 84451b3e 2018-07-10 stsp goto done;
5448 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
5449 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
5451 1fddf795 2021-01-20 stsp goto done;
5452 1fddf795 2021-01-20 stsp if (blame->nlines == 0) {
5453 1fddf795 2021-01-20 stsp s->blame_complete = 1;
5454 84451b3e 2018-07-10 stsp goto done;
5457 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
5458 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
5459 b02560ec 2019-08-19 stsp blame->nlines--;
5461 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
5462 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
5463 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
5464 84451b3e 2018-07-10 stsp goto done;
5467 0ae84acc 2022-06-15 tracey err = got_repo_pack_fds_open(&pack_fds);
5469 bd24772e 2018-07-11 stsp goto done;
5470 0ae84acc 2022-06-15 tracey err = got_repo_open(&thread_repo, got_repo_get_path(s->repo), NULL,
5471 0ae84acc 2022-06-15 tracey pack_fds);
5472 0ae84acc 2022-06-15 tracey if (err)
5473 0ae84acc 2022-06-15 tracey goto done;
5475 0ae84acc 2022-06-15 tracey blame->pack_fds = pack_fds;
5476 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
5477 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
5478 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
5479 d7b5a0e8 2022-04-20 stsp blame->cb_args.commit_id = got_object_id_dup(&s->blamed_commit->id);
5480 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
5481 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5482 245d91c1 2018-07-12 stsp goto done;
5484 a5388363 2020-12-01 naddy blame->cb_args.quit = &s->done;
5486 a5388363 2020-12-01 naddy blame->thread_args.path = s->path;
5487 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
5488 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
5489 a5388363 2020-12-01 naddy blame->thread_args.complete = &s->blame_complete;
5490 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
5491 a5388363 2020-12-01 naddy blame->thread_args.cancel_arg = &s->done;
5492 a5388363 2020-12-01 naddy s->blame_complete = 0;
5494 f5a09613 2020-12-13 naddy if (s->first_displayed_line + view->nlines - 1 > blame->nlines) {
5495 f5a09613 2020-12-13 naddy s->first_displayed_line = 1;
5496 f5a09613 2020-12-13 naddy s->last_displayed_line = view->nlines;
5497 f5a09613 2020-12-13 naddy s->selected_line = 1;
5499 67b5eae1 2021-12-27 naddy s->matched_line = 0;
5502 a44927cc 2022-04-07 stsp if (commit)
5503 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
5504 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
5505 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
5507 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
5508 27d434c2 2018-09-15 stsp free(obj_id);
5510 245d91c1 2018-07-12 stsp stop_blame(blame);
5511 245d91c1 2018-07-12 stsp return err;
5514 245d91c1 2018-07-12 stsp static const struct got_error *
5515 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
5516 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5518 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
5519 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
5521 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->blamed_commits);
5523 c4843652 2019-08-12 stsp s->path = strdup(path);
5524 c4843652 2019-08-12 stsp if (s->path == NULL)
5525 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
5527 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
5528 c4843652 2019-08-12 stsp if (err) {
5529 c4843652 2019-08-12 stsp free(s->path);
5530 7cbe629d 2018-08-04 stsp return err;
5533 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
5534 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
5535 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
5536 fb2756b9 2018-08-04 stsp s->selected_line = 1;
5537 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
5538 fb2756b9 2018-08-04 stsp s->repo = repo;
5539 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
5540 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
5542 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
5543 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5544 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
5545 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
5547 11b20872 2019-11-08 stsp return err;
5550 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
5551 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
5552 917d79a7 2022-07-01 stsp view->reset = reset_blame_view;
5553 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
5554 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
5555 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
5557 a5388363 2020-12-01 naddy return run_blame(view);
5560 e5a0f69f 2018-08-18 stsp static const struct got_error *
5561 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
5563 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5564 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
5566 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
5567 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
5569 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&s->blamed_commits)) {
5570 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
5571 dbdddfee 2021-06-23 naddy blamed_commit = STAILQ_FIRST(&s->blamed_commits);
5572 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
5573 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
5576 e5a0f69f 2018-08-18 stsp free(s->path);
5577 11b20872 2019-11-08 stsp free_colors(&s->colors);
5578 e5a0f69f 2018-08-18 stsp return err;
5581 7cbe629d 2018-08-04 stsp static const struct got_error *
5582 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
5584 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
5586 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
5587 6c4c42e0 2019-06-24 stsp return NULL;
5590 6c4c42e0 2019-06-24 stsp static const struct got_error *
5591 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
5593 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
5594 145b6838 2022-06-16 stsp const struct got_error *err = NULL;
5595 6c4c42e0 2019-06-24 stsp int lineno;
5596 cb713507 2022-06-16 stsp char *line = NULL;
5597 826082fe 2020-12-10 stsp size_t linesize = 0;
5598 826082fe 2020-12-10 stsp ssize_t linelen;
5600 6c4c42e0 2019-06-24 stsp if (!view->searching) {
5601 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5602 6c4c42e0 2019-06-24 stsp return NULL;
5605 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
5606 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
5607 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
5609 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
5611 487cd7d2 2021-12-17 stsp lineno = s->first_displayed_line - 1 + s->selected_line;
5613 6c4c42e0 2019-06-24 stsp while (1) {
5614 6c4c42e0 2019-06-24 stsp off_t offset;
5616 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
5617 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
5618 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5622 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
5623 6c4c42e0 2019-06-24 stsp lineno = 1;
5625 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
5628 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
5629 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
5630 6c4c42e0 2019-06-24 stsp free(line);
5631 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
5633 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->blame.f);
5634 cb713507 2022-06-16 stsp if (linelen != -1) {
5635 cb713507 2022-06-16 stsp char *exstr;
5636 cb713507 2022-06-16 stsp err = expand_tab(&exstr, line);
5639 cb713507 2022-06-16 stsp if (match_line(exstr, &view->regex, 1,
5640 cb713507 2022-06-16 stsp &view->regmatch)) {
5641 cb713507 2022-06-16 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5642 cb713507 2022-06-16 stsp s->matched_line = lineno;
5643 cb713507 2022-06-16 stsp free(exstr);
5646 cb713507 2022-06-16 stsp free(exstr);
5648 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
5653 826082fe 2020-12-10 stsp free(line);
5655 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
5656 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
5657 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
5660 145b6838 2022-06-16 stsp return err;
5663 6c4c42e0 2019-06-24 stsp static const struct got_error *
5664 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
5666 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5667 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
5668 2b380cc8 2018-10-24 stsp int errcode;
5670 1fddf795 2021-01-20 stsp if (s->blame.thread == NULL && !s->blame_complete) {
5671 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
5672 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
5673 2b380cc8 2018-10-24 stsp if (errcode)
5674 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
5676 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
5679 51fe7530 2019-08-19 stsp if (s->blame_complete)
5680 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
5682 4f7c3e5e 2020-12-01 naddy err = draw_blame(view);
5684 9b058f45 2022-06-30 mark view_border(view);
5685 e5a0f69f 2018-08-18 stsp return err;
5688 e5a0f69f 2018-08-18 stsp static const struct got_error *
5689 05f04cdf 2022-07-20 mark log_annotated_line(struct tog_view **new_view, int begin_y, int begin_x,
5690 05f04cdf 2022-07-20 mark struct got_repository *repo, struct got_object_id *id)
5692 05f04cdf 2022-07-20 mark struct tog_view *log_view;
5693 05f04cdf 2022-07-20 mark const struct got_error *err = NULL;
5695 05f04cdf 2022-07-20 mark *new_view = NULL;
5697 05f04cdf 2022-07-20 mark log_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_LOG);
5698 05f04cdf 2022-07-20 mark if (log_view == NULL)
5699 05f04cdf 2022-07-20 mark return got_error_from_errno("view_open");
5701 05f04cdf 2022-07-20 mark err = open_log_view(log_view, id, repo, GOT_REF_HEAD, "", 0);
5703 05f04cdf 2022-07-20 mark view_close(log_view);
5705 05f04cdf 2022-07-20 mark *new_view = log_view;
5707 05f04cdf 2022-07-20 mark return err;
5710 05f04cdf 2022-07-20 mark static const struct got_error *
5711 e78dc838 2020-12-04 stsp input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
5713 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
5714 136e2bd4 2022-07-23 mark struct tog_view *diff_view;
5715 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
5716 9b058f45 2022-06-30 mark int eos, nscroll, begin_y = 0, begin_x = 0;
5718 9b058f45 2022-06-30 mark eos = nscroll = view->nlines - 2;
5719 49b24ee5 2022-07-03 mark if (view_is_hsplit_top(view))
5720 9b058f45 2022-06-30 mark --eos; /* border */
5722 e5a0f69f 2018-08-18 stsp switch (ch) {
5724 145b6838 2022-06-16 stsp view->x = 0;
5727 145b6838 2022-06-16 stsp view->x = MAX(view->maxx - view->ncols / 3, 0);
5728 640cd7ff 2022-06-22 mark view->count = 0;
5730 145b6838 2022-06-16 stsp case KEY_RIGHT:
5732 145b6838 2022-06-16 stsp if (view->x + view->ncols / 3 < view->maxx)
5733 145b6838 2022-06-16 stsp view->x += 2; /* move two columns right */
5735 640cd7ff 2022-06-22 mark view->count = 0;
5737 145b6838 2022-06-16 stsp case KEY_LEFT:
5739 145b6838 2022-06-16 stsp view->x -= MIN(view->x, 2); /* move two columns back */
5740 640cd7ff 2022-06-22 mark if (view->x <= 0)
5741 640cd7ff 2022-06-22 mark view->count = 0;
5744 1e37a5c2 2019-05-12 jcs s->done = 1;
5746 4deef56f 2021-09-02 naddy case 'g':
5747 4deef56f 2021-09-02 naddy case KEY_HOME:
5748 4deef56f 2021-09-02 naddy s->selected_line = 1;
5749 4deef56f 2021-09-02 naddy s->first_displayed_line = 1;
5750 640cd7ff 2022-06-22 mark view->count = 0;
5752 4deef56f 2021-09-02 naddy case 'G':
5753 4deef56f 2021-09-02 naddy case KEY_END:
5754 9b058f45 2022-06-30 mark if (s->blame.nlines < eos) {
5755 4deef56f 2021-09-02 naddy s->selected_line = s->blame.nlines;
5756 4deef56f 2021-09-02 naddy s->first_displayed_line = 1;
5758 9b058f45 2022-06-30 mark s->selected_line = eos;
5759 9b058f45 2022-06-30 mark s->first_displayed_line = s->blame.nlines - (eos - 1);
5761 640cd7ff 2022-06-22 mark view->count = 0;
5764 1e37a5c2 2019-05-12 jcs case KEY_UP:
5765 02ffd0d5 2021-10-17 stsp case CTRL('p'):
5766 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
5767 1e37a5c2 2019-05-12 jcs s->selected_line--;
5768 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
5769 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
5770 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
5772 640cd7ff 2022-06-22 mark view->count = 0;
5774 83cc4199 2022-06-13 stsp case CTRL('u'):
5776 83cc4199 2022-06-13 stsp nscroll /= 2;
5777 83cc4199 2022-06-13 stsp /* FALL THROUGH */
5778 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5779 ea025d1d 2020-02-22 naddy case CTRL('b'):
5781 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
5782 640cd7ff 2022-06-22 mark if (view->count > 1)
5783 640cd7ff 2022-06-22 mark nscroll += nscroll;
5784 83cc4199 2022-06-13 stsp s->selected_line = MAX(1, s->selected_line - nscroll);
5785 640cd7ff 2022-06-22 mark view->count = 0;
5788 83cc4199 2022-06-13 stsp if (s->first_displayed_line > nscroll)
5789 83cc4199 2022-06-13 stsp s->first_displayed_line -= nscroll;
5791 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
5794 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5795 02ffd0d5 2021-10-17 stsp case CTRL('n'):
5796 9b058f45 2022-06-30 mark if (s->selected_line < eos && s->first_displayed_line +
5797 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
5798 1e37a5c2 2019-05-12 jcs s->selected_line++;
5799 9b058f45 2022-06-30 mark else if (s->first_displayed_line < s->blame.nlines - (eos - 1))
5800 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
5802 640cd7ff 2022-06-22 mark view->count = 0;
5805 1e37a5c2 2019-05-12 jcs case 'p': {
5806 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
5808 640cd7ff 2022-06-22 mark view->count = 0;
5809 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
5810 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
5811 1e37a5c2 2019-05-12 jcs if (id == NULL)
5813 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
5814 a44927cc 2022-04-07 stsp struct got_commit_object *commit, *pcommit;
5815 15a94983 2018-12-23 stsp struct got_object_qid *pid;
5816 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
5817 1e37a5c2 2019-05-12 jcs int obj_type;
5818 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
5819 1e37a5c2 2019-05-12 jcs s->repo, id);
5822 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(
5823 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
5824 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
5825 15a94983 2018-12-23 stsp got_object_commit_close(commit);
5828 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
5829 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&pcommit,
5830 d7b5a0e8 2022-04-20 stsp s->repo, &pid->id);
5833 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
5834 a44927cc 2022-04-07 stsp pcommit, s->path);
5835 a44927cc 2022-04-07 stsp got_object_commit_close(pcommit);
5836 e5a0f69f 2018-08-18 stsp if (err) {
5837 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
5838 1e37a5c2 2019-05-12 jcs err = NULL;
5839 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5842 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
5844 1e37a5c2 2019-05-12 jcs free(blob_id);
5845 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
5846 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
5847 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5850 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
5851 d7b5a0e8 2022-04-20 stsp &pid->id);
5852 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5854 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
5855 d7b5a0e8 2022-04-20 stsp &s->blamed_commit->id) == 0)
5857 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
5862 1e37a5c2 2019-05-12 jcs s->done = 1;
5863 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
5864 1e37a5c2 2019-05-12 jcs s->done = 0;
5865 1e37a5c2 2019-05-12 jcs if (thread_err)
5867 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(&s->blamed_commits,
5868 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
5869 a5388363 2020-12-01 naddy err = run_blame(view);
5874 61417565 2022-06-20 mark case 'C': {
5875 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
5877 640cd7ff 2022-06-22 mark view->count = 0;
5878 dbdddfee 2021-06-23 naddy first = STAILQ_FIRST(&s->blamed_commits);
5879 d7b5a0e8 2022-04-20 stsp if (!got_object_id_cmp(&first->id, s->commit_id))
5881 1e37a5c2 2019-05-12 jcs s->done = 1;
5882 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
5883 1e37a5c2 2019-05-12 jcs s->done = 0;
5884 1e37a5c2 2019-05-12 jcs if (thread_err)
5886 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
5887 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
5888 1e37a5c2 2019-05-12 jcs s->blamed_commit =
5889 dbdddfee 2021-06-23 naddy STAILQ_FIRST(&s->blamed_commits);
5890 a5388363 2020-12-01 naddy err = run_blame(view);
5896 05f04cdf 2022-07-20 mark view->count = 0;
5897 136e2bd4 2022-07-23 mark s->id_to_log = get_selected_commit_id(s->blame.lines,
5898 136e2bd4 2022-07-23 mark s->blame.nlines, s->first_displayed_line, s->selected_line);
5899 136e2bd4 2022-07-23 mark if (s->id_to_log)
5900 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_LOG);
5902 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5903 1e37a5c2 2019-05-12 jcs case '\r': {
5904 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
5905 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
5906 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
5908 640cd7ff 2022-06-22 mark view->count = 0;
5909 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
5910 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
5911 1e37a5c2 2019-05-12 jcs if (id == NULL)
5913 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
5916 9b058f45 2022-06-30 mark pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
5917 c0f61fa4 2022-07-11 mark if (*new_view) {
5918 c0f61fa4 2022-07-11 mark /* traversed from diff view, release diff resources */
5919 c0f61fa4 2022-07-11 mark err = close_diff_view(*new_view);
5922 c0f61fa4 2022-07-11 mark diff_view = *new_view;
5924 c0f61fa4 2022-07-11 mark if (view_is_parent_view(view))
5925 c0f61fa4 2022-07-11 mark view_get_split(view, &begin_y, &begin_x);
5927 c0f61fa4 2022-07-11 mark diff_view = view_open(0, 0, begin_y, begin_x,
5928 c0f61fa4 2022-07-11 mark TOG_VIEW_DIFF);
5929 c0f61fa4 2022-07-11 mark if (diff_view == NULL) {
5930 c0f61fa4 2022-07-11 mark got_object_commit_close(commit);
5931 c0f61fa4 2022-07-11 mark err = got_error_from_errno("view_open");
5935 d7b5a0e8 2022-04-20 stsp err = open_diff_view(diff_view, pid ? &pid->id : NULL,
5936 c0f61fa4 2022-07-11 mark id, NULL, NULL, 3, 0, 0, view, s->repo);
5937 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5939 1e37a5c2 2019-05-12 jcs view_close(diff_view);
5942 c0f61fa4 2022-07-11 mark s->last_diffed_line = s->first_displayed_line - 1 +
5943 c0f61fa4 2022-07-11 mark s->selected_line;
5944 c0f61fa4 2022-07-11 mark if (*new_view)
5945 c0f61fa4 2022-07-11 mark break; /* still open from active diff view */
5946 49b24ee5 2022-07-03 mark if (view_is_parent_view(view) &&
5947 49b24ee5 2022-07-03 mark view->mode == TOG_VIEW_SPLIT_HRZN) {
5948 9b058f45 2022-06-30 mark err = view_init_hsplit(view, begin_y);
5953 e78dc838 2020-12-04 stsp view->focussed = 0;
5954 e78dc838 2020-12-04 stsp diff_view->focussed = 1;
5955 9b058f45 2022-06-30 mark diff_view->mode = view->mode;
5956 9b058f45 2022-06-30 mark diff_view->nlines = view->lines - begin_y;
5957 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5958 3c1dfe12 2022-07-08 mark view_transfer_size(diff_view, view);
5959 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5962 0dbbbe90 2022-06-17 op err = view_set_child(view, diff_view);
5965 e78dc838 2020-12-04 stsp view->focus_child = 1;
5967 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
5972 83cc4199 2022-06-13 stsp case CTRL('d'):
5974 83cc4199 2022-06-13 stsp nscroll /= 2;
5975 83cc4199 2022-06-13 stsp /* FALL THROUGH */
5976 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5977 ea025d1d 2020-02-22 naddy case CTRL('f'):
5980 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
5981 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
5982 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
5983 640cd7ff 2022-06-22 mark view->count = 0;
5986 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
5987 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
5988 83cc4199 2022-06-13 stsp s->selected_line +=
5989 83cc4199 2022-06-13 stsp MIN(nscroll, s->last_displayed_line -
5990 83cc4199 2022-06-13 stsp s->first_displayed_line - s->selected_line + 1);
5992 83cc4199 2022-06-13 stsp if (s->last_displayed_line + nscroll <= s->blame.nlines)
5993 83cc4199 2022-06-13 stsp s->first_displayed_line += nscroll;
5995 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
5996 83cc4199 2022-06-13 stsp s->blame.nlines - (view->nlines - 3);
5998 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5999 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
6000 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
6001 1e37a5c2 2019-05-12 jcs view->nlines - 2);
6005 640cd7ff 2022-06-22 mark view->count = 0;
6008 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
6011 917d79a7 2022-07-01 stsp static const struct got_error *
6012 917d79a7 2022-07-01 stsp reset_blame_view(struct tog_view *view)
6014 917d79a7 2022-07-01 stsp const struct got_error *err;
6015 917d79a7 2022-07-01 stsp struct tog_blame_view_state *s = &view->state.blame;
6017 917d79a7 2022-07-01 stsp view->count = 0;
6018 917d79a7 2022-07-01 stsp s->done = 1;
6019 917d79a7 2022-07-01 stsp err = stop_blame(&s->blame);
6020 917d79a7 2022-07-01 stsp s->done = 0;
6022 917d79a7 2022-07-01 stsp return err;
6023 917d79a7 2022-07-01 stsp return run_blame(view);
6026 a70480e0 2018-06-23 stsp static const struct got_error *
6027 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
6029 a70480e0 2018-06-23 stsp const struct got_error *error;
6030 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
6031 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
6032 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6033 0587e10c 2020-07-23 stsp char *link_target = NULL;
6034 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
6035 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
6036 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
6038 e1cd8fed 2018-08-01 stsp struct tog_view *view;
6039 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
6041 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
6042 a70480e0 2018-06-23 stsp switch (ch) {
6044 a70480e0 2018-06-23 stsp commit_id_str = optarg;
6047 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
6048 69069811 2018-08-02 stsp if (repo_path == NULL)
6049 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
6053 17020d27 2019-03-07 stsp usage_blame();
6054 a70480e0 2018-06-23 stsp /* NOTREACHED */
6058 a70480e0 2018-06-23 stsp argc -= optind;
6059 a70480e0 2018-06-23 stsp argv += optind;
6061 f135c941 2020-02-20 stsp if (argc != 1)
6062 a70480e0 2018-06-23 stsp usage_blame();
6064 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
6065 0ae84acc 2022-06-15 tracey if (error != NULL)
6066 0ae84acc 2022-06-15 tracey goto done;
6068 69069811 2018-08-02 stsp if (repo_path == NULL) {
6069 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
6070 c156c7a4 2020-12-18 stsp if (cwd == NULL)
6071 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
6072 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
6073 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6074 c156c7a4 2020-12-18 stsp goto done;
6075 f135c941 2020-02-20 stsp if (worktree)
6076 eb41ed75 2019-02-05 stsp repo_path =
6077 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
6079 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
6080 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
6081 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
6082 c156c7a4 2020-12-18 stsp goto done;
6086 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6087 c02c541e 2019-03-29 stsp if (error != NULL)
6088 8e94dd5b 2019-01-04 stsp goto done;
6090 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
6091 f135c941 2020-02-20 stsp worktree);
6092 c02c541e 2019-03-29 stsp if (error)
6093 92205607 2019-01-04 stsp goto done;
6095 f135c941 2020-02-20 stsp init_curses();
6097 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
6098 51a10b52 2020-12-26 stsp if (error)
6099 51a10b52 2020-12-26 stsp goto done;
6101 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
6102 eb41ed75 2019-02-05 stsp if (error)
6103 69069811 2018-08-02 stsp goto done;
6105 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
6106 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
6107 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
6108 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
6109 a70480e0 2018-06-23 stsp if (error != NULL)
6110 66b4983c 2018-06-23 stsp goto done;
6111 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
6112 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
6114 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
6115 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
6117 a19e88aa 2018-06-23 stsp if (error != NULL)
6118 8b473291 2019-02-21 stsp goto done;
6120 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
6121 e1cd8fed 2018-08-01 stsp if (view == NULL) {
6122 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
6123 e1cd8fed 2018-08-01 stsp goto done;
6126 a44927cc 2022-04-07 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6127 a44927cc 2022-04-07 stsp if (error)
6128 a44927cc 2022-04-07 stsp goto done;
6130 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
6131 a44927cc 2022-04-07 stsp commit, repo);
6132 7cbe629d 2018-08-04 stsp if (error)
6133 7cbe629d 2018-08-04 stsp goto done;
6135 0587e10c 2020-07-23 stsp error = open_blame_view(view, link_target ? link_target : in_repo_path,
6136 78756c87 2020-11-24 stsp commit_id, repo);
6137 0587e10c 2020-07-23 stsp if (error)
6138 0587e10c 2020-07-23 stsp goto done;
6139 12314ad4 2019-08-31 stsp if (worktree) {
6140 12314ad4 2019-08-31 stsp /* Release work tree lock. */
6141 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
6142 12314ad4 2019-08-31 stsp worktree = NULL;
6144 e5a0f69f 2018-08-18 stsp error = view_loop(view);
6146 69069811 2018-08-02 stsp free(repo_path);
6147 f135c941 2020-02-20 stsp free(in_repo_path);
6148 0587e10c 2020-07-23 stsp free(link_target);
6149 69069811 2018-08-02 stsp free(cwd);
6150 a70480e0 2018-06-23 stsp free(commit_id);
6151 a44927cc 2022-04-07 stsp if (commit)
6152 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
6153 eb41ed75 2019-02-05 stsp if (worktree)
6154 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
6155 1d0f4054 2021-06-17 stsp if (repo) {
6156 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
6157 1d0f4054 2021-06-17 stsp if (error == NULL)
6158 1d0f4054 2021-06-17 stsp error = close_err;
6160 0ae84acc 2022-06-15 tracey if (pack_fds) {
6161 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
6162 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
6163 0ae84acc 2022-06-15 tracey if (error == NULL)
6164 0ae84acc 2022-06-15 tracey error = pack_err;
6166 51a10b52 2020-12-26 stsp tog_free_refs();
6167 a70480e0 2018-06-23 stsp return error;
6170 ffd1d5e5 2018-06-23 stsp static const struct got_error *
6171 d86d3b18 2020-12-01 naddy draw_tree_entries(struct tog_view *view, const char *parent_path)
6173 d86d3b18 2020-12-01 naddy struct tog_tree_view_state *s = &view->state.tree;
6174 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
6175 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
6176 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
6177 f26dddb7 2019-11-08 stsp struct tog_color *tc;
6178 56e0773d 2019-11-28 stsp int width, n, i, nentries;
6179 d86d3b18 2020-12-01 naddy int limit = view->nlines;
6181 d86d3b18 2020-12-01 naddy s->ndisplayed = 0;
6182 49b24ee5 2022-07-03 mark if (view_is_hsplit_top(view))
6183 9b058f45 2022-06-30 mark --limit; /* border */
6185 f7d12f7e 2018-08-01 stsp werase(view->window);
6187 ffd1d5e5 2018-06-23 stsp if (limit == 0)
6188 ffd1d5e5 2018-06-23 stsp return NULL;
6190 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, s->tree_label, 0, view->ncols,
6193 ffd1d5e5 2018-06-23 stsp return err;
6194 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
6195 a3404814 2018-09-02 stsp wstandout(view->window);
6196 d86d3b18 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
6198 11b20872 2019-11-08 stsp wattr_on(view->window,
6199 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
6200 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
6202 11b20872 2019-11-08 stsp wattr_off(view->window,
6203 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
6204 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
6205 a3404814 2018-09-02 stsp wstandend(view->window);
6206 2550e4c3 2018-07-13 stsp free(wline);
6207 2550e4c3 2018-07-13 stsp wline = NULL;
6208 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
6209 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
6210 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
6211 ffd1d5e5 2018-06-23 stsp return NULL;
6212 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, parent_path, 0, view->ncols,
6215 ce52c690 2018-06-23 stsp return err;
6216 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
6217 2550e4c3 2018-07-13 stsp free(wline);
6218 2550e4c3 2018-07-13 stsp wline = NULL;
6219 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
6220 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
6221 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
6222 ffd1d5e5 2018-06-23 stsp return NULL;
6223 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
6224 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
6225 a1eca9bb 2018-06-23 stsp return NULL;
6227 d86d3b18 2020-12-01 naddy if (s->first_displayed_entry == NULL) {
6228 d86d3b18 2020-12-01 naddy te = got_object_tree_get_first_entry(s->tree);
6229 d86d3b18 2020-12-01 naddy if (s->selected == 0) {
6230 0cf4efb1 2018-09-29 stsp if (view->focussed)
6231 0cf4efb1 2018-09-29 stsp wstandout(view->window);
6232 d86d3b18 2020-12-01 naddy s->selected_entry = NULL;
6234 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
6235 d86d3b18 2020-12-01 naddy if (s->selected == 0 && view->focussed)
6236 f7d12f7e 2018-08-01 stsp wstandend(view->window);
6237 d86d3b18 2020-12-01 naddy s->ndisplayed++;
6238 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
6239 ffd1d5e5 2018-06-23 stsp return NULL;
6243 d86d3b18 2020-12-01 naddy te = s->first_displayed_entry;
6246 d86d3b18 2020-12-01 naddy nentries = got_object_tree_get_nentries(s->tree);
6247 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
6248 0d6c6ee3 2020-05-20 stsp char *line = NULL, *id_str = NULL, *link_target = NULL;
6249 848d6979 2019-08-12 stsp const char *modestr = "";
6250 56e0773d 2019-11-28 stsp mode_t mode;
6252 d86d3b18 2020-12-01 naddy te = got_object_tree_get_entry(s->tree, i);
6253 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
6255 d86d3b18 2020-12-01 naddy if (s->show_ids) {
6256 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
6257 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
6259 638f9024 2019-05-13 stsp return got_error_from_errno(
6260 230a42bd 2019-05-11 jcs "got_object_id_str");
6262 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
6263 63c5ca5d 2019-08-24 stsp modestr = "$";
6264 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
6267 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target,
6268 d86d3b18 2020-12-01 naddy te, s->repo);
6269 0d6c6ee3 2020-05-20 stsp if (err) {
6270 0d6c6ee3 2020-05-20 stsp free(id_str);
6271 0d6c6ee3 2020-05-20 stsp return err;
6273 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
6274 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
6275 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
6277 848d6979 2019-08-12 stsp modestr = "@";
6279 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
6280 848d6979 2019-08-12 stsp modestr = "/";
6281 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
6282 848d6979 2019-08-12 stsp modestr = "*";
6283 0d6c6ee3 2020-05-20 stsp if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
6284 0d6c6ee3 2020-05-20 stsp got_tree_entry_get_name(te), modestr,
6285 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "",
6286 0d6c6ee3 2020-05-20 stsp link_target ? link_target : "") == -1) {
6287 1d13200f 2018-07-12 stsp free(id_str);
6288 0d6c6ee3 2020-05-20 stsp free(link_target);
6289 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
6291 1d13200f 2018-07-12 stsp free(id_str);
6292 0d6c6ee3 2020-05-20 stsp free(link_target);
6293 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols,
6295 ffd1d5e5 2018-06-23 stsp if (err) {
6296 ffd1d5e5 2018-06-23 stsp free(line);
6299 d86d3b18 2020-12-01 naddy if (n == s->selected) {
6300 0cf4efb1 2018-09-29 stsp if (view->focussed)
6301 0cf4efb1 2018-09-29 stsp wstandout(view->window);
6302 d86d3b18 2020-12-01 naddy s->selected_entry = te;
6304 d86d3b18 2020-12-01 naddy tc = match_color(&s->colors, line);
6306 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
6307 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
6308 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
6310 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
6311 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
6312 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
6313 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
6314 d86d3b18 2020-12-01 naddy if (n == s->selected && view->focussed)
6315 f7d12f7e 2018-08-01 stsp wstandend(view->window);
6316 ffd1d5e5 2018-06-23 stsp free(line);
6317 2550e4c3 2018-07-13 stsp free(wline);
6318 2550e4c3 2018-07-13 stsp wline = NULL;
6320 d86d3b18 2020-12-01 naddy s->ndisplayed++;
6321 d86d3b18 2020-12-01 naddy s->last_displayed_entry = te;
6322 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
6326 ffd1d5e5 2018-06-23 stsp return err;
6329 ffd1d5e5 2018-06-23 stsp static void
6330 3e135950 2020-12-01 naddy tree_scroll_up(struct tog_tree_view_state *s, int maxscroll)
6332 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
6333 694d3271 2020-12-01 naddy int isroot = s->tree == s->root;
6334 fa86c4bf 2020-11-29 stsp int i = 0;
6336 694d3271 2020-12-01 naddy if (s->first_displayed_entry == NULL)
6339 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, s->first_displayed_entry);
6340 fa86c4bf 2020-11-29 stsp while (i++ < maxscroll) {
6341 fa86c4bf 2020-11-29 stsp if (te == NULL) {
6342 fa86c4bf 2020-11-29 stsp if (!isroot)
6343 694d3271 2020-12-01 naddy s->first_displayed_entry = NULL;
6346 694d3271 2020-12-01 naddy s->first_displayed_entry = te;
6347 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, te);
6351 9b058f45 2022-06-30 mark static const struct got_error *
6352 9b058f45 2022-06-30 mark tree_scroll_down(struct tog_view *view, int maxscroll)
6354 9b058f45 2022-06-30 mark struct tog_tree_view_state *s = &view->state.tree;
6355 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
6356 ffd1d5e5 2018-06-23 stsp int n = 0;
6358 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
6359 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree,
6360 694d3271 2020-12-01 naddy s->first_displayed_entry);
6362 694d3271 2020-12-01 naddy next = got_object_tree_get_first_entry(s->tree);
6364 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
6365 9b058f45 2022-06-30 mark while (next && n++ < maxscroll) {
6367 9b058f45 2022-06-30 mark last = got_tree_entry_get_next(s->tree, last);
6368 9b058f45 2022-06-30 mark if (last || (view->mode == TOG_VIEW_SPLIT_HRZN && next)) {
6369 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
6370 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree, next);
6374 9b058f45 2022-06-30 mark return NULL;
6377 ffd1d5e5 2018-06-23 stsp static const struct got_error *
6378 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
6379 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
6381 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
6382 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
6383 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
6385 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
6386 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
6387 56e0773d 2019-11-28 stsp + 1 /* slash */;
6389 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
6391 ce52c690 2018-06-23 stsp *path = calloc(1, len);
6392 ffd1d5e5 2018-06-23 stsp if (path == NULL)
6393 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
6395 ce52c690 2018-06-23 stsp (*path)[0] = '/';
6396 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
6397 d9765a41 2018-06-23 stsp while (pt) {
6398 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
6399 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
6400 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
6401 cb2ebc8a 2018-06-23 stsp goto done;
6403 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
6404 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
6405 cb2ebc8a 2018-06-23 stsp goto done;
6407 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
6410 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
6411 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
6412 ce52c690 2018-06-23 stsp goto done;
6416 ce52c690 2018-06-23 stsp if (err) {
6417 ce52c690 2018-06-23 stsp free(*path);
6418 ce52c690 2018-06-23 stsp *path = NULL;
6420 ce52c690 2018-06-23 stsp return err;
6423 ce52c690 2018-06-23 stsp static const struct got_error *
6424 9b058f45 2022-06-30 mark blame_tree_entry(struct tog_view **new_view, int begin_y, int begin_x,
6425 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
6426 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
6428 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
6429 ce52c690 2018-06-23 stsp char *path;
6430 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
6432 a0de39f3 2019-08-09 stsp *new_view = NULL;
6434 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
6436 ce52c690 2018-06-23 stsp return err;
6438 9b058f45 2022-06-30 mark blame_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_BLAME);
6439 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
6440 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
6441 83ce39e3 2019-08-12 stsp goto done;
6444 78756c87 2020-11-24 stsp err = open_blame_view(blame_view, path, commit_id, repo);
6445 e5a0f69f 2018-08-18 stsp if (err) {
6446 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
6447 fc06ba56 2019-08-22 stsp err = NULL;
6448 e5a0f69f 2018-08-18 stsp view_close(blame_view);
6450 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
6452 83ce39e3 2019-08-12 stsp free(path);
6453 69efd4c4 2018-07-18 stsp return err;
6456 69efd4c4 2018-07-18 stsp static const struct got_error *
6457 49b24ee5 2022-07-03 mark log_selected_tree_entry(struct tog_view **new_view, int begin_y, int begin_x,
6458 4e97c21c 2020-12-06 stsp struct tog_tree_view_state *s)
6460 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
6461 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
6462 69efd4c4 2018-07-18 stsp char *path;
6464 a0de39f3 2019-08-09 stsp *new_view = NULL;
6466 49b24ee5 2022-07-03 mark log_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_LOG);
6467 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
6468 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
6470 4e97c21c 2020-12-06 stsp err = tree_entry_path(&path, &s->parents, s->selected_entry);
6472 69efd4c4 2018-07-18 stsp return err;
6474 4e97c21c 2020-12-06 stsp err = open_log_view(log_view, s->commit_id, s->repo, s->head_ref_name,
6477 e5a0f69f 2018-08-18 stsp view_close(log_view);
6479 e5a0f69f 2018-08-18 stsp *new_view = log_view;
6480 cb2ebc8a 2018-06-23 stsp free(path);
6481 cb2ebc8a 2018-06-23 stsp return err;
6484 ffd1d5e5 2018-06-23 stsp static const struct got_error *
6485 bc573f3b 2021-07-10 stsp open_tree_view(struct tog_view *view, struct got_object_id *commit_id,
6486 bc573f3b 2021-07-10 stsp const char *head_ref_name, struct got_repository *repo)
6488 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
6489 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
6490 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
6491 bc573f3b 2021-07-10 stsp struct got_commit_object *commit = NULL;
6493 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
6494 bc573f3b 2021-07-10 stsp STAILQ_INIT(&s->colors);
6496 bc573f3b 2021-07-10 stsp s->commit_id = got_object_id_dup(commit_id);
6497 bc573f3b 2021-07-10 stsp if (s->commit_id == NULL)
6498 bc573f3b 2021-07-10 stsp return got_error_from_errno("got_object_id_dup");
6500 bc573f3b 2021-07-10 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
6502 bc573f3b 2021-07-10 stsp goto done;
6505 bc573f3b 2021-07-10 stsp * The root is opened here and will be closed when the view is closed.
6506 bc573f3b 2021-07-10 stsp * Any visited subtrees and their path-wise parents are opened and
6507 bc573f3b 2021-07-10 stsp * closed on demand.
6509 bc573f3b 2021-07-10 stsp err = got_object_open_as_tree(&s->root, repo,
6510 bc573f3b 2021-07-10 stsp got_object_commit_get_tree_id(commit));
6512 bc573f3b 2021-07-10 stsp goto done;
6513 bc573f3b 2021-07-10 stsp s->tree = s->root;
6515 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
6516 ffd1d5e5 2018-06-23 stsp if (err != NULL)
6517 ffd1d5e5 2018-06-23 stsp goto done;
6519 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
6520 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
6521 ffd1d5e5 2018-06-23 stsp goto done;
6524 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
6525 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
6526 9cd7cbd1 2020-12-07 stsp if (head_ref_name) {
6527 9cd7cbd1 2020-12-07 stsp s->head_ref_name = strdup(head_ref_name);
6528 9cd7cbd1 2020-12-07 stsp if (s->head_ref_name == NULL) {
6529 9cd7cbd1 2020-12-07 stsp err = got_error_from_errno("strdup");
6530 9cd7cbd1 2020-12-07 stsp goto done;
6533 fb2756b9 2018-08-04 stsp s->repo = repo;
6535 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
6536 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
6537 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
6538 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
6540 c0b01bdb 2019-11-08 stsp goto done;
6541 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
6542 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
6544 c0b01bdb 2019-11-08 stsp goto done;
6545 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
6546 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
6547 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
6549 c0b01bdb 2019-11-08 stsp goto done;
6551 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
6552 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
6553 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
6555 11b20872 2019-11-08 stsp goto done;
6557 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
6558 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
6560 c0b01bdb 2019-11-08 stsp goto done;
6563 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
6564 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
6565 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
6566 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
6567 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
6569 ad80ab7b 2018-08-04 stsp free(commit_id_str);
6570 bc573f3b 2021-07-10 stsp if (commit)
6571 bc573f3b 2021-07-10 stsp got_object_commit_close(commit);
6573 bc573f3b 2021-07-10 stsp close_tree_view(view);
6574 ad80ab7b 2018-08-04 stsp return err;
6577 e5a0f69f 2018-08-18 stsp static const struct got_error *
6578 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
6580 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
6582 bddb1296 2019-11-08 stsp free_colors(&s->colors);
6583 fb2756b9 2018-08-04 stsp free(s->tree_label);
6584 6484ec90 2018-09-29 stsp s->tree_label = NULL;
6585 6484ec90 2018-09-29 stsp free(s->commit_id);
6586 6484ec90 2018-09-29 stsp s->commit_id = NULL;
6587 9cd7cbd1 2020-12-07 stsp free(s->head_ref_name);
6588 9cd7cbd1 2020-12-07 stsp s->head_ref_name = NULL;
6589 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
6590 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
6591 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
6592 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
6593 bc573f3b 2021-07-10 stsp if (parent->tree != s->root)
6594 bc573f3b 2021-07-10 stsp got_object_tree_close(parent->tree);
6595 ad80ab7b 2018-08-04 stsp free(parent);
6598 bc573f3b 2021-07-10 stsp if (s->tree != NULL && s->tree != s->root)
6599 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
6600 bc573f3b 2021-07-10 stsp if (s->root)
6601 bc573f3b 2021-07-10 stsp got_object_tree_close(s->root);
6602 7c32bd05 2019-06-22 stsp return NULL;
6605 7c32bd05 2019-06-22 stsp static const struct got_error *
6606 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
6608 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
6610 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
6611 7c32bd05 2019-06-22 stsp return NULL;
6614 7c32bd05 2019-06-22 stsp static int
6615 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
6617 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
6619 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
6623 7c32bd05 2019-06-22 stsp static const struct got_error *
6624 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
6626 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
6627 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
6629 7c32bd05 2019-06-22 stsp if (!view->searching) {
6630 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6631 7c32bd05 2019-06-22 stsp return NULL;
6634 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
6635 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
6636 7c32bd05 2019-06-22 stsp if (s->selected_entry)
6637 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
6638 56e0773d 2019-11-28 stsp s->selected_entry);
6640 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
6642 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
6643 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
6645 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
6646 56e0773d 2019-11-28 stsp s->selected_entry);
6649 487cd7d2 2021-12-17 stsp if (s->selected_entry)
6650 487cd7d2 2021-12-17 stsp te = s->selected_entry;
6651 487cd7d2 2021-12-17 stsp else if (view->searching == TOG_SEARCH_FORWARD)
6652 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
6654 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
6657 7c32bd05 2019-06-22 stsp while (1) {
6658 56e0773d 2019-11-28 stsp if (te == NULL) {
6659 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
6660 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6661 ac66afb8 2019-06-24 stsp return NULL;
6663 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
6664 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
6666 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
6669 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
6670 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6671 56e0773d 2019-11-28 stsp s->matched_entry = te;
6675 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
6676 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
6678 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
6681 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
6682 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
6683 7c32bd05 2019-06-22 stsp s->selected = 0;
6686 e5a0f69f 2018-08-18 stsp return NULL;
6689 ad80ab7b 2018-08-04 stsp static const struct got_error *
6690 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
6692 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
6693 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
6694 e5a0f69f 2018-08-18 stsp char *parent_path;
6696 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
6698 e5a0f69f 2018-08-18 stsp return err;
6700 d86d3b18 2020-12-01 naddy err = draw_tree_entries(view, parent_path);
6701 e5a0f69f 2018-08-18 stsp free(parent_path);
6703 9b058f45 2022-06-30 mark view_border(view);
6704 e5a0f69f 2018-08-18 stsp return err;
6707 e5a0f69f 2018-08-18 stsp static const struct got_error *
6708 e78dc838 2020-12-04 stsp input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
6710 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
6711 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
6712 e4526bf5 2021-09-03 naddy struct got_tree_entry *te;
6713 136e2bd4 2022-07-23 mark int n, nscroll = view->nlines - 3;
6715 e5a0f69f 2018-08-18 stsp switch (ch) {
6717 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
6718 640cd7ff 2022-06-22 mark view->count = 0;
6721 640cd7ff 2022-06-22 mark view->count = 0;
6722 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
6724 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_LOG);
6727 640cd7ff 2022-06-22 mark view->count = 0;
6728 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_REF);
6730 e4526bf5 2021-09-03 naddy case 'g':
6731 e4526bf5 2021-09-03 naddy case KEY_HOME:
6732 e4526bf5 2021-09-03 naddy s->selected = 0;
6733 640cd7ff 2022-06-22 mark view->count = 0;
6734 e4526bf5 2021-09-03 naddy if (s->tree == s->root)
6735 e4526bf5 2021-09-03 naddy s->first_displayed_entry =
6736 e4526bf5 2021-09-03 naddy got_object_tree_get_first_entry(s->tree);
6738 e4526bf5 2021-09-03 naddy s->first_displayed_entry = NULL;
6740 e4526bf5 2021-09-03 naddy case 'G':
6741 9b058f45 2022-06-30 mark case KEY_END: {
6742 9b058f45 2022-06-30 mark int eos = view->nlines - 3;
6744 9b058f45 2022-06-30 mark if (view->mode == TOG_VIEW_SPLIT_HRZN)
6745 9b058f45 2022-06-30 mark --eos; /* border */
6746 e4526bf5 2021-09-03 naddy s->selected = 0;
6747 640cd7ff 2022-06-22 mark view->count = 0;
6748 e4526bf5 2021-09-03 naddy te = got_object_tree_get_last_entry(s->tree);
6749 9b058f45 2022-06-30 mark for (n = 0; n < eos; n++) {
6750 e4526bf5 2021-09-03 naddy if (te == NULL) {
6751 ad055527 2022-07-16 mark if (s->tree != s->root) {
6752 e4526bf5 2021-09-03 naddy s->first_displayed_entry = NULL;
6757 e4526bf5 2021-09-03 naddy s->first_displayed_entry = te;
6758 e4526bf5 2021-09-03 naddy te = got_tree_entry_get_prev(s->tree, te);
6760 e4526bf5 2021-09-03 naddy if (n > 0)
6761 e4526bf5 2021-09-03 naddy s->selected = n - 1;
6765 1e37a5c2 2019-05-12 jcs case KEY_UP:
6766 02ffd0d5 2021-10-17 stsp case CTRL('p'):
6767 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
6768 1e37a5c2 2019-05-12 jcs s->selected--;
6771 3e135950 2020-12-01 naddy tree_scroll_up(s, 1);
6772 640cd7ff 2022-06-22 mark if (s->selected_entry == NULL ||
6773 640cd7ff 2022-06-22 mark (s->tree == s->root && s->selected_entry ==
6774 640cd7ff 2022-06-22 mark got_object_tree_get_first_entry(s->tree)))
6775 640cd7ff 2022-06-22 mark view->count = 0;
6777 83cc4199 2022-06-13 stsp case CTRL('u'):
6779 83cc4199 2022-06-13 stsp nscroll /= 2;
6780 83cc4199 2022-06-13 stsp /* FALL THROUGH */
6781 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
6782 ea025d1d 2020-02-22 naddy case CTRL('b'):
6784 fa86c4bf 2020-11-29 stsp if (s->tree == s->root) {
6785 fa86c4bf 2020-11-29 stsp if (got_object_tree_get_first_entry(s->tree) ==
6786 fa86c4bf 2020-11-29 stsp s->first_displayed_entry)
6787 83cc4199 2022-06-13 stsp s->selected -= MIN(s->selected, nscroll);
6789 fa86c4bf 2020-11-29 stsp if (s->first_displayed_entry == NULL)
6790 83cc4199 2022-06-13 stsp s->selected -= MIN(s->selected, nscroll);
6792 83cc4199 2022-06-13 stsp tree_scroll_up(s, MAX(0, nscroll));
6793 640cd7ff 2022-06-22 mark if (s->selected_entry == NULL ||
6794 640cd7ff 2022-06-22 mark (s->tree == s->root && s->selected_entry ==
6795 640cd7ff 2022-06-22 mark got_object_tree_get_first_entry(s->tree)))
6796 640cd7ff 2022-06-22 mark view->count = 0;
6799 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
6800 02ffd0d5 2021-10-17 stsp case CTRL('n'):
6801 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
6802 1e37a5c2 2019-05-12 jcs s->selected++;
6805 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
6806 640cd7ff 2022-06-22 mark == NULL) {
6807 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
6808 640cd7ff 2022-06-22 mark view->count = 0;
6811 9b058f45 2022-06-30 mark tree_scroll_down(view, 1);
6813 83cc4199 2022-06-13 stsp case CTRL('d'):
6815 83cc4199 2022-06-13 stsp nscroll /= 2;
6816 83cc4199 2022-06-13 stsp /* FALL THROUGH */
6817 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
6818 ea025d1d 2020-02-22 naddy case CTRL('f'):
6820 48bb96f0 2022-06-20 naddy case ' ':
6821 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
6823 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
6824 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
6825 83cc4199 2022-06-13 stsp s->selected += MIN(nscroll,
6826 83cc4199 2022-06-13 stsp s->ndisplayed - s->selected - 1);
6828 640cd7ff 2022-06-22 mark view->count = 0;
6831 9b058f45 2022-06-30 mark tree_scroll_down(view, nscroll);
6833 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
6835 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
6836 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
6837 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
6838 1e37a5c2 2019-05-12 jcs /* user selected '..' */
6839 640cd7ff 2022-06-22 mark if (s->tree == s->root) {
6840 640cd7ff 2022-06-22 mark view->count = 0;
6843 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
6844 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
6846 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
6847 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
6848 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
6849 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
6850 1e37a5c2 2019-05-12 jcs s->selected_entry =
6851 1e37a5c2 2019-05-12 jcs parent->selected_entry;
6852 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
6853 9b058f45 2022-06-30 mark if (s->selected > view->nlines - 3) {
6854 9b058f45 2022-06-30 mark err = offset_selection_down(view);
6858 1e37a5c2 2019-05-12 jcs free(parent);
6859 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
6860 56e0773d 2019-11-28 stsp s->selected_entry))) {
6861 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
6862 640cd7ff 2022-06-22 mark view->count = 0;
6863 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
6864 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
6867 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, subtree);
6868 941e9f74 2019-05-21 stsp if (err) {
6869 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
6872 136e2bd4 2022-07-23 mark } else if (S_ISREG(got_tree_entry_get_mode(s->selected_entry)))
6873 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_BLAME);
6875 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
6876 1e1ff4ed 2020-12-07 stsp if (view->nlines >= 4 && s->selected >= view->nlines - 3)
6877 1e1ff4ed 2020-12-07 stsp s->selected = view->nlines - 4;
6878 640cd7ff 2022-06-22 mark view->count = 0;
6881 640cd7ff 2022-06-22 mark view->count = 0;
6885 ffd1d5e5 2018-06-23 stsp return err;
6888 ffd1d5e5 2018-06-23 stsp __dead static void
6889 ffd1d5e5 2018-06-23 stsp usage_tree(void)
6892 87411fa9 2022-06-16 stsp fprintf(stderr,
6893 87411fa9 2022-06-16 stsp "usage: %s tree [-c commit] [-r repository-path] [path]\n",
6894 ffd1d5e5 2018-06-23 stsp getprogname());
6898 ffd1d5e5 2018-06-23 stsp static const struct got_error *
6899 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
6901 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
6902 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
6903 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
6904 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6905 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
6906 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
6907 4e97c21c 2020-12-06 stsp const char *commit_id_arg = NULL;
6908 4e97c21c 2020-12-06 stsp char *label = NULL;
6909 4e97c21c 2020-12-06 stsp struct got_reference *ref = NULL;
6910 4e97c21c 2020-12-06 stsp const char *head_ref_name = NULL;
6912 5221c383 2018-08-01 stsp struct tog_view *view;
6913 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
6915 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
6916 ffd1d5e5 2018-06-23 stsp switch (ch) {
6918 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
6921 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
6922 74283ab8 2020-02-07 stsp if (repo_path == NULL)
6923 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
6927 e99e2d15 2020-11-24 naddy usage_tree();
6928 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
6932 ffd1d5e5 2018-06-23 stsp argc -= optind;
6933 ffd1d5e5 2018-06-23 stsp argv += optind;
6935 55cccc34 2020-02-20 stsp if (argc > 1)
6936 e99e2d15 2020-11-24 naddy usage_tree();
6938 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
6939 0ae84acc 2022-06-15 tracey if (error != NULL)
6940 0ae84acc 2022-06-15 tracey goto done;
6942 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
6943 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
6944 c156c7a4 2020-12-18 stsp if (cwd == NULL)
6945 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
6946 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
6947 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6948 c156c7a4 2020-12-18 stsp goto done;
6949 55cccc34 2020-02-20 stsp if (worktree)
6950 52185f70 2019-02-05 stsp repo_path =
6951 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
6953 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
6954 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
6955 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
6956 c156c7a4 2020-12-18 stsp goto done;
6960 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6961 c02c541e 2019-03-29 stsp if (error != NULL)
6962 52185f70 2019-02-05 stsp goto done;
6964 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
6965 55cccc34 2020-02-20 stsp repo, worktree);
6966 55cccc34 2020-02-20 stsp if (error)
6967 55cccc34 2020-02-20 stsp goto done;
6969 55cccc34 2020-02-20 stsp init_curses();
6971 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
6972 c02c541e 2019-03-29 stsp if (error)
6973 52185f70 2019-02-05 stsp goto done;
6975 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
6976 51a10b52 2020-12-26 stsp if (error)
6977 51a10b52 2020-12-26 stsp goto done;
6979 4e97c21c 2020-12-06 stsp if (commit_id_arg == NULL) {
6980 4e97c21c 2020-12-06 stsp error = got_repo_match_object_id(&commit_id, &label,
6981 4e97c21c 2020-12-06 stsp worktree ? got_worktree_get_head_ref_name(worktree) :
6982 84de9106 2020-12-26 stsp GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
6983 4e97c21c 2020-12-06 stsp if (error)
6984 4e97c21c 2020-12-06 stsp goto done;
6985 4e97c21c 2020-12-06 stsp head_ref_name = label;
6987 4e97c21c 2020-12-06 stsp error = got_ref_open(&ref, repo, commit_id_arg, 0);
6988 4e97c21c 2020-12-06 stsp if (error == NULL)
6989 4e97c21c 2020-12-06 stsp head_ref_name = got_ref_get_name(ref);
6990 4e97c21c 2020-12-06 stsp else if (error->code != GOT_ERR_NOT_REF)
6991 4e97c21c 2020-12-06 stsp goto done;
6992 4e97c21c 2020-12-06 stsp error = got_repo_match_object_id(&commit_id, NULL,
6993 84de9106 2020-12-26 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
6994 4e97c21c 2020-12-06 stsp if (error)
6995 4e97c21c 2020-12-06 stsp goto done;
6998 a44927cc 2022-04-07 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6999 a44927cc 2022-04-07 stsp if (error)
7000 a44927cc 2022-04-07 stsp goto done;
7002 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
7003 5221c383 2018-08-01 stsp if (view == NULL) {
7004 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
7005 5221c383 2018-08-01 stsp goto done;
7007 bc573f3b 2021-07-10 stsp error = open_tree_view(view, commit_id, head_ref_name, repo);
7008 ad80ab7b 2018-08-04 stsp if (error)
7009 ad80ab7b 2018-08-04 stsp goto done;
7010 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
7011 a44927cc 2022-04-07 stsp error = tree_view_walk_path(&view->state.tree, commit,
7012 d91faf3b 2020-12-01 naddy in_repo_path);
7013 55cccc34 2020-02-20 stsp if (error)
7014 55cccc34 2020-02-20 stsp goto done;
7017 55cccc34 2020-02-20 stsp if (worktree) {
7018 55cccc34 2020-02-20 stsp /* Release work tree lock. */
7019 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
7020 55cccc34 2020-02-20 stsp worktree = NULL;
7022 e5a0f69f 2018-08-18 stsp error = view_loop(view);
7024 52185f70 2019-02-05 stsp free(repo_path);
7025 e4a0e26d 2020-02-20 stsp free(cwd);
7026 ffd1d5e5 2018-06-23 stsp free(commit_id);
7027 4e97c21c 2020-12-06 stsp free(label);
7029 486cd271 2020-12-06 stsp got_ref_close(ref);
7030 1d0f4054 2021-06-17 stsp if (repo) {
7031 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
7032 1d0f4054 2021-06-17 stsp if (error == NULL)
7033 1d0f4054 2021-06-17 stsp error = close_err;
7035 0ae84acc 2022-06-15 tracey if (pack_fds) {
7036 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
7037 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
7038 0ae84acc 2022-06-15 tracey if (error == NULL)
7039 0ae84acc 2022-06-15 tracey error = pack_err;
7041 51a10b52 2020-12-26 stsp tog_free_refs();
7042 ffd1d5e5 2018-06-23 stsp return error;
7045 6458efa5 2020-11-24 stsp static const struct got_error *
7046 6458efa5 2020-11-24 stsp ref_view_load_refs(struct tog_ref_view_state *s)
7048 6458efa5 2020-11-24 stsp struct got_reflist_entry *sre;
7049 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
7051 6458efa5 2020-11-24 stsp s->nrefs = 0;
7052 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(sre, &tog_refs, entry) {
7053 cc488aa7 2022-01-23 stsp if (strncmp(got_ref_get_name(sre->ref),
7054 cc488aa7 2022-01-23 stsp "refs/got/", 9) == 0 &&
7055 cc488aa7 2022-01-23 stsp strncmp(got_ref_get_name(sre->ref),
7056 cc488aa7 2022-01-23 stsp "refs/got/backup/", 16) != 0)
7059 6458efa5 2020-11-24 stsp re = malloc(sizeof(*re));
7060 6458efa5 2020-11-24 stsp if (re == NULL)
7061 6458efa5 2020-11-24 stsp return got_error_from_errno("malloc");
7063 8924d611 2020-12-26 stsp re->ref = got_ref_dup(sre->ref);
7064 8924d611 2020-12-26 stsp if (re->ref == NULL)
7065 8924d611 2020-12-26 stsp return got_error_from_errno("got_ref_dup");
7066 6458efa5 2020-11-24 stsp re->idx = s->nrefs++;
7067 6458efa5 2020-11-24 stsp TAILQ_INSERT_TAIL(&s->refs, re, entry);
7070 8924d611 2020-12-26 stsp s->first_displayed_entry = TAILQ_FIRST(&s->refs);
7071 6458efa5 2020-11-24 stsp return NULL;
7075 6458efa5 2020-11-24 stsp ref_view_free_refs(struct tog_ref_view_state *s)
7077 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
7079 6458efa5 2020-11-24 stsp while (!TAILQ_EMPTY(&s->refs)) {
7080 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
7081 6458efa5 2020-11-24 stsp TAILQ_REMOVE(&s->refs, re, entry);
7082 8924d611 2020-12-26 stsp got_ref_close(re->ref);
7087 6458efa5 2020-11-24 stsp static const struct got_error *
7088 6458efa5 2020-11-24 stsp open_ref_view(struct tog_view *view, struct got_repository *repo)
7090 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
7091 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
7093 6458efa5 2020-11-24 stsp s->selected_entry = 0;
7094 6458efa5 2020-11-24 stsp s->repo = repo;
7096 6458efa5 2020-11-24 stsp TAILQ_INIT(&s->refs);
7097 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
7099 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
7101 6458efa5 2020-11-24 stsp return err;
7103 6458efa5 2020-11-24 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
7104 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/heads/",
7105 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_HEADS,
7106 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_HEADS"));
7108 6458efa5 2020-11-24 stsp goto done;
7110 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/tags/",
7111 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_TAGS,
7112 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_TAGS"));
7114 6458efa5 2020-11-24 stsp goto done;
7116 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/remotes/",
7117 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_REMOTES,
7118 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_REMOTES"));
7120 cc488aa7 2022-01-23 stsp goto done;
7122 cc488aa7 2022-01-23 stsp err = add_color(&s->colors, "^refs/got/backup/",
7123 cc488aa7 2022-01-23 stsp TOG_COLOR_REFS_BACKUP,
7124 cc488aa7 2022-01-23 stsp get_color_value("TOG_COLOR_REFS_BACKUP"));
7126 6458efa5 2020-11-24 stsp goto done;
7129 6458efa5 2020-11-24 stsp view->show = show_ref_view;
7130 6458efa5 2020-11-24 stsp view->input = input_ref_view;
7131 6458efa5 2020-11-24 stsp view->close = close_ref_view;
7132 6458efa5 2020-11-24 stsp view->search_start = search_start_ref_view;
7133 6458efa5 2020-11-24 stsp view->search_next = search_next_ref_view;
7136 6458efa5 2020-11-24 stsp free_colors(&s->colors);
7137 6458efa5 2020-11-24 stsp return err;
7140 6458efa5 2020-11-24 stsp static const struct got_error *
7141 6458efa5 2020-11-24 stsp close_ref_view(struct tog_view *view)
7143 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
7145 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
7146 6458efa5 2020-11-24 stsp free_colors(&s->colors);
7148 6458efa5 2020-11-24 stsp return NULL;
7151 6458efa5 2020-11-24 stsp static const struct got_error *
7152 c42c9805 2020-11-24 stsp resolve_reflist_entry(struct got_object_id **commit_id,
7153 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
7155 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
7156 c42c9805 2020-11-24 stsp struct got_object_id *obj_id;
7157 6458efa5 2020-11-24 stsp struct got_tag_object *tag = NULL;
7158 6458efa5 2020-11-24 stsp int obj_type;
7160 c42c9805 2020-11-24 stsp *commit_id = NULL;
7162 6458efa5 2020-11-24 stsp err = got_ref_resolve(&obj_id, repo, re->ref);
7164 6458efa5 2020-11-24 stsp return err;
7166 6458efa5 2020-11-24 stsp err = got_object_get_type(&obj_type, repo, obj_id);
7168 6458efa5 2020-11-24 stsp goto done;
7170 6458efa5 2020-11-24 stsp switch (obj_type) {
7171 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_COMMIT:
7172 c42c9805 2020-11-24 stsp *commit_id = obj_id;
7174 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_TAG:
7175 6458efa5 2020-11-24 stsp err = got_object_open_as_tag(&tag, repo, obj_id);
7177 6458efa5 2020-11-24 stsp goto done;
7178 c42c9805 2020-11-24 stsp free(obj_id);
7179 c42c9805 2020-11-24 stsp err = got_object_get_type(&obj_type, repo,
7180 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
7182 6458efa5 2020-11-24 stsp goto done;
7183 c42c9805 2020-11-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT) {
7184 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
7185 c42c9805 2020-11-24 stsp goto done;
7187 c42c9805 2020-11-24 stsp *commit_id = got_object_id_dup(
7188 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
7189 c42c9805 2020-11-24 stsp if (*commit_id == NULL) {
7190 c42c9805 2020-11-24 stsp err = got_error_from_errno("got_object_id_dup");
7191 c42c9805 2020-11-24 stsp goto done;
7195 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
7201 c42c9805 2020-11-24 stsp got_object_tag_close(tag);
7202 c42c9805 2020-11-24 stsp if (err) {
7203 c42c9805 2020-11-24 stsp free(*commit_id);
7204 c42c9805 2020-11-24 stsp *commit_id = NULL;
7206 c42c9805 2020-11-24 stsp return err;
7209 c42c9805 2020-11-24 stsp static const struct got_error *
7210 9b058f45 2022-06-30 mark log_ref_entry(struct tog_view **new_view, int begin_y, int begin_x,
7211 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
7213 c42c9805 2020-11-24 stsp struct tog_view *log_view;
7214 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
7215 c42c9805 2020-11-24 stsp struct got_object_id *commit_id = NULL;
7217 c42c9805 2020-11-24 stsp *new_view = NULL;
7219 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
7220 c42c9805 2020-11-24 stsp if (err) {
7221 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
7222 c42c9805 2020-11-24 stsp return err;
7224 c42c9805 2020-11-24 stsp return NULL;
7227 9b058f45 2022-06-30 mark log_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_LOG);
7228 6458efa5 2020-11-24 stsp if (log_view == NULL) {
7229 6458efa5 2020-11-24 stsp err = got_error_from_errno("view_open");
7230 6458efa5 2020-11-24 stsp goto done;
7233 ee756517 2020-12-05 stsp err = open_log_view(log_view, commit_id, repo,
7234 ee756517 2020-12-05 stsp got_ref_get_name(re->ref), "", 0);
7237 6458efa5 2020-11-24 stsp view_close(log_view);
7239 6458efa5 2020-11-24 stsp *new_view = log_view;
7240 c42c9805 2020-11-24 stsp free(commit_id);
7241 6458efa5 2020-11-24 stsp return err;
7244 ce5b7c56 2019-07-09 stsp static void
7245 3e135950 2020-12-01 naddy ref_scroll_up(struct tog_ref_view_state *s, int maxscroll)
7247 34ba6917 2020-11-30 stsp struct tog_reflist_entry *re;
7248 34ba6917 2020-11-30 stsp int i = 0;
7250 694d3271 2020-12-01 naddy if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
7253 694d3271 2020-12-01 naddy re = TAILQ_PREV(s->first_displayed_entry, tog_reflist_head, entry);
7254 34ba6917 2020-11-30 stsp while (i++ < maxscroll) {
7255 34ba6917 2020-11-30 stsp if (re == NULL)
7257 694d3271 2020-12-01 naddy s->first_displayed_entry = re;
7258 34ba6917 2020-11-30 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
7262 9b058f45 2022-06-30 mark static const struct got_error *
7263 9b058f45 2022-06-30 mark ref_scroll_down(struct tog_view *view, int maxscroll)
7265 9b058f45 2022-06-30 mark struct tog_ref_view_state *s = &view->state.ref;
7266 6458efa5 2020-11-24 stsp struct tog_reflist_entry *next, *last;
7267 6458efa5 2020-11-24 stsp int n = 0;
7269 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
7270 694d3271 2020-12-01 naddy next = TAILQ_NEXT(s->first_displayed_entry, entry);
7272 694d3271 2020-12-01 naddy next = TAILQ_FIRST(&s->refs);
7274 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
7275 9b058f45 2022-06-30 mark while (next && n++ < maxscroll) {
7277 9b058f45 2022-06-30 mark last = TAILQ_NEXT(last, entry);
7278 9b058f45 2022-06-30 mark if (last || (view->mode == TOG_VIEW_SPLIT_HRZN)) {
7279 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
7280 6458efa5 2020-11-24 stsp next = TAILQ_NEXT(next, entry);
7284 9b058f45 2022-06-30 mark return NULL;
7287 6458efa5 2020-11-24 stsp static const struct got_error *
7288 6458efa5 2020-11-24 stsp search_start_ref_view(struct tog_view *view)
7290 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
7292 6458efa5 2020-11-24 stsp s->matched_entry = NULL;
7293 6458efa5 2020-11-24 stsp return NULL;
7296 6458efa5 2020-11-24 stsp static int
7297 6458efa5 2020-11-24 stsp match_reflist_entry(struct tog_reflist_entry *re, regex_t *regex)
7299 6458efa5 2020-11-24 stsp regmatch_t regmatch;
7301 6458efa5 2020-11-24 stsp return regexec(regex, got_ref_get_name(re->ref), 1, ®match,
7305 6458efa5 2020-11-24 stsp static const struct got_error *
7306 6458efa5 2020-11-24 stsp search_next_ref_view(struct tog_view *view)
7308 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
7309 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re = NULL;
7311 6458efa5 2020-11-24 stsp if (!view->searching) {
7312 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
7313 6458efa5 2020-11-24 stsp return NULL;
7316 6458efa5 2020-11-24 stsp if (s->matched_entry) {
7317 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD) {
7318 6458efa5 2020-11-24 stsp if (s->selected_entry)
7319 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(s->selected_entry, entry);
7321 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
7322 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
7324 6458efa5 2020-11-24 stsp if (s->selected_entry == NULL)
7325 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
7327 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
7328 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
7331 487cd7d2 2021-12-17 stsp if (s->selected_entry)
7332 487cd7d2 2021-12-17 stsp re = s->selected_entry;
7333 487cd7d2 2021-12-17 stsp else if (view->searching == TOG_SEARCH_FORWARD)
7334 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
7336 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
7339 6458efa5 2020-11-24 stsp while (1) {
7340 6458efa5 2020-11-24 stsp if (re == NULL) {
7341 6458efa5 2020-11-24 stsp if (s->matched_entry == NULL) {
7342 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
7343 6458efa5 2020-11-24 stsp return NULL;
7345 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
7346 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
7348 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
7351 6458efa5 2020-11-24 stsp if (match_reflist_entry(re, &view->regex)) {
7352 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
7353 6458efa5 2020-11-24 stsp s->matched_entry = re;
7357 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
7358 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
7360 6458efa5 2020-11-24 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
7363 6458efa5 2020-11-24 stsp if (s->matched_entry) {
7364 6458efa5 2020-11-24 stsp s->first_displayed_entry = s->matched_entry;
7365 6458efa5 2020-11-24 stsp s->selected = 0;
7368 6458efa5 2020-11-24 stsp return NULL;
7371 6458efa5 2020-11-24 stsp static const struct got_error *
7372 6458efa5 2020-11-24 stsp show_ref_view(struct tog_view *view)
7374 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
7375 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
7376 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
7377 6458efa5 2020-11-24 stsp char *line = NULL;
7378 6458efa5 2020-11-24 stsp wchar_t *wline;
7379 6458efa5 2020-11-24 stsp struct tog_color *tc;
7380 6458efa5 2020-11-24 stsp int width, n;
7381 6458efa5 2020-11-24 stsp int limit = view->nlines;
7383 6458efa5 2020-11-24 stsp werase(view->window);
7385 6458efa5 2020-11-24 stsp s->ndisplayed = 0;
7386 49b24ee5 2022-07-03 mark if (view_is_hsplit_top(view))
7387 9b058f45 2022-06-30 mark --limit; /* border */
7389 6458efa5 2020-11-24 stsp if (limit == 0)
7390 6458efa5 2020-11-24 stsp return NULL;
7392 34ba6917 2020-11-30 stsp re = s->first_displayed_entry;
7394 6458efa5 2020-11-24 stsp if (asprintf(&line, "references [%d/%d]", re->idx + s->selected + 1,
7395 6458efa5 2020-11-24 stsp s->nrefs) == -1)
7396 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
7398 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
7399 6458efa5 2020-11-24 stsp if (err) {
7400 6458efa5 2020-11-24 stsp free(line);
7401 6458efa5 2020-11-24 stsp return err;
7403 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
7404 6458efa5 2020-11-24 stsp wstandout(view->window);
7405 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
7406 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
7407 6458efa5 2020-11-24 stsp wstandend(view->window);
7408 6458efa5 2020-11-24 stsp free(wline);
7409 6458efa5 2020-11-24 stsp wline = NULL;
7410 6458efa5 2020-11-24 stsp free(line);
7411 6458efa5 2020-11-24 stsp line = NULL;
7412 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
7413 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
7414 6458efa5 2020-11-24 stsp if (--limit <= 0)
7415 6458efa5 2020-11-24 stsp return NULL;
7418 6458efa5 2020-11-24 stsp while (re && limit > 0) {
7419 6458efa5 2020-11-24 stsp char *line = NULL;
7420 b4996bee 2022-06-16 stsp char ymd[13]; /* YYYY-MM-DD + " " + NUL */
7422 b4996bee 2022-06-16 stsp if (s->show_date) {
7423 b4996bee 2022-06-16 stsp struct got_commit_object *ci;
7424 b4996bee 2022-06-16 stsp struct got_tag_object *tag;
7425 b4996bee 2022-06-16 stsp struct got_object_id *id;
7426 b4996bee 2022-06-16 stsp struct tm tm;
7429 b4996bee 2022-06-16 stsp err = got_ref_resolve(&id, s->repo, re->ref);
7431 b4996bee 2022-06-16 stsp return err;
7432 b4996bee 2022-06-16 stsp err = got_object_open_as_tag(&tag, s->repo, id);
7433 b4996bee 2022-06-16 stsp if (err) {
7434 b4996bee 2022-06-16 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
7436 b4996bee 2022-06-16 stsp return err;
7438 b4996bee 2022-06-16 stsp err = got_object_open_as_commit(&ci, s->repo,
7440 b4996bee 2022-06-16 stsp if (err) {
7442 b4996bee 2022-06-16 stsp return err;
7444 b4996bee 2022-06-16 stsp t = got_object_commit_get_committer_time(ci);
7445 b4996bee 2022-06-16 stsp got_object_commit_close(ci);
7447 b4996bee 2022-06-16 stsp t = got_object_tag_get_tagger_time(tag);
7448 b4996bee 2022-06-16 stsp got_object_tag_close(tag);
7451 b4996bee 2022-06-16 stsp if (gmtime_r(&t, &tm) == NULL)
7452 b4996bee 2022-06-16 stsp return got_error_from_errno("gmtime_r");
7453 b4996bee 2022-06-16 stsp if (strftime(ymd, sizeof(ymd), "%G-%m-%d ", &tm) == 0)
7454 b4996bee 2022-06-16 stsp return got_error(GOT_ERR_NO_SPACE);
7456 6458efa5 2020-11-24 stsp if (got_ref_is_symbolic(re->ref)) {
7457 b4996bee 2022-06-16 stsp if (asprintf(&line, "%s%s -> %s", s->show_date ?
7458 b4996bee 2022-06-16 stsp ymd : "", got_ref_get_name(re->ref),
7459 6458efa5 2020-11-24 stsp got_ref_get_symref_target(re->ref)) == -1)
7460 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
7461 6458efa5 2020-11-24 stsp } else if (s->show_ids) {
7462 6458efa5 2020-11-24 stsp struct got_object_id *id;
7463 6458efa5 2020-11-24 stsp char *id_str;
7464 6458efa5 2020-11-24 stsp err = got_ref_resolve(&id, s->repo, re->ref);
7466 6458efa5 2020-11-24 stsp return err;
7467 6458efa5 2020-11-24 stsp err = got_object_id_str(&id_str, id);
7468 6458efa5 2020-11-24 stsp if (err) {
7470 6458efa5 2020-11-24 stsp return err;
7472 b4996bee 2022-06-16 stsp if (asprintf(&line, "%s%s: %s", s->show_date ? ymd : "",
7473 6458efa5 2020-11-24 stsp got_ref_get_name(re->ref), id_str) == -1) {
7474 6458efa5 2020-11-24 stsp err = got_error_from_errno("asprintf");
7476 6458efa5 2020-11-24 stsp free(id_str);
7477 6458efa5 2020-11-24 stsp return err;
7480 6458efa5 2020-11-24 stsp free(id_str);
7481 b4996bee 2022-06-16 stsp } else if (asprintf(&line, "%s%s", s->show_date ? ymd : "",
7482 b4996bee 2022-06-16 stsp got_ref_get_name(re->ref)) == -1)
7483 b4996bee 2022-06-16 stsp return got_error_from_errno("asprintf");
7485 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols,
7487 6458efa5 2020-11-24 stsp if (err) {
7488 6458efa5 2020-11-24 stsp free(line);
7489 6458efa5 2020-11-24 stsp return err;
7491 6458efa5 2020-11-24 stsp if (n == s->selected) {
7492 6458efa5 2020-11-24 stsp if (view->focussed)
7493 6458efa5 2020-11-24 stsp wstandout(view->window);
7494 6458efa5 2020-11-24 stsp s->selected_entry = re;
7496 6458efa5 2020-11-24 stsp tc = match_color(&s->colors, got_ref_get_name(re->ref));
7498 6458efa5 2020-11-24 stsp wattr_on(view->window,
7499 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
7500 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
7502 6458efa5 2020-11-24 stsp wattr_off(view->window,
7503 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
7504 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
7505 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
7506 6458efa5 2020-11-24 stsp if (n == s->selected && view->focussed)
7507 6458efa5 2020-11-24 stsp wstandend(view->window);
7508 6458efa5 2020-11-24 stsp free(line);
7509 6458efa5 2020-11-24 stsp free(wline);
7510 6458efa5 2020-11-24 stsp wline = NULL;
7512 6458efa5 2020-11-24 stsp s->ndisplayed++;
7513 6458efa5 2020-11-24 stsp s->last_displayed_entry = re;
7516 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
7519 9b058f45 2022-06-30 mark view_border(view);
7520 6458efa5 2020-11-24 stsp return err;
7523 6458efa5 2020-11-24 stsp static const struct got_error *
7524 49b24ee5 2022-07-03 mark browse_ref_tree(struct tog_view **new_view, int begin_y, int begin_x,
7525 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
7527 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
7528 bc573f3b 2021-07-10 stsp struct got_object_id *commit_id = NULL;
7529 c42c9805 2020-11-24 stsp struct tog_view *tree_view;
7531 c42c9805 2020-11-24 stsp *new_view = NULL;
7533 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
7534 c42c9805 2020-11-24 stsp if (err) {
7535 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
7536 c42c9805 2020-11-24 stsp return err;
7538 c42c9805 2020-11-24 stsp return NULL;
7542 49b24ee5 2022-07-03 mark tree_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_TREE);
7543 c42c9805 2020-11-24 stsp if (tree_view == NULL) {
7544 c42c9805 2020-11-24 stsp err = got_error_from_errno("view_open");
7545 c42c9805 2020-11-24 stsp goto done;
7548 bc573f3b 2021-07-10 stsp err = open_tree_view(tree_view, commit_id,
7549 4e97c21c 2020-12-06 stsp got_ref_get_name(re->ref), repo);
7551 c42c9805 2020-11-24 stsp goto done;
7553 c42c9805 2020-11-24 stsp *new_view = tree_view;
7555 c42c9805 2020-11-24 stsp free(commit_id);
7556 c42c9805 2020-11-24 stsp return err;
7558 c42c9805 2020-11-24 stsp static const struct got_error *
7559 e78dc838 2020-12-04 stsp input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
7561 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
7562 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
7563 e4526bf5 2021-09-03 naddy struct tog_reflist_entry *re;
7564 136e2bd4 2022-07-23 mark int n, nscroll = view->nlines - 1;
7566 6458efa5 2020-11-24 stsp switch (ch) {
7568 6458efa5 2020-11-24 stsp s->show_ids = !s->show_ids;
7569 640cd7ff 2022-06-22 mark view->count = 0;
7572 b4996bee 2022-06-16 stsp s->show_date = !s->show_date;
7573 640cd7ff 2022-06-22 mark view->count = 0;
7576 7f66531d 2021-11-16 stsp s->sort_by_date = !s->sort_by_date;
7577 640cd7ff 2022-06-22 mark view->count = 0;
7578 50617b77 2021-11-20 stsp err = got_reflist_sort(&tog_refs, s->sort_by_date ?
7579 50617b77 2021-11-20 stsp got_ref_cmp_by_commit_timestamp_descending :
7580 cc488aa7 2022-01-23 stsp tog_ref_cmp_by_name, s->repo);
7583 50617b77 2021-11-20 stsp got_reflist_object_id_map_free(tog_refs_idmap);
7584 50617b77 2021-11-20 stsp err = got_reflist_object_id_map_create(&tog_refs_idmap,
7585 50617b77 2021-11-20 stsp &tog_refs, s->repo);
7588 7f66531d 2021-11-16 stsp ref_view_free_refs(s);
7589 7f66531d 2021-11-16 stsp err = ref_view_load_refs(s);
7591 6458efa5 2020-11-24 stsp case KEY_ENTER:
7592 6458efa5 2020-11-24 stsp case '\r':
7593 640cd7ff 2022-06-22 mark view->count = 0;
7594 6458efa5 2020-11-24 stsp if (!s->selected_entry)
7596 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_LOG);
7599 640cd7ff 2022-06-22 mark view->count = 0;
7600 c42c9805 2020-11-24 stsp if (!s->selected_entry)
7602 136e2bd4 2022-07-23 mark err = view_request_new(new_view, view, TOG_VIEW_TREE);
7604 e4526bf5 2021-09-03 naddy case 'g':
7605 e4526bf5 2021-09-03 naddy case KEY_HOME:
7606 e4526bf5 2021-09-03 naddy s->selected = 0;
7607 640cd7ff 2022-06-22 mark view->count = 0;
7608 e4526bf5 2021-09-03 naddy s->first_displayed_entry = TAILQ_FIRST(&s->refs);
7610 e4526bf5 2021-09-03 naddy case 'G':
7611 9b058f45 2022-06-30 mark case KEY_END: {
7612 9b058f45 2022-06-30 mark int eos = view->nlines - 1;
7614 9b058f45 2022-06-30 mark if (view->mode == TOG_VIEW_SPLIT_HRZN)
7615 9b058f45 2022-06-30 mark --eos; /* border */
7616 e4526bf5 2021-09-03 naddy s->selected = 0;
7617 640cd7ff 2022-06-22 mark view->count = 0;
7618 e4526bf5 2021-09-03 naddy re = TAILQ_LAST(&s->refs, tog_reflist_head);
7619 9b058f45 2022-06-30 mark for (n = 0; n < eos; n++) {
7620 e4526bf5 2021-09-03 naddy if (re == NULL)
7622 e4526bf5 2021-09-03 naddy s->first_displayed_entry = re;
7623 e4526bf5 2021-09-03 naddy re = TAILQ_PREV(re, tog_reflist_head, entry);
7625 e4526bf5 2021-09-03 naddy if (n > 0)
7626 e4526bf5 2021-09-03 naddy s->selected = n - 1;
7630 6458efa5 2020-11-24 stsp case KEY_UP:
7631 02ffd0d5 2021-10-17 stsp case CTRL('p'):
7632 6458efa5 2020-11-24 stsp if (s->selected > 0) {
7633 6458efa5 2020-11-24 stsp s->selected--;
7636 3e135950 2020-12-01 naddy ref_scroll_up(s, 1);
7637 640cd7ff 2022-06-22 mark if (s->selected_entry == TAILQ_FIRST(&s->refs))
7638 640cd7ff 2022-06-22 mark view->count = 0;
7640 83cc4199 2022-06-13 stsp case CTRL('u'):
7642 83cc4199 2022-06-13 stsp nscroll /= 2;
7643 83cc4199 2022-06-13 stsp /* FALL THROUGH */
7644 6458efa5 2020-11-24 stsp case KEY_PPAGE:
7645 6458efa5 2020-11-24 stsp case CTRL('b'):
7647 34ba6917 2020-11-30 stsp if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
7648 83cc4199 2022-06-13 stsp s->selected -= MIN(nscroll, s->selected);
7649 83cc4199 2022-06-13 stsp ref_scroll_up(s, MAX(0, nscroll));
7650 640cd7ff 2022-06-22 mark if (s->selected_entry == TAILQ_FIRST(&s->refs))
7651 640cd7ff 2022-06-22 mark view->count = 0;
7654 6458efa5 2020-11-24 stsp case KEY_DOWN:
7655 02ffd0d5 2021-10-17 stsp case CTRL('n'):
7656 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1) {
7657 6458efa5 2020-11-24 stsp s->selected++;
7660 640cd7ff 2022-06-22 mark if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL) {
7661 6458efa5 2020-11-24 stsp /* can't scroll any further */
7662 640cd7ff 2022-06-22 mark view->count = 0;
7665 9b058f45 2022-06-30 mark ref_scroll_down(view, 1);
7667 83cc4199 2022-06-13 stsp case CTRL('d'):
7669 83cc4199 2022-06-13 stsp nscroll /= 2;
7670 83cc4199 2022-06-13 stsp /* FALL THROUGH */
7671 6458efa5 2020-11-24 stsp case KEY_NPAGE:
7672 6458efa5 2020-11-24 stsp case CTRL('f'):
7674 48bb96f0 2022-06-20 naddy case ' ':
7675 6458efa5 2020-11-24 stsp if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL) {
7676 6458efa5 2020-11-24 stsp /* can't scroll any further; move cursor down */
7677 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1)
7678 83cc4199 2022-06-13 stsp s->selected += MIN(nscroll,
7679 83cc4199 2022-06-13 stsp s->ndisplayed - s->selected - 1);
7680 640cd7ff 2022-06-22 mark if (view->count > 1 && s->selected < s->ndisplayed - 1)
7681 640cd7ff 2022-06-22 mark s->selected += s->ndisplayed - s->selected - 1;
7682 640cd7ff 2022-06-22 mark view->count = 0;
7685 9b058f45 2022-06-30 mark ref_scroll_down(view, nscroll);
7687 6458efa5 2020-11-24 stsp case CTRL('l'):
7688 640cd7ff 2022-06-22 mark view->count = 0;
7689 8924d611 2020-12-26 stsp tog_free_refs();
7690 7f66531d 2021-11-16 stsp err = tog_load_refs(s->repo, s->sort_by_date);
7693 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
7694 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
7696 6458efa5 2020-11-24 stsp case KEY_RESIZE:
7697 8b5b8d0c 2020-12-06 stsp if (view->nlines >= 2 && s->selected >= view->nlines - 1)
7698 8b5b8d0c 2020-12-06 stsp s->selected = view->nlines - 2;
7701 640cd7ff 2022-06-22 mark view->count = 0;
7705 6458efa5 2020-11-24 stsp return err;
7708 6458efa5 2020-11-24 stsp __dead static void
7709 6458efa5 2020-11-24 stsp usage_ref(void)
7712 6458efa5 2020-11-24 stsp fprintf(stderr, "usage: %s ref [-r repository-path]\n",
7713 6458efa5 2020-11-24 stsp getprogname());
7717 6458efa5 2020-11-24 stsp static const struct got_error *
7718 6458efa5 2020-11-24 stsp cmd_ref(int argc, char *argv[])
7720 6458efa5 2020-11-24 stsp const struct got_error *error;
7721 6458efa5 2020-11-24 stsp struct got_repository *repo = NULL;
7722 6458efa5 2020-11-24 stsp struct got_worktree *worktree = NULL;
7723 6458efa5 2020-11-24 stsp char *cwd = NULL, *repo_path = NULL;
7725 6458efa5 2020-11-24 stsp struct tog_view *view;
7726 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
7728 6458efa5 2020-11-24 stsp while ((ch = getopt(argc, argv, "r:")) != -1) {
7729 6458efa5 2020-11-24 stsp switch (ch) {
7731 6458efa5 2020-11-24 stsp repo_path = realpath(optarg, NULL);
7732 6458efa5 2020-11-24 stsp if (repo_path == NULL)
7733 6458efa5 2020-11-24 stsp return got_error_from_errno2("realpath",
7737 e99e2d15 2020-11-24 naddy usage_ref();
7738 6458efa5 2020-11-24 stsp /* NOTREACHED */
7742 6458efa5 2020-11-24 stsp argc -= optind;
7743 6458efa5 2020-11-24 stsp argv += optind;
7745 6458efa5 2020-11-24 stsp if (argc > 1)
7746 e99e2d15 2020-11-24 naddy usage_ref();
7748 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
7749 0ae84acc 2022-06-15 tracey if (error != NULL)
7750 0ae84acc 2022-06-15 tracey goto done;
7752 6458efa5 2020-11-24 stsp if (repo_path == NULL) {
7753 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
7754 c156c7a4 2020-12-18 stsp if (cwd == NULL)
7755 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
7756 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
7757 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7758 c156c7a4 2020-12-18 stsp goto done;
7759 6458efa5 2020-11-24 stsp if (worktree)
7760 6458efa5 2020-11-24 stsp repo_path =
7761 6458efa5 2020-11-24 stsp strdup(got_worktree_get_repo_path(worktree));
7763 6458efa5 2020-11-24 stsp repo_path = strdup(cwd);
7764 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
7765 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
7766 c156c7a4 2020-12-18 stsp goto done;
7770 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7771 6458efa5 2020-11-24 stsp if (error != NULL)
7772 6458efa5 2020-11-24 stsp goto done;
7774 6458efa5 2020-11-24 stsp init_curses();
7776 6458efa5 2020-11-24 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
7777 51a10b52 2020-12-26 stsp if (error)
7778 51a10b52 2020-12-26 stsp goto done;
7780 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
7781 6458efa5 2020-11-24 stsp if (error)
7782 6458efa5 2020-11-24 stsp goto done;
7784 6458efa5 2020-11-24 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_REF);
7785 6458efa5 2020-11-24 stsp if (view == NULL) {
7786 6458efa5 2020-11-24 stsp error = got_error_from_errno("view_open");
7787 6458efa5 2020-11-24 stsp goto done;
7790 6458efa5 2020-11-24 stsp error = open_ref_view(view, repo);
7791 6458efa5 2020-11-24 stsp if (error)
7792 6458efa5 2020-11-24 stsp goto done;
7794 6458efa5 2020-11-24 stsp if (worktree) {
7795 6458efa5 2020-11-24 stsp /* Release work tree lock. */
7796 6458efa5 2020-11-24 stsp got_worktree_close(worktree);
7797 6458efa5 2020-11-24 stsp worktree = NULL;
7799 6458efa5 2020-11-24 stsp error = view_loop(view);
7801 6458efa5 2020-11-24 stsp free(repo_path);
7802 6458efa5 2020-11-24 stsp free(cwd);
7803 1d0f4054 2021-06-17 stsp if (repo) {
7804 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
7805 1d0f4054 2021-06-17 stsp if (close_err)
7806 1d0f4054 2021-06-17 stsp error = close_err;
7808 0ae84acc 2022-06-15 tracey if (pack_fds) {
7809 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
7810 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
7811 0ae84acc 2022-06-15 tracey if (error == NULL)
7812 0ae84acc 2022-06-15 tracey error = pack_err;
7814 51a10b52 2020-12-26 stsp tog_free_refs();
7815 6458efa5 2020-11-24 stsp return error;
7818 136e2bd4 2022-07-23 mark static const struct got_error *
7819 136e2bd4 2022-07-23 mark view_dispatch_request(struct tog_view **new_view, struct tog_view *view,
7820 136e2bd4 2022-07-23 mark enum tog_view_type request, int y, int x)
7822 136e2bd4 2022-07-23 mark const struct got_error *err = NULL;
7824 136e2bd4 2022-07-23 mark *new_view = NULL;
7826 136e2bd4 2022-07-23 mark switch (request) {
7827 136e2bd4 2022-07-23 mark case TOG_VIEW_DIFF:
7828 136e2bd4 2022-07-23 mark if (view->type == TOG_VIEW_LOG) {
7829 136e2bd4 2022-07-23 mark struct tog_log_view_state *s = &view->state.log;
7831 136e2bd4 2022-07-23 mark err = open_diff_view_for_commit(new_view, y, x,
7832 136e2bd4 2022-07-23 mark s->selected_entry->commit, s->selected_entry->id,
7833 136e2bd4 2022-07-23 mark view, s->repo);
7835 136e2bd4 2022-07-23 mark return got_error_msg(GOT_ERR_NOT_IMPL,
7836 136e2bd4 2022-07-23 mark "parent/child view pair not supported");
7838 136e2bd4 2022-07-23 mark case TOG_VIEW_BLAME:
7839 136e2bd4 2022-07-23 mark if (view->type == TOG_VIEW_TREE) {
7840 136e2bd4 2022-07-23 mark struct tog_tree_view_state *s = &view->state.tree;
7842 136e2bd4 2022-07-23 mark err = blame_tree_entry(new_view, y, x,
7843 136e2bd4 2022-07-23 mark s->selected_entry, &s->parents, s->commit_id,
7846 136e2bd4 2022-07-23 mark return got_error_msg(GOT_ERR_NOT_IMPL,
7847 136e2bd4 2022-07-23 mark "parent/child view pair not supported");
7849 136e2bd4 2022-07-23 mark case TOG_VIEW_LOG:
7850 136e2bd4 2022-07-23 mark if (view->type == TOG_VIEW_BLAME)
7851 136e2bd4 2022-07-23 mark err = log_annotated_line(new_view, y, x,
7852 136e2bd4 2022-07-23 mark view->state.blame.repo, view->state.blame.id_to_log);
7853 136e2bd4 2022-07-23 mark else if (view->type == TOG_VIEW_TREE)
7854 136e2bd4 2022-07-23 mark err = log_selected_tree_entry(new_view, y, x,
7855 136e2bd4 2022-07-23 mark &view->state.tree);
7856 136e2bd4 2022-07-23 mark else if (view->type == TOG_VIEW_REF)
7857 136e2bd4 2022-07-23 mark err = log_ref_entry(new_view, y, x,
7858 136e2bd4 2022-07-23 mark view->state.ref.selected_entry,
7859 136e2bd4 2022-07-23 mark view->state.ref.repo);
7861 136e2bd4 2022-07-23 mark return got_error_msg(GOT_ERR_NOT_IMPL,
7862 136e2bd4 2022-07-23 mark "parent/child view pair not supported");
7864 136e2bd4 2022-07-23 mark case TOG_VIEW_TREE:
7865 136e2bd4 2022-07-23 mark if (view->type == TOG_VIEW_LOG)
7866 136e2bd4 2022-07-23 mark err = browse_commit_tree(new_view, y, x,
7867 136e2bd4 2022-07-23 mark view->state.log.selected_entry,
7868 136e2bd4 2022-07-23 mark view->state.log.in_repo_path,
7869 136e2bd4 2022-07-23 mark view->state.log.head_ref_name,
7870 136e2bd4 2022-07-23 mark view->state.log.repo);
7871 136e2bd4 2022-07-23 mark else if (view->type == TOG_VIEW_REF)
7872 136e2bd4 2022-07-23 mark err = browse_ref_tree(new_view, y, x,
7873 136e2bd4 2022-07-23 mark view->state.ref.selected_entry,
7874 136e2bd4 2022-07-23 mark view->state.ref.repo);
7876 136e2bd4 2022-07-23 mark return got_error_msg(GOT_ERR_NOT_IMPL,
7877 136e2bd4 2022-07-23 mark "parent/child view pair not supported");
7879 136e2bd4 2022-07-23 mark case TOG_VIEW_REF:
7880 136e2bd4 2022-07-23 mark *new_view = view_open(0, 0, y, x, TOG_VIEW_REF);
7881 136e2bd4 2022-07-23 mark if (*new_view == NULL)
7882 136e2bd4 2022-07-23 mark return got_error_from_errno("view_open");
7883 136e2bd4 2022-07-23 mark if (view->type == TOG_VIEW_LOG)
7884 136e2bd4 2022-07-23 mark err = open_ref_view(*new_view, view->state.log.repo);
7885 136e2bd4 2022-07-23 mark else if (view->type == TOG_VIEW_TREE)
7886 136e2bd4 2022-07-23 mark err = open_ref_view(*new_view, view->state.tree.repo);
7888 136e2bd4 2022-07-23 mark err = got_error_msg(GOT_ERR_NOT_IMPL,
7889 136e2bd4 2022-07-23 mark "parent/child view pair not supported");
7891 136e2bd4 2022-07-23 mark view_close(*new_view);
7894 136e2bd4 2022-07-23 mark return got_error_msg(GOT_ERR_NOT_IMPL, "invalid view");
7897 136e2bd4 2022-07-23 mark return err;
7901 9b058f45 2022-06-30 mark * If view was scrolled down to move the selected line into view when opening a
7902 9b058f45 2022-06-30 mark * horizontal split, scroll back up when closing the split/toggling fullscreen.
7904 6458efa5 2020-11-24 stsp static void
7905 9b058f45 2022-06-30 mark offset_selection_up(struct tog_view *view)
7907 9b058f45 2022-06-30 mark switch (view->type) {
7908 9b058f45 2022-06-30 mark case TOG_VIEW_BLAME: {
7909 9b058f45 2022-06-30 mark struct tog_blame_view_state *s = &view->state.blame;
7910 9b058f45 2022-06-30 mark if (s->first_displayed_line == 1) {
7911 9b058f45 2022-06-30 mark s->selected_line = MAX(s->selected_line - view->offset,
7915 9b058f45 2022-06-30 mark if (s->first_displayed_line > view->offset)
7916 9b058f45 2022-06-30 mark s->first_displayed_line -= view->offset;
7918 9b058f45 2022-06-30 mark s->first_displayed_line = 1;
7919 9b058f45 2022-06-30 mark s->selected_line += view->offset;
7922 9b058f45 2022-06-30 mark case TOG_VIEW_LOG:
7923 9b058f45 2022-06-30 mark log_scroll_up(&view->state.log, view->offset);
7924 9b058f45 2022-06-30 mark view->state.log.selected += view->offset;
7926 9b058f45 2022-06-30 mark case TOG_VIEW_REF:
7927 9b058f45 2022-06-30 mark ref_scroll_up(&view->state.ref, view->offset);
7928 9b058f45 2022-06-30 mark view->state.ref.selected += view->offset;
7930 9b058f45 2022-06-30 mark case TOG_VIEW_TREE:
7931 9b058f45 2022-06-30 mark tree_scroll_up(&view->state.tree, view->offset);
7932 9b058f45 2022-06-30 mark view->state.tree.selected += view->offset;
7938 9b058f45 2022-06-30 mark view->offset = 0;
7942 9b058f45 2022-06-30 mark * If the selected line is in the section of screen covered by the bottom split,
7943 9b058f45 2022-06-30 mark * scroll down offset lines to move it into view and index its new position.
7945 9b058f45 2022-06-30 mark static const struct got_error *
7946 9b058f45 2022-06-30 mark offset_selection_down(struct tog_view *view)
7948 9b058f45 2022-06-30 mark const struct got_error *err = NULL;
7949 9b058f45 2022-06-30 mark const struct got_error *(*scrolld)(struct tog_view *, int);
7950 9b058f45 2022-06-30 mark int *selected = NULL;
7951 9b058f45 2022-06-30 mark int header, offset;
7953 9b058f45 2022-06-30 mark switch (view->type) {
7954 9b058f45 2022-06-30 mark case TOG_VIEW_BLAME: {
7955 9b058f45 2022-06-30 mark struct tog_blame_view_state *s = &view->state.blame;
7956 9b058f45 2022-06-30 mark header = 3;
7957 9b058f45 2022-06-30 mark scrolld = NULL;
7958 9b058f45 2022-06-30 mark if (s->selected_line > view->nlines - header) {
7959 9b058f45 2022-06-30 mark offset = abs(view->nlines - s->selected_line - header);
7960 9b058f45 2022-06-30 mark s->first_displayed_line += offset;
7961 9b058f45 2022-06-30 mark s->selected_line -= offset;
7962 9b058f45 2022-06-30 mark view->offset = offset;
7966 9b058f45 2022-06-30 mark case TOG_VIEW_LOG: {
7967 9b058f45 2022-06-30 mark struct tog_log_view_state *s = &view->state.log;
7968 9b058f45 2022-06-30 mark scrolld = &log_scroll_down;
7969 d2366e29 2022-07-07 mark header = view_is_parent_view(view) ? 3 : 2;
7970 9b058f45 2022-06-30 mark selected = &s->selected;
7973 9b058f45 2022-06-30 mark case TOG_VIEW_REF: {
7974 9b058f45 2022-06-30 mark struct tog_ref_view_state *s = &view->state.ref;
7975 9b058f45 2022-06-30 mark scrolld = &ref_scroll_down;
7976 9b058f45 2022-06-30 mark header = 3;
7977 9b058f45 2022-06-30 mark selected = &s->selected;
7980 9b058f45 2022-06-30 mark case TOG_VIEW_TREE: {
7981 9b058f45 2022-06-30 mark struct tog_tree_view_state *s = &view->state.tree;
7982 9b058f45 2022-06-30 mark scrolld = &tree_scroll_down;
7983 9b058f45 2022-06-30 mark header = 5;
7984 9b058f45 2022-06-30 mark selected = &s->selected;
7988 9b058f45 2022-06-30 mark selected = NULL;
7989 9b058f45 2022-06-30 mark scrolld = NULL;
7990 9b058f45 2022-06-30 mark header = 0;
7994 9b058f45 2022-06-30 mark if (selected && *selected > view->nlines - header) {
7995 9b058f45 2022-06-30 mark offset = abs(view->nlines - *selected - header);
7996 9b058f45 2022-06-30 mark view->offset = offset;
7997 9b058f45 2022-06-30 mark if (scrolld && offset) {
7998 9b058f45 2022-06-30 mark err = scrolld(view, offset);
7999 9b058f45 2022-06-30 mark *selected -= offset;
8003 9b058f45 2022-06-30 mark return err;
8006 9b058f45 2022-06-30 mark static void
8007 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
8011 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
8012 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
8013 3e166534 2022-02-16 naddy const struct tog_cmd *cmd = &tog_commands[i];
8014 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->name);
8016 6879ba42 2020-10-01 naddy fputc('\n', fp);
8019 4ed7e80c 2018-05-20 stsp __dead static void
8020 6879ba42 2020-10-01 naddy usage(int hflag, int status)
8022 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
8024 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
8025 6879ba42 2020-10-01 naddy getprogname());
8026 6879ba42 2020-10-01 naddy if (hflag) {
8027 6879ba42 2020-10-01 naddy fprintf(fp, "lazy usage: %s path\n", getprogname());
8028 6879ba42 2020-10-01 naddy list_commands(fp);
8030 6879ba42 2020-10-01 naddy exit(status);
8033 c2301be8 2018-04-30 stsp static char **
8034 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
8036 ee85c5e8 2020-02-29 stsp va_list ap;
8037 c2301be8 2018-04-30 stsp char **argv;
8040 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
8042 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
8043 c2301be8 2018-04-30 stsp if (argv == NULL)
8044 c2301be8 2018-04-30 stsp err(1, "calloc");
8045 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
8046 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
8047 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
8048 e10c916e 2019-09-15 hiltjo err(1, "strdup");
8051 ee85c5e8 2020-02-29 stsp va_end(ap);
8052 c2301be8 2018-04-30 stsp return argv;
8056 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
8057 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
8058 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
8059 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
8060 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
8062 ee85c5e8 2020-02-29 stsp static const struct got_error *
8063 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
8065 1d0f4054 2021-06-17 stsp const struct got_error *error = NULL, *close_err;
8066 3e166534 2022-02-16 naddy const struct tog_cmd *cmd = NULL;
8067 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
8068 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
8069 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
8070 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
8071 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
8072 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
8073 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
8075 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
8076 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
8077 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
8079 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
8080 0ae84acc 2022-06-15 tracey if (error != NULL)
8081 0ae84acc 2022-06-15 tracey goto done;
8083 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
8084 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
8085 ee85c5e8 2020-02-29 stsp goto done;
8087 ee85c5e8 2020-02-29 stsp if (worktree)
8088 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
8090 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
8091 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
8092 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
8093 ee85c5e8 2020-02-29 stsp goto done;
8096 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8097 ee85c5e8 2020-02-29 stsp if (error != NULL)
8098 ee85c5e8 2020-02-29 stsp goto done;
8100 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
8101 ee85c5e8 2020-02-29 stsp repo, worktree);
8102 ee85c5e8 2020-02-29 stsp if (error)
8103 ee85c5e8 2020-02-29 stsp goto done;
8105 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
8106 84de9106 2020-12-26 stsp if (error)
8107 84de9106 2020-12-26 stsp goto done;
8108 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
8109 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
8110 87670572 2020-12-26 naddy GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
8111 ee85c5e8 2020-02-29 stsp if (error)
8112 ee85c5e8 2020-02-29 stsp goto done;
8114 ee85c5e8 2020-02-29 stsp if (worktree) {
8115 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
8116 ee85c5e8 2020-02-29 stsp worktree = NULL;
8119 a44927cc 2022-04-07 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
8120 a44927cc 2022-04-07 stsp if (error)
8121 a44927cc 2022-04-07 stsp goto done;
8123 a44927cc 2022-04-07 stsp error = got_object_id_by_path(&id, repo, commit, in_repo_path);
8124 ee85c5e8 2020-02-29 stsp if (error) {
8125 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
8126 ee85c5e8 2020-02-29 stsp goto done;
8127 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
8128 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
8129 6879ba42 2020-10-01 naddy usage(1, 1);
8130 ee85c5e8 2020-02-29 stsp /* not reached */
8133 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
8134 ee85c5e8 2020-02-29 stsp if (error)
8135 ee85c5e8 2020-02-29 stsp goto done;
8137 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
8139 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
8140 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
8142 1d0f4054 2021-06-17 stsp if (repo) {
8143 1d0f4054 2021-06-17 stsp close_err = got_repo_close(repo);
8144 1d0f4054 2021-06-17 stsp if (error == NULL)
8145 1d0f4054 2021-06-17 stsp error = close_err;
8147 a44927cc 2022-04-07 stsp if (commit)
8148 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
8149 ee85c5e8 2020-02-29 stsp if (worktree)
8150 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
8151 0ae84acc 2022-06-15 tracey if (pack_fds) {
8152 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
8153 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
8154 0ae84acc 2022-06-15 tracey if (error == NULL)
8155 0ae84acc 2022-06-15 tracey error = pack_err;
8158 ee85c5e8 2020-02-29 stsp free(commit_id_str);
8159 ee85c5e8 2020-02-29 stsp free(commit_id);
8160 ee85c5e8 2020-02-29 stsp free(cwd);
8161 ee85c5e8 2020-02-29 stsp free(repo_path);
8162 ee85c5e8 2020-02-29 stsp free(in_repo_path);
8163 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
8165 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
8166 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
8167 ee85c5e8 2020-02-29 stsp free(cmd_argv);
8169 87670572 2020-12-26 naddy tog_free_refs();
8170 ee85c5e8 2020-02-29 stsp return error;
8174 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
8176 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
8177 3e166534 2022-02-16 naddy const struct tog_cmd *cmd = NULL;
8178 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
8179 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
8180 3e166534 2022-02-16 naddy static const struct option longopts[] = {
8181 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
8182 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0}
8184 917d79a7 2022-07-01 stsp char *diff_algo_str = NULL;
8186 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
8188 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
8189 9f7d7167 2018-04-29 stsp switch (ch) {
8191 9f7d7167 2018-04-29 stsp hflag = 1;
8194 53ccebc2 2019-07-30 stsp Vflag = 1;
8197 6879ba42 2020-10-01 naddy usage(hflag, 1);
8198 9f7d7167 2018-04-29 stsp /* NOTREACHED */
8202 9f7d7167 2018-04-29 stsp argc -= optind;
8203 9f7d7167 2018-04-29 stsp argv += optind;
8204 9814e6a3 2020-09-27 naddy optind = 1;
8205 c2301be8 2018-04-30 stsp optreset = 1;
8207 53ccebc2 2019-07-30 stsp if (Vflag) {
8208 53ccebc2 2019-07-30 stsp got_version_print_str();
8209 6879ba42 2020-10-01 naddy return 0;
8212 4010e238 2020-12-04 stsp #ifndef PROFILE
8213 4010e238 2020-12-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
8214 4010e238 2020-12-04 stsp NULL) == -1)
8215 4010e238 2020-12-04 stsp err(1, "pledge");
8218 c2301be8 2018-04-30 stsp if (argc == 0) {
8219 f29d3e89 2018-06-23 stsp if (hflag)
8220 6879ba42 2020-10-01 naddy usage(hflag, 0);
8221 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
8222 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
8224 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
8228 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
8229 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
8230 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
8231 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
8232 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
8238 917d79a7 2022-07-01 stsp diff_algo_str = getenv("TOG_DIFF_ALGORITHM");
8239 917d79a7 2022-07-01 stsp if (diff_algo_str) {
8240 917d79a7 2022-07-01 stsp if (strcasecmp(diff_algo_str, "patience") == 0)
8241 917d79a7 2022-07-01 stsp tog_diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
8242 917d79a7 2022-07-01 stsp if (strcasecmp(diff_algo_str, "myers") == 0)
8243 917d79a7 2022-07-01 stsp tog_diff_algo = GOT_DIFF_ALGORITHM_MYERS;
8246 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
8247 ee85c5e8 2020-02-29 stsp if (argc != 1)
8248 6879ba42 2020-10-01 naddy usage(0, 1);
8249 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
8250 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
8252 ee85c5e8 2020-02-29 stsp if (hflag)
8253 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
8255 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
8259 b46c1e04 2020-09-20 naddy putchar('\n');
8260 a2f4a359 2020-02-28 stsp if (cmd_argv) {
8262 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
8263 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
8264 a2f4a359 2020-02-28 stsp free(cmd_argv);
8267 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
8268 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
