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 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
110 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
111 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
112 ba4f502b 2018-08-04 stsp struct got_object_id *id;
113 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
116 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
117 ba4f502b 2018-08-04 stsp struct commit_queue {
118 ba4f502b 2018-08-04 stsp int ncommits;
119 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
122 f26dddb7 2019-11-08 stsp struct tog_color {
123 dbdddfee 2021-06-23 naddy STAILQ_ENTRY(tog_color) entry;
124 6d17833f 2019-11-08 stsp regex_t regex;
125 6d17833f 2019-11-08 stsp short colorpair;
127 dbdddfee 2021-06-23 naddy STAILQ_HEAD(tog_colors, tog_color);
129 d9dff0e5 2020-12-26 stsp static struct got_reflist_head tog_refs = TAILQ_HEAD_INITIALIZER(tog_refs);
130 51a10b52 2020-12-26 stsp static struct got_reflist_object_id_map *tog_refs_idmap;
132 cc488aa7 2022-01-23 stsp static const struct got_error *
133 cc488aa7 2022-01-23 stsp tog_ref_cmp_by_name(void *arg, int *cmp, struct got_reference *re1,
134 cc488aa7 2022-01-23 stsp struct got_reference* re2)
136 cc488aa7 2022-01-23 stsp const char *name1 = got_ref_get_name(re1);
137 cc488aa7 2022-01-23 stsp const char *name2 = got_ref_get_name(re2);
138 cc488aa7 2022-01-23 stsp int isbackup1, isbackup2;
140 cc488aa7 2022-01-23 stsp /* Sort backup refs towards the bottom of the list. */
141 cc488aa7 2022-01-23 stsp isbackup1 = strncmp(name1, "refs/got/backup/", 16) == 0;
142 cc488aa7 2022-01-23 stsp isbackup2 = strncmp(name2, "refs/got/backup/", 16) == 0;
143 cc488aa7 2022-01-23 stsp if (!isbackup1 && isbackup2) {
145 cc488aa7 2022-01-23 stsp return NULL;
146 cc488aa7 2022-01-23 stsp } else if (isbackup1 && !isbackup2) {
148 cc488aa7 2022-01-23 stsp return NULL;
151 cc488aa7 2022-01-23 stsp *cmp = got_path_cmp(name1, name2, strlen(name1), strlen(name2));
152 cc488aa7 2022-01-23 stsp return NULL;
155 11b20872 2019-11-08 stsp static const struct got_error *
156 7f66531d 2021-11-16 stsp tog_load_refs(struct got_repository *repo, int sort_by_date)
158 51a10b52 2020-12-26 stsp const struct got_error *err;
160 7f66531d 2021-11-16 stsp err = got_ref_list(&tog_refs, repo, NULL, sort_by_date ?
161 cc488aa7 2022-01-23 stsp got_ref_cmp_by_commit_timestamp_descending : tog_ref_cmp_by_name,
164 51a10b52 2020-12-26 stsp return err;
166 51a10b52 2020-12-26 stsp return got_reflist_object_id_map_create(&tog_refs_idmap, &tog_refs,
170 51a10b52 2020-12-26 stsp static void
171 51a10b52 2020-12-26 stsp tog_free_refs(void)
173 51a10b52 2020-12-26 stsp if (tog_refs_idmap) {
174 f193b038 2020-12-26 stsp got_reflist_object_id_map_free(tog_refs_idmap);
175 51a10b52 2020-12-26 stsp tog_refs_idmap = NULL;
177 51a10b52 2020-12-26 stsp got_ref_list_free(&tog_refs);
180 51a10b52 2020-12-26 stsp static const struct got_error *
181 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
182 11b20872 2019-11-08 stsp int idx, short color)
184 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
185 11b20872 2019-11-08 stsp struct tog_color *tc;
186 11b20872 2019-11-08 stsp int regerr = 0;
188 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
189 11b20872 2019-11-08 stsp return NULL;
191 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
193 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
194 11b20872 2019-11-08 stsp if (tc == NULL)
195 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
196 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
197 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
198 11b20872 2019-11-08 stsp if (regerr) {
199 11b20872 2019-11-08 stsp static char regerr_msg[512];
200 11b20872 2019-11-08 stsp static char err_msg[512];
201 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
202 11b20872 2019-11-08 stsp sizeof(regerr_msg));
203 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
204 11b20872 2019-11-08 stsp regerr_msg);
205 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
207 11b20872 2019-11-08 stsp return err;
209 11b20872 2019-11-08 stsp tc->colorpair = idx;
210 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(colors, tc, entry);
211 11b20872 2019-11-08 stsp return NULL;
214 11b20872 2019-11-08 stsp static void
215 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
217 11b20872 2019-11-08 stsp struct tog_color *tc;
219 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(colors)) {
220 dbdddfee 2021-06-23 naddy tc = STAILQ_FIRST(colors);
221 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(colors, entry);
222 11b20872 2019-11-08 stsp regfree(&tc->regex);
227 11b20872 2019-11-08 stsp struct tog_color *
228 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
230 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
232 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(tc, colors, entry) {
233 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
237 11b20872 2019-11-08 stsp return NULL;
241 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
243 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
244 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
245 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
246 11b20872 2019-11-08 stsp return COLOR_CYAN;
247 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
248 11b20872 2019-11-08 stsp return COLOR_YELLOW;
249 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
250 11b20872 2019-11-08 stsp return COLOR_GREEN;
251 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
252 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
253 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
254 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
255 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
256 91b8c405 2020-01-25 stsp return COLOR_CYAN;
257 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
258 11b20872 2019-11-08 stsp return COLOR_GREEN;
259 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
260 11b20872 2019-11-08 stsp return COLOR_GREEN;
261 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
262 11b20872 2019-11-08 stsp return COLOR_CYAN;
263 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
264 11b20872 2019-11-08 stsp return COLOR_YELLOW;
265 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_HEADS") == 0)
266 6458efa5 2020-11-24 stsp return COLOR_GREEN;
267 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_TAGS") == 0)
268 6458efa5 2020-11-24 stsp return COLOR_MAGENTA;
269 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_REMOTES") == 0)
270 6458efa5 2020-11-24 stsp return COLOR_YELLOW;
271 cc488aa7 2022-01-23 stsp if (strcmp(envvar, "TOG_COLOR_REFS_BACKUP") == 0)
272 cc488aa7 2022-01-23 stsp return COLOR_CYAN;
278 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
280 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
282 11b20872 2019-11-08 stsp if (val == NULL)
283 11b20872 2019-11-08 stsp return default_color_value(envvar);
285 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
286 11b20872 2019-11-08 stsp return COLOR_BLACK;
287 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
288 11b20872 2019-11-08 stsp return COLOR_RED;
289 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
290 11b20872 2019-11-08 stsp return COLOR_GREEN;
291 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
292 11b20872 2019-11-08 stsp return COLOR_YELLOW;
293 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
294 11b20872 2019-11-08 stsp return COLOR_BLUE;
295 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
296 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
297 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
298 11b20872 2019-11-08 stsp return COLOR_CYAN;
299 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
300 11b20872 2019-11-08 stsp return COLOR_WHITE;
301 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
304 11b20872 2019-11-08 stsp return default_color_value(envvar);
308 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
309 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
310 3dbaef42 2020-11-24 stsp const char *label1, *label2;
311 b72706c3 2022-06-01 stsp FILE *f, *f1, *f2;
312 15a087fe 2019-02-21 stsp int first_displayed_line;
313 15a087fe 2019-02-21 stsp int last_displayed_line;
315 15a087fe 2019-02-21 stsp int diff_context;
316 3dbaef42 2020-11-24 stsp int ignore_whitespace;
317 64453f7e 2020-11-21 stsp int force_text_diff;
318 15a087fe 2019-02-21 stsp struct got_repository *repo;
319 bddb1296 2019-11-08 stsp struct tog_colors colors;
320 fe621944 2020-11-10 stsp size_t nlines;
321 f44b1f58 2020-02-02 tracey off_t *line_offsets;
322 f44b1f58 2020-02-02 tracey int matched_line;
323 f44b1f58 2020-02-02 tracey int selected_line;
325 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
326 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
329 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
331 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
332 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
333 7c1452c1 2020-03-26 stsp pthread_cond_t commit_loaded;
334 1a76625f 2018-10-22 stsp int commits_needed;
335 fb280deb 2021-08-30 stsp int load_all;
336 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
337 1a76625f 2018-10-22 stsp struct commit_queue *commits;
338 1a76625f 2018-10-22 stsp const char *in_repo_path;
339 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
340 1a76625f 2018-10-22 stsp struct got_repository *repo;
341 74467cc8 2022-06-15 stsp int *pack_fds;
342 1a76625f 2018-10-22 stsp int log_complete;
343 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
344 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
345 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
346 13add988 2019-10-15 stsp int *searching;
347 13add988 2019-10-15 stsp int *search_next_done;
348 13add988 2019-10-15 stsp regex_t *regex;
351 1a76625f 2018-10-22 stsp struct tog_log_view_state {
352 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
353 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
354 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
355 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
356 b01e7d3b 2018-08-04 stsp int selected;
357 b01e7d3b 2018-08-04 stsp char *in_repo_path;
358 9cd7cbd1 2020-12-07 stsp char *head_ref_name;
359 b672a97a 2020-01-27 stsp int log_branches;
360 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
361 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
362 1a76625f 2018-10-22 stsp sig_atomic_t quit;
363 1a76625f 2018-10-22 stsp pthread_t thread;
364 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
365 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
366 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
367 11b20872 2019-11-08 stsp struct tog_colors colors;
370 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
371 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
372 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
373 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
374 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
375 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
376 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
377 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
378 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
379 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
380 bf30f154 2020-12-07 naddy #define TOG_COLOR_DATE 11
381 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_HEADS 12
382 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_TAGS 13
383 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_REMOTES 14
384 cc488aa7 2022-01-23 stsp #define TOG_COLOR_REFS_BACKUP 15
386 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
387 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
388 e9424729 2018-08-04 stsp int nlines;
390 e9424729 2018-08-04 stsp struct tog_view *view;
391 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
395 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
396 e9424729 2018-08-04 stsp const char *path;
397 e9424729 2018-08-04 stsp struct got_repository *repo;
398 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
399 e9424729 2018-08-04 stsp int *complete;
400 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
401 fc06ba56 2019-08-22 stsp void *cancel_arg;
404 e9424729 2018-08-04 stsp struct tog_blame {
406 be659d10 2020-11-18 stsp off_t filesize;
407 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
408 6fcac457 2018-11-19 stsp int nlines;
409 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
410 e9424729 2018-08-04 stsp pthread_t thread;
411 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
412 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
413 e9424729 2018-08-04 stsp const char *path;
414 0ae84acc 2022-06-15 tracey int *pack_fds;
417 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
418 7cbe629d 2018-08-04 stsp int first_displayed_line;
419 7cbe629d 2018-08-04 stsp int last_displayed_line;
420 7cbe629d 2018-08-04 stsp int selected_line;
421 7cbe629d 2018-08-04 stsp int blame_complete;
424 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
425 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
426 e5a0f69f 2018-08-18 stsp char *path;
427 7cbe629d 2018-08-04 stsp struct got_repository *repo;
428 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
429 e9424729 2018-08-04 stsp struct tog_blame blame;
430 6c4c42e0 2019-06-24 stsp int matched_line;
431 11b20872 2019-11-08 stsp struct tog_colors colors;
434 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
435 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
436 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
437 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
438 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
439 ad80ab7b 2018-08-04 stsp int selected;
442 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
444 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
445 ad80ab7b 2018-08-04 stsp char *tree_label;
446 bc573f3b 2021-07-10 stsp struct got_object_id *commit_id;/* commit which this tree belongs to */
447 bc573f3b 2021-07-10 stsp struct got_tree_object *root; /* the commit's root tree entry */
448 bc573f3b 2021-07-10 stsp struct got_tree_object *tree; /* currently displayed (sub-)tree */
449 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
450 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
451 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
452 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
453 bc573f3b 2021-07-10 stsp struct tog_parent_trees parents; /* parent trees of current sub-tree */
454 9cd7cbd1 2020-12-07 stsp char *head_ref_name;
455 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
456 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
457 6458efa5 2020-11-24 stsp struct tog_colors colors;
460 6458efa5 2020-11-24 stsp struct tog_reflist_entry {
461 6458efa5 2020-11-24 stsp TAILQ_ENTRY(tog_reflist_entry) entry;
462 6458efa5 2020-11-24 stsp struct got_reference *ref;
466 6458efa5 2020-11-24 stsp TAILQ_HEAD(tog_reflist_head, tog_reflist_entry);
468 6458efa5 2020-11-24 stsp struct tog_ref_view_state {
469 dae613fa 2020-12-26 stsp struct tog_reflist_head refs;
470 6458efa5 2020-11-24 stsp struct tog_reflist_entry *first_displayed_entry;
471 6458efa5 2020-11-24 stsp struct tog_reflist_entry *last_displayed_entry;
472 6458efa5 2020-11-24 stsp struct tog_reflist_entry *selected_entry;
473 b4996bee 2022-06-16 stsp int nrefs, ndisplayed, selected, show_date, show_ids, sort_by_date;
474 6458efa5 2020-11-24 stsp struct got_repository *repo;
475 6458efa5 2020-11-24 stsp struct tog_reflist_entry *matched_entry;
476 bddb1296 2019-11-08 stsp struct tog_colors colors;
480 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
482 e78dc838 2020-12-04 stsp * The 'Tab' key switches focus between a parent view and its child view.
483 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
484 669b5ffa 2018-10-07 stsp * there is enough screen estate.
486 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
487 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
489 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
490 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
491 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
493 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
494 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
496 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
498 cc3c9aac 2018-08-01 stsp struct tog_view {
499 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
500 26ed57b2 2018-05-19 stsp WINDOW *window;
501 26ed57b2 2018-05-19 stsp PANEL *panel;
502 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
503 145b6838 2022-06-16 stsp int maxx, x; /* max column and current start column */
504 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
505 e78dc838 2020-12-04 stsp int focussed; /* Only set on one parent or child view at a time. */
507 669b5ffa 2018-10-07 stsp struct tog_view *parent;
508 669b5ffa 2018-10-07 stsp struct tog_view *child;
511 e78dc838 2020-12-04 stsp * This flag is initially set on parent views when a new child view
512 e78dc838 2020-12-04 stsp * is created. It gets toggled when the 'Tab' key switches focus
513 e78dc838 2020-12-04 stsp * between parent and child.
514 e78dc838 2020-12-04 stsp * The flag indicates whether focus should be passed on to our child
515 e78dc838 2020-12-04 stsp * view if this parent view gets picked for focus after another parent
516 e78dc838 2020-12-04 stsp * view was closed. This prevents child views from losing focus in such
517 e78dc838 2020-12-04 stsp * situations.
519 e78dc838 2020-12-04 stsp int focus_child;
521 5dc9f4bc 2018-08-04 stsp /* type-specific state */
522 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
524 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
525 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
526 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
527 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
528 6458efa5 2020-11-24 stsp struct tog_ref_view_state ref;
531 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
532 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
533 e78dc838 2020-12-04 stsp struct tog_view *, int);
534 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
536 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
537 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
538 c0c4acc8 2021-01-24 stsp int search_started;
539 60493ae3 2019-06-20 stsp int searching;
540 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
541 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
542 60493ae3 2019-06-20 stsp int search_next_done;
543 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_HAVE_MORE 1
544 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_NO_MORE 2
545 f9967bca 2020-03-27 stsp #define TOG_SEARCH_HAVE_NONE 3
546 1803e47f 2019-06-22 stsp regex_t regex;
547 41605754 2020-11-12 stsp regmatch_t regmatch;
550 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
551 3dbaef42 2020-11-24 stsp struct got_object_id *, struct got_object_id *,
552 3dbaef42 2020-11-24 stsp const char *, const char *, int, int, int, struct tog_view *,
553 78756c87 2020-11-24 stsp struct got_repository *);
554 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
555 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
556 e78dc838 2020-12-04 stsp struct tog_view *, int);
557 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
558 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
559 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
561 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
562 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *,
563 78756c87 2020-11-24 stsp const char *, const char *, int);
564 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
565 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
566 e78dc838 2020-12-04 stsp struct tog_view *, int);
567 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
568 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
569 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
571 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
572 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *);
573 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
574 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
575 e78dc838 2020-12-04 stsp struct tog_view *, int);
576 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
577 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
578 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
580 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
581 bc573f3b 2021-07-10 stsp struct got_object_id *, const char *, struct got_repository *);
582 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
583 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
584 e78dc838 2020-12-04 stsp struct tog_view *, int);
585 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
586 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
587 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
589 6458efa5 2020-11-24 stsp static const struct got_error *open_ref_view(struct tog_view *,
590 6458efa5 2020-11-24 stsp struct got_repository *);
591 6458efa5 2020-11-24 stsp static const struct got_error *show_ref_view(struct tog_view *);
592 6458efa5 2020-11-24 stsp static const struct got_error *input_ref_view(struct tog_view **,
593 e78dc838 2020-12-04 stsp struct tog_view *, int);
594 6458efa5 2020-11-24 stsp static const struct got_error *close_ref_view(struct tog_view *);
595 6458efa5 2020-11-24 stsp static const struct got_error *search_start_ref_view(struct tog_view *);
596 6458efa5 2020-11-24 stsp static const struct got_error *search_next_ref_view(struct tog_view *);
598 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
599 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
600 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
601 2497f032 2022-05-31 stsp static volatile sig_atomic_t tog_sigint_received;
602 2497f032 2022-05-31 stsp static volatile sig_atomic_t tog_sigterm_received;
604 25791caa 2018-10-24 stsp static void
605 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
607 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
610 83baff54 2019-08-12 stsp static void
611 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
613 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
616 61266923 2020-01-14 stsp static void
617 61266923 2020-01-14 stsp tog_sigcont(int signo)
619 61266923 2020-01-14 stsp tog_sigcont_received = 1;
622 2497f032 2022-05-31 stsp static void
623 2497f032 2022-05-31 stsp tog_sigint(int signo)
625 2497f032 2022-05-31 stsp tog_sigint_received = 1;
628 2497f032 2022-05-31 stsp static void
629 2497f032 2022-05-31 stsp tog_sigterm(int signo)
631 2497f032 2022-05-31 stsp tog_sigterm_received = 1;
635 dd6e31d7 2022-06-17 stsp tog_fatal_signal_received(void)
637 2497f032 2022-05-31 stsp return (tog_sigpipe_received ||
638 2497f032 2022-05-31 stsp tog_sigint_received || tog_sigint_received);
642 e5a0f69f 2018-08-18 stsp static const struct got_error *
643 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
645 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
647 669b5ffa 2018-10-07 stsp if (view->child) {
648 669b5ffa 2018-10-07 stsp view_close(view->child);
649 669b5ffa 2018-10-07 stsp view->child = NULL;
651 e5a0f69f 2018-08-18 stsp if (view->close)
652 e5a0f69f 2018-08-18 stsp err = view->close(view);
653 ea5e7bb5 2018-08-01 stsp if (view->panel)
654 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
655 ea5e7bb5 2018-08-01 stsp if (view->window)
656 ea5e7bb5 2018-08-01 stsp delwin(view->window);
657 ea5e7bb5 2018-08-01 stsp free(view);
658 e5a0f69f 2018-08-18 stsp return err;
661 ea5e7bb5 2018-08-01 stsp static struct tog_view *
662 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
663 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
665 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
667 ea5e7bb5 2018-08-01 stsp if (view == NULL)
668 ea5e7bb5 2018-08-01 stsp return NULL;
670 d6b05b5b 2018-08-04 stsp view->type = type;
671 f7d12f7e 2018-08-01 stsp view->lines = LINES;
672 f7d12f7e 2018-08-01 stsp view->cols = COLS;
673 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
674 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
675 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
676 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
677 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
678 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
679 96a765a8 2018-08-04 stsp view_close(view);
680 ea5e7bb5 2018-08-01 stsp return NULL;
682 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
683 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
684 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
685 96a765a8 2018-08-04 stsp view_close(view);
686 ea5e7bb5 2018-08-01 stsp return NULL;
689 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
690 ea5e7bb5 2018-08-01 stsp return view;
694 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
696 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
698 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
701 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
703 5c60c32a 2018-10-18 stsp static const struct got_error *
704 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
706 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
708 5c60c32a 2018-10-18 stsp view->begin_y = 0;
709 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
710 5c60c32a 2018-10-18 stsp view->nlines = LINES;
711 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
712 5c60c32a 2018-10-18 stsp view->lines = LINES;
713 5c60c32a 2018-10-18 stsp view->cols = COLS;
714 5c60c32a 2018-10-18 stsp err = view_resize(view);
716 5c60c32a 2018-10-18 stsp return err;
718 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
719 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
721 5c60c32a 2018-10-18 stsp return NULL;
724 5c60c32a 2018-10-18 stsp static const struct got_error *
725 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
727 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
729 5c60c32a 2018-10-18 stsp view->begin_x = 0;
730 5c60c32a 2018-10-18 stsp view->begin_y = 0;
731 5c60c32a 2018-10-18 stsp view->nlines = LINES;
732 5c60c32a 2018-10-18 stsp view->ncols = COLS;
733 5c60c32a 2018-10-18 stsp view->lines = LINES;
734 5c60c32a 2018-10-18 stsp view->cols = COLS;
735 5c60c32a 2018-10-18 stsp err = view_resize(view);
737 5c60c32a 2018-10-18 stsp return err;
739 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
740 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
742 5c60c32a 2018-10-18 stsp return NULL;
746 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
748 5c60c32a 2018-10-18 stsp return view->parent == NULL;
751 4d8c2215 2018-08-19 stsp static const struct got_error *
752 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
754 f7d12f7e 2018-08-01 stsp int nlines, ncols;
756 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
757 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
759 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
761 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
762 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
764 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
766 6e3e5d9c 2018-10-18 stsp if (view->child) {
767 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
768 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
769 0dbbbe90 2022-06-17 op ncols = COLS;
771 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
772 5c60c32a 2018-10-18 stsp if (view->child->focussed)
773 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
775 5c60c32a 2018-10-18 stsp show_panel(view->panel);
777 0dbbbe90 2022-06-17 op ncols = view->child->begin_x;
779 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
780 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
782 0dbbbe90 2022-06-17 op } else if (view->parent == NULL)
783 0dbbbe90 2022-06-17 op ncols = COLS;
785 0dbbbe90 2022-06-17 op if (wresize(view->window, nlines, ncols) == ERR)
786 0dbbbe90 2022-06-17 op return got_error_from_errno("wresize");
787 0dbbbe90 2022-06-17 op if (replace_panel(view->panel, view->window) == ERR)
788 0dbbbe90 2022-06-17 op return got_error_from_errno("replace_panel");
789 0dbbbe90 2022-06-17 op wclear(view->window);
791 0dbbbe90 2022-06-17 op view->nlines = nlines;
792 0dbbbe90 2022-06-17 op view->ncols = ncols;
793 0dbbbe90 2022-06-17 op view->lines = LINES;
794 0dbbbe90 2022-06-17 op view->cols = COLS;
796 5c60c32a 2018-10-18 stsp return NULL;
799 669b5ffa 2018-10-07 stsp static const struct got_error *
800 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
802 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
804 669b5ffa 2018-10-07 stsp if (view->child == NULL)
805 669b5ffa 2018-10-07 stsp return NULL;
807 669b5ffa 2018-10-07 stsp err = view_close(view->child);
808 669b5ffa 2018-10-07 stsp view->child = NULL;
809 669b5ffa 2018-10-07 stsp return err;
812 0dbbbe90 2022-06-17 op static const struct got_error *
813 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
815 669b5ffa 2018-10-07 stsp view->child = child;
816 669b5ffa 2018-10-07 stsp child->parent = view;
818 0dbbbe90 2022-06-17 op return view_resize(view);
822 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
824 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
827 34bc9ec9 2019-02-22 stsp static void
828 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
830 25791caa 2018-10-24 stsp int cols, lines;
831 25791caa 2018-10-24 stsp struct winsize size;
833 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
834 25791caa 2018-10-24 stsp cols = 80; /* Default */
835 25791caa 2018-10-24 stsp lines = 24;
837 25791caa 2018-10-24 stsp cols = size.ws_col;
838 25791caa 2018-10-24 stsp lines = size.ws_row;
840 25791caa 2018-10-24 stsp resize_term(lines, cols);
843 2b49a8ae 2019-06-22 stsp static const struct got_error *
844 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
846 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
847 2b49a8ae 2019-06-22 stsp char pattern[1024];
850 c0c4acc8 2021-01-24 stsp if (view->search_started) {
851 c0c4acc8 2021-01-24 stsp regfree(&view->regex);
852 c0c4acc8 2021-01-24 stsp view->searching = 0;
853 c0c4acc8 2021-01-24 stsp memset(&view->regmatch, 0, sizeof(view->regmatch));
855 c0c4acc8 2021-01-24 stsp view->search_started = 0;
857 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
858 2b49a8ae 2019-06-22 stsp return NULL;
860 cb1159f8 2020-02-19 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
861 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
863 2b49a8ae 2019-06-22 stsp nocbreak();
865 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
868 2b49a8ae 2019-06-22 stsp if (ret == ERR)
869 2b49a8ae 2019-06-22 stsp return NULL;
871 41605754 2020-11-12 stsp if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) {
872 7c32bd05 2019-06-22 stsp err = view->search_start(view);
874 7c32bd05 2019-06-22 stsp regfree(&view->regex);
875 7c32bd05 2019-06-22 stsp return err;
877 c0c4acc8 2021-01-24 stsp view->search_started = 1;
878 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
879 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
880 2b49a8ae 2019-06-22 stsp view->search_next(view);
883 2b49a8ae 2019-06-22 stsp return NULL;
886 0cf4efb1 2018-09-29 stsp static const struct got_error *
887 e78dc838 2020-12-04 stsp view_input(struct tog_view **new, int *done, struct tog_view *view,
888 e78dc838 2020-12-04 stsp struct tog_view_list_head *views)
890 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
891 669b5ffa 2018-10-07 stsp struct tog_view *v;
892 1a76625f 2018-10-22 stsp int ch, errcode;
894 e5a0f69f 2018-08-18 stsp *new = NULL;
896 f9967bca 2020-03-27 stsp /* Clear "no matches" indicator. */
897 f9967bca 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE ||
898 f9967bca 2020-03-27 stsp view->search_next_done == TOG_SEARCH_HAVE_NONE)
899 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
901 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
902 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
903 82954512 2020-02-03 stsp if (errcode)
904 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
905 82954512 2020-02-03 stsp "pthread_mutex_unlock");
906 3da8ef85 2021-09-21 stsp sched_yield();
907 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
908 82954512 2020-02-03 stsp if (errcode)
909 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
910 82954512 2020-02-03 stsp "pthread_mutex_lock");
911 60493ae3 2019-06-20 stsp view->search_next(view);
912 60493ae3 2019-06-20 stsp return NULL;
915 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
916 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
917 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
918 1a76625f 2018-10-22 stsp if (errcode)
919 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
920 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
921 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
922 1a76625f 2018-10-22 stsp if (errcode)
923 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
924 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
926 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
927 25791caa 2018-10-24 stsp tog_resizeterm();
928 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
929 61266923 2020-01-14 stsp tog_sigcont_received = 0;
930 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
931 25791caa 2018-10-24 stsp err = view_resize(v);
933 25791caa 2018-10-24 stsp return err;
934 e78dc838 2020-12-04 stsp err = v->input(new, v, KEY_RESIZE);
936 25791caa 2018-10-24 stsp return err;
937 cdfcfb03 2020-12-06 stsp if (v->child) {
938 cdfcfb03 2020-12-06 stsp err = view_resize(v->child);
940 cdfcfb03 2020-12-06 stsp return err;
941 cdfcfb03 2020-12-06 stsp err = v->child->input(new, v->child,
942 cdfcfb03 2020-12-06 stsp KEY_RESIZE);
944 cdfcfb03 2020-12-06 stsp return err;
949 e5a0f69f 2018-08-18 stsp switch (ch) {
951 1e37a5c2 2019-05-12 jcs if (view->child) {
952 e78dc838 2020-12-04 stsp view->focussed = 0;
953 e78dc838 2020-12-04 stsp view->child->focussed = 1;
954 e78dc838 2020-12-04 stsp view->focus_child = 1;
955 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
956 e78dc838 2020-12-04 stsp view->focussed = 0;
957 e78dc838 2020-12-04 stsp view->parent->focussed = 1;
958 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
962 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
963 9970f7fc 2020-12-03 stsp view->dying = 1;
969 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
970 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
972 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
973 e78dc838 2020-12-04 stsp view->focussed = 0;
974 e78dc838 2020-12-04 stsp view->child->focussed = 1;
975 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
977 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
980 e78dc838 2020-12-04 stsp err = view->child->input(new, view->child,
981 9970f7fc 2020-12-03 stsp KEY_RESIZE);
983 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
984 e78dc838 2020-12-04 stsp view->parent->focussed = 0;
985 e78dc838 2020-12-04 stsp view->focussed = 1;
986 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
988 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
992 e78dc838 2020-12-04 stsp err = view->input(new, view, KEY_RESIZE);
995 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
998 60493ae3 2019-06-20 stsp if (view->search_start)
999 2b49a8ae 2019-06-22 stsp view_search_start(view);
1001 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
1005 c0c4acc8 2021-01-24 stsp if (view->search_started && view->search_next) {
1006 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
1007 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
1008 60493ae3 2019-06-20 stsp view->search_next_done = 0;
1009 60493ae3 2019-06-20 stsp view->search_next(view);
1011 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
1014 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
1018 e5a0f69f 2018-08-18 stsp return err;
1022 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
1024 0cf4efb1 2018-09-29 stsp PANEL *panel;
1025 7f64f4d6 2020-12-10 naddy const struct tog_view *view_above;
1027 669b5ffa 2018-10-07 stsp if (view->parent)
1028 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
1030 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
1031 0cf4efb1 2018-09-29 stsp if (panel == NULL)
1034 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
1035 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
1036 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
1040 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
1042 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1043 acdafe9c 2020-12-03 stsp if (view->child == NULL || view->child->focussed)
1045 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
1047 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
1050 669b5ffa 2018-10-07 stsp return view->focussed;
1053 bcbd79e2 2018-08-19 stsp static const struct got_error *
1054 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
1056 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1057 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
1058 fb59748f 2020-12-05 stsp struct tog_view *new_view;
1059 fd823528 2018-10-22 stsp int fast_refresh = 10;
1060 1a76625f 2018-10-22 stsp int done = 0, errcode;
1062 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1063 1a76625f 2018-10-22 stsp if (errcode)
1064 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
1066 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
1067 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
1069 1004088d 2018-09-29 stsp view->focussed = 1;
1070 878940b7 2018-09-29 stsp err = view->show(view);
1072 0cf4efb1 2018-09-29 stsp return err;
1073 0cf4efb1 2018-09-29 stsp update_panels();
1074 0cf4efb1 2018-09-29 stsp doupdate();
1075 2497f032 2022-05-31 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_fatal_signal_received()) {
1076 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
1077 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
1078 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
1080 e78dc838 2020-12-04 stsp err = view_input(&new_view, &done, view, &views);
1083 9970f7fc 2020-12-03 stsp if (view->dying) {
1084 e78dc838 2020-12-04 stsp struct tog_view *v, *prev = NULL;
1086 9970f7fc 2020-12-03 stsp if (view_is_parent_view(view))
1087 9970f7fc 2020-12-03 stsp prev = TAILQ_PREV(view, tog_view_list_head,
1089 e78dc838 2020-12-04 stsp else if (view->parent)
1090 669b5ffa 2018-10-07 stsp prev = view->parent;
1092 e78dc838 2020-12-04 stsp if (view->parent) {
1093 9970f7fc 2020-12-03 stsp view->parent->child = NULL;
1094 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
1096 0dbbbe90 2022-06-17 op err = view_resize(view->parent);
1100 9970f7fc 2020-12-03 stsp TAILQ_REMOVE(&views, view, entry);
1102 9970f7fc 2020-12-03 stsp err = view_close(view);
1104 e5a0f69f 2018-08-18 stsp goto done;
1106 e78dc838 2020-12-04 stsp view = NULL;
1107 e78dc838 2020-12-04 stsp TAILQ_FOREACH(v, &views, entry) {
1108 e78dc838 2020-12-04 stsp if (v->focussed)
1111 e78dc838 2020-12-04 stsp if (view == NULL && new_view == NULL) {
1112 e78dc838 2020-12-04 stsp /* No view has focus. Try to pick one. */
1114 e78dc838 2020-12-04 stsp view = prev;
1115 e78dc838 2020-12-04 stsp else if (!TAILQ_EMPTY(&views)) {
1116 e78dc838 2020-12-04 stsp view = TAILQ_LAST(&views,
1117 e78dc838 2020-12-04 stsp tog_view_list_head);
1119 e78dc838 2020-12-04 stsp if (view) {
1120 e78dc838 2020-12-04 stsp if (view->focus_child) {
1121 e78dc838 2020-12-04 stsp view->child->focussed = 1;
1122 e78dc838 2020-12-04 stsp view = view->child;
1124 e78dc838 2020-12-04 stsp view->focussed = 1;
1128 bcbd79e2 2018-08-19 stsp if (new_view) {
1129 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
1130 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
1131 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
1132 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
1134 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
1135 86c66b02 2018-10-18 stsp err = view_close(v);
1137 86c66b02 2018-10-18 stsp goto done;
1140 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
1141 fed7eaa8 2018-10-24 stsp view = new_view;
1143 669b5ffa 2018-10-07 stsp if (view) {
1144 e78dc838 2020-12-04 stsp if (view_is_parent_view(view)) {
1145 e78dc838 2020-12-04 stsp if (view->child && view->child->focussed)
1146 e78dc838 2020-12-04 stsp view = view->child;
1148 e78dc838 2020-12-04 stsp if (view->parent && view->parent->focussed)
1149 e78dc838 2020-12-04 stsp view = view->parent;
1151 e78dc838 2020-12-04 stsp show_panel(view->panel);
1152 e78dc838 2020-12-04 stsp if (view->child && view_is_splitscreen(view->child))
1153 e78dc838 2020-12-04 stsp show_panel(view->child->panel);
1154 e78dc838 2020-12-04 stsp if (view->parent && view_is_splitscreen(view)) {
1155 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1157 1a76625f 2018-10-22 stsp goto done;
1159 669b5ffa 2018-10-07 stsp err = view->show(view);
1161 1a76625f 2018-10-22 stsp goto done;
1162 669b5ffa 2018-10-07 stsp if (view->child) {
1163 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1165 1a76625f 2018-10-22 stsp goto done;
1167 1a76625f 2018-10-22 stsp update_panels();
1168 1a76625f 2018-10-22 stsp doupdate();
1172 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1173 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1174 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1175 e5a0f69f 2018-08-18 stsp view_close(view);
1178 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1179 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1180 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1182 e5a0f69f 2018-08-18 stsp return err;
1185 4ed7e80c 2018-05-20 stsp __dead static void
1186 9f7d7167 2018-04-29 stsp usage_log(void)
1189 c70c5802 2018-08-01 stsp fprintf(stderr,
1190 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1191 9f7d7167 2018-04-29 stsp getprogname());
1195 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1196 80ddbec8 2018-04-29 stsp static const struct got_error *
1197 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1199 00dfcb92 2018-06-11 stsp char *vis = NULL;
1200 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1202 963b370f 2018-05-20 stsp *ws = NULL;
1203 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1204 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1205 00dfcb92 2018-06-11 stsp int vislen;
1206 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1207 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1209 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1210 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1212 00dfcb92 2018-06-11 stsp return err;
1213 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1214 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1215 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1216 a7f50699 2018-06-11 stsp goto done;
1220 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1221 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1222 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1223 a7f50699 2018-06-11 stsp goto done;
1226 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1227 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1229 00dfcb92 2018-06-11 stsp free(vis);
1230 963b370f 2018-05-20 stsp if (err) {
1231 963b370f 2018-05-20 stsp free(*ws);
1232 963b370f 2018-05-20 stsp *ws = NULL;
1233 963b370f 2018-05-20 stsp *wlen = 0;
1235 963b370f 2018-05-20 stsp return err;
1238 145b6838 2022-06-16 stsp static const struct got_error *
1239 145b6838 2022-06-16 stsp expand_tab(char **ptr, const char *src)
1241 145b6838 2022-06-16 stsp char *dst;
1242 145b6838 2022-06-16 stsp size_t len, n, idx = 0, sz = 0;
1244 145b6838 2022-06-16 stsp *ptr = NULL;
1245 145b6838 2022-06-16 stsp n = len = strlen(src);
1246 6e1c41ad 2022-06-16 mark dst = malloc(n + 1);
1247 145b6838 2022-06-16 stsp if (dst == NULL)
1248 145b6838 2022-06-16 stsp return got_error_from_errno("malloc");
1250 145b6838 2022-06-16 stsp while (idx < len && src[idx]) {
1251 145b6838 2022-06-16 stsp const char c = src[idx];
1253 145b6838 2022-06-16 stsp if (c == '\t') {
1254 145b6838 2022-06-16 stsp size_t nb = TABSIZE - sz % TABSIZE;
1257 367ddf28 2022-06-16 mark p = realloc(dst, n + nb);
1258 6e1c41ad 2022-06-16 mark if (p == NULL) {
1259 6e1c41ad 2022-06-16 mark free(dst);
1260 6e1c41ad 2022-06-16 mark return got_error_from_errno("realloc");
1265 6e1c41ad 2022-06-16 mark memset(dst + sz, ' ', nb);
1268 145b6838 2022-06-16 stsp dst[sz++] = src[idx];
1272 145b6838 2022-06-16 stsp dst[sz] = '\0';
1273 145b6838 2022-06-16 stsp *ptr = dst;
1274 145b6838 2022-06-16 stsp return NULL;
1278 4e4a9ac8 2022-06-17 op * Advance at most n columns from wline starting at offset off.
1279 4e4a9ac8 2022-06-17 op * Return the index to the first character after the span operation.
1280 4e4a9ac8 2022-06-17 op * Return the combined column width of all spanned wide character in
1284 4e4a9ac8 2022-06-17 op span_wline(int *rcol, int off, wchar_t *wline, int n, int col_tab_align)
1286 4e4a9ac8 2022-06-17 op int width, i, cols = 0;
1288 4e4a9ac8 2022-06-17 op if (n == 0) {
1289 4e4a9ac8 2022-06-17 op *rcol = cols;
1293 4e4a9ac8 2022-06-17 op for (i = off; wline[i] != L'\0'; ++i) {
1294 4e4a9ac8 2022-06-17 op if (wline[i] == L'\t')
1295 4e4a9ac8 2022-06-17 op width = TABSIZE - ((cols + col_tab_align) % TABSIZE);
1297 4e4a9ac8 2022-06-17 op width = wcwidth(wline[i]);
1299 4e4a9ac8 2022-06-17 op if (width == -1) {
1301 4e4a9ac8 2022-06-17 op wline[i] = L'.';
1304 4e4a9ac8 2022-06-17 op if (cols + width > n)
1306 4e4a9ac8 2022-06-17 op cols += width;
1309 4e4a9ac8 2022-06-17 op *rcol = cols;
1314 ccda2f4d 2022-06-16 stsp * Format a line for display, ensuring that it won't overflow a width limit.
1315 ccda2f4d 2022-06-16 stsp * With scrolling, the width returned refers to the scrolled version of the
1316 ccda2f4d 2022-06-16 stsp * line, which starts at (*wlinep)[*scrollxp]. The caller must free *wlinep.
1318 ccda2f4d 2022-06-16 stsp static const struct got_error *
1319 ccda2f4d 2022-06-16 stsp format_line(wchar_t **wlinep, int *widthp, int *scrollxp,
1320 ccda2f4d 2022-06-16 stsp const char *line, int nscroll, int wlimit, int col_tab_align, int expand)
1322 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1324 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1325 145b6838 2022-06-16 stsp char *exstr = NULL;
1326 963b370f 2018-05-20 stsp size_t wlen;
1327 4e4a9ac8 2022-06-17 op int i, scrollx;
1329 963b370f 2018-05-20 stsp *wlinep = NULL;
1330 b700b5d6 2018-07-10 stsp *widthp = 0;
1332 145b6838 2022-06-16 stsp if (expand) {
1333 145b6838 2022-06-16 stsp err = expand_tab(&exstr, line);
1335 145b6838 2022-06-16 stsp return err;
1338 145b6838 2022-06-16 stsp err = mbs2ws(&wline, &wlen, expand ? exstr : line);
1339 145b6838 2022-06-16 stsp free(exstr);
1341 963b370f 2018-05-20 stsp return err;
1343 4e4a9ac8 2022-06-17 op scrollx = span_wline(&cols, 0, wline, nscroll, col_tab_align);
1345 3f670bfb 2020-12-10 stsp if (wlen > 0 && wline[wlen - 1] == L'\n') {
1346 3f670bfb 2020-12-10 stsp wline[wlen - 1] = L'\0';
1349 3f670bfb 2020-12-10 stsp if (wlen > 0 && wline[wlen - 1] == L'\r') {
1350 3f670bfb 2020-12-10 stsp wline[wlen - 1] = L'\0';
1354 4e4a9ac8 2022-06-17 op i = span_wline(&cols, scrollx, wline, wlimit, col_tab_align);
1355 4e4a9ac8 2022-06-17 op wline[i] = L'\0';
1357 b700b5d6 2018-07-10 stsp if (widthp)
1358 b700b5d6 2018-07-10 stsp *widthp = cols;
1359 ccda2f4d 2022-06-16 stsp if (scrollxp)
1360 ccda2f4d 2022-06-16 stsp *scrollxp = scrollx;
1362 963b370f 2018-05-20 stsp free(wline);
1364 963b370f 2018-05-20 stsp *wlinep = wline;
1365 963b370f 2018-05-20 stsp return err;
1368 8b473291 2019-02-21 stsp static const struct got_error*
1369 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1370 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1372 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1373 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1375 8b473291 2019-02-21 stsp const char *name;
1377 8b473291 2019-02-21 stsp *refs_str = NULL;
1379 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(re, refs, entry) {
1380 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1381 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
1384 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1385 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1387 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1388 8b473291 2019-02-21 stsp name += 5;
1389 cc488aa7 2022-01-23 stsp if (strncmp(name, "got/", 4) == 0 &&
1390 cc488aa7 2022-01-23 stsp strncmp(name, "got/backup/", 11) != 0)
1392 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1393 8b473291 2019-02-21 stsp name += 6;
1394 79cc719f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
1395 8b473291 2019-02-21 stsp name += 8;
1396 79cc719f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
1397 79cc719f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
1400 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
1403 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1404 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
1405 5d844a1e 2019-08-13 stsp if (err) {
1406 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
1407 48cae60d 2020-09-22 stsp free(ref_id);
1410 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1411 5d844a1e 2019-08-13 stsp err = NULL;
1412 5d844a1e 2019-08-13 stsp tag = NULL;
1415 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1416 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
1417 48cae60d 2020-09-22 stsp free(ref_id);
1419 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1420 52b5abe1 2019-08-13 stsp if (cmp != 0)
1422 8b473291 2019-02-21 stsp s = *refs_str;
1423 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1424 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1425 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1427 8b473291 2019-02-21 stsp *refs_str = NULL;
1433 8b473291 2019-02-21 stsp return err;
1436 963b370f 2018-05-20 stsp static const struct got_error *
1437 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1438 27a741e5 2019-09-11 stsp int col_tab_align)
1440 e6b8b890 2020-12-29 naddy char *smallerthan;
1442 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1443 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1444 5813d178 2019-03-09 stsp author = smallerthan + 1;
1445 e6b8b890 2020-12-29 naddy author[strcspn(author, "@>")] = '\0';
1446 ccda2f4d 2022-06-16 stsp return format_line(wauthor, author_width, NULL, author, 0, limit,
1447 ccda2f4d 2022-06-16 stsp col_tab_align, 0);
1450 5813d178 2019-03-09 stsp static const struct got_error *
1451 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1452 8fdc79fe 2020-12-01 naddy struct got_object_id *id, const size_t date_display_cols,
1453 8fdc79fe 2020-12-01 naddy int author_display_cols)
1455 8fdc79fe 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
1456 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1457 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1458 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1459 5813d178 2019-03-09 stsp char *author = NULL;
1460 ccda2f4d 2022-06-16 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1461 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1462 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1463 ccda2f4d 2022-06-16 stsp int col, limit, scrollx;
1464 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1465 ccb26ccd 2018-11-05 stsp struct tm tm;
1466 45d799e2 2018-12-23 stsp time_t committer_time;
1467 11b20872 2019-11-08 stsp struct tog_color *tc;
1469 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1470 e385fc42 2021-08-30 stsp if (gmtime_r(&committer_time, &tm) == NULL)
1471 e385fc42 2021-08-30 stsp return got_error_from_errno("gmtime_r");
1472 ec6d1a36 2021-03-21 jrick if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0)
1473 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1475 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1476 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1478 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1479 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_DATE);
1481 11b20872 2019-11-08 stsp wattr_on(view->window,
1482 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1483 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1485 11b20872 2019-11-08 stsp wattr_off(view->window,
1486 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1487 27a741e5 2019-09-11 stsp col = limit;
1488 b39d25c7 2018-07-10 stsp if (col > avail)
1489 b39d25c7 2018-07-10 stsp goto done;
1491 6570a66d 2019-11-08 stsp if (avail >= 120) {
1492 6570a66d 2019-11-08 stsp char *id_str;
1493 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1495 6570a66d 2019-11-08 stsp goto done;
1496 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
1498 11b20872 2019-11-08 stsp wattr_on(view->window,
1499 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1500 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1502 11b20872 2019-11-08 stsp wattr_off(view->window,
1503 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1504 6570a66d 2019-11-08 stsp free(id_str);
1506 6570a66d 2019-11-08 stsp if (col > avail)
1507 6570a66d 2019-11-08 stsp goto done;
1510 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1511 5813d178 2019-03-09 stsp if (author == NULL) {
1512 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1513 80ddbec8 2018-04-29 stsp goto done;
1515 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1517 bb737323 2018-05-20 stsp goto done;
1518 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_AUTHOR);
1520 11b20872 2019-11-08 stsp wattr_on(view->window,
1521 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1522 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1524 11b20872 2019-11-08 stsp wattr_off(view->window,
1525 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1526 bb737323 2018-05-20 stsp col += author_width;
1527 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1528 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1530 bb737323 2018-05-20 stsp author_width++;
1532 9c2eaf34 2018-05-20 stsp if (col > avail)
1533 9c2eaf34 2018-05-20 stsp goto done;
1535 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1537 6d9fbc00 2018-04-29 stsp goto done;
1538 bb737323 2018-05-20 stsp logmsg = logmsg0;
1539 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1541 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1542 bb737323 2018-05-20 stsp if (newline)
1543 bb737323 2018-05-20 stsp *newline = '\0';
1544 ccda2f4d 2022-06-16 stsp limit = avail - col;
1545 4d1f6af3 2022-06-17 op if (view->child && limit > 0)
1546 4d1f6af3 2022-06-17 op limit--; /* for the border */
1547 ccda2f4d 2022-06-16 stsp err = format_line(&wlogmsg, &logmsg_width, &scrollx, logmsg, view->x,
1548 ccda2f4d 2022-06-16 stsp limit, col, 1);
1550 29688b02 2022-06-16 stsp goto done;
1551 ccda2f4d 2022-06-16 stsp waddwstr(view->window, &wlogmsg[scrollx]);
1552 29688b02 2022-06-16 stsp col += MAX(logmsg_width, 0);
1553 27a741e5 2019-09-11 stsp while (col < avail) {
1554 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1558 80ddbec8 2018-04-29 stsp free(logmsg0);
1559 bb737323 2018-05-20 stsp free(wlogmsg);
1560 5813d178 2019-03-09 stsp free(author);
1561 bb737323 2018-05-20 stsp free(wauthor);
1562 80ddbec8 2018-04-29 stsp free(line);
1563 80ddbec8 2018-04-29 stsp return err;
1566 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1567 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1568 899d86c2 2018-05-10 stsp struct got_object_id *id)
1570 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1572 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1573 80ddbec8 2018-04-29 stsp if (entry == NULL)
1574 899d86c2 2018-05-10 stsp return NULL;
1576 899d86c2 2018-05-10 stsp entry->id = id;
1577 99db9666 2018-05-07 stsp entry->commit = commit;
1578 899d86c2 2018-05-10 stsp return entry;
1581 99db9666 2018-05-07 stsp static void
1582 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1584 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1586 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1587 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1588 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1589 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1590 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1591 99db9666 2018-05-07 stsp free(entry);
1594 99db9666 2018-05-07 stsp static void
1595 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1597 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1598 99db9666 2018-05-07 stsp pop_commit(commits);
1601 c4972b91 2018-05-07 stsp static const struct got_error *
1602 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1603 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1605 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1606 13add988 2019-10-15 stsp regmatch_t regmatch;
1607 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1609 13add988 2019-10-15 stsp *have_match = 0;
1611 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1613 13add988 2019-10-15 stsp return err;
1615 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1617 13add988 2019-10-15 stsp goto done;
1619 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1620 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1621 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1622 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1623 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1624 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1625 13add988 2019-10-15 stsp *have_match = 1;
1627 13add988 2019-10-15 stsp free(id_str);
1628 13add988 2019-10-15 stsp free(logmsg);
1629 13add988 2019-10-15 stsp return err;
1632 13add988 2019-10-15 stsp static const struct got_error *
1633 4e0d2870 2020-12-07 naddy queue_commits(struct tog_log_thread_args *a)
1635 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1638 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1639 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1640 1a76625f 2018-10-22 stsp * while updating the display.
1643 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1644 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1645 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1646 1a76625f 2018-10-22 stsp int errcode;
1648 4e0d2870 2020-12-07 naddy err = got_commit_graph_iter_next(&id, a->graph, a->repo,
1649 4e0d2870 2020-12-07 naddy NULL, NULL);
1650 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1653 4e0d2870 2020-12-07 naddy err = got_object_open_as_commit(&commit, a->repo, id);
1656 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1657 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1658 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1662 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1663 1a76625f 2018-10-22 stsp if (errcode) {
1664 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1665 13add988 2019-10-15 stsp "pthread_mutex_lock");
1669 4e0d2870 2020-12-07 naddy entry->idx = a->commits->ncommits;
1670 4e0d2870 2020-12-07 naddy TAILQ_INSERT_TAIL(&a->commits->head, entry, entry);
1671 4e0d2870 2020-12-07 naddy a->commits->ncommits++;
1673 4e0d2870 2020-12-07 naddy if (*a->searching == TOG_SEARCH_FORWARD &&
1674 4e0d2870 2020-12-07 naddy !*a->search_next_done) {
1675 7c1452c1 2020-03-26 stsp int have_match;
1676 4e0d2870 2020-12-07 naddy err = match_commit(&have_match, id, commit, a->regex);
1679 7c1452c1 2020-03-26 stsp if (have_match)
1680 4e0d2870 2020-12-07 naddy *a->search_next_done = TOG_SEARCH_HAVE_MORE;
1683 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1684 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1685 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1686 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1689 4e0d2870 2020-12-07 naddy } while (*a->searching == TOG_SEARCH_FORWARD && !*a->search_next_done);
1691 9ba79e04 2018-06-11 stsp return err;
1694 2b779855 2020-12-05 naddy static void
1695 2b779855 2020-12-05 naddy select_commit(struct tog_log_view_state *s)
1697 2b779855 2020-12-05 naddy struct commit_queue_entry *entry;
1698 2b779855 2020-12-05 naddy int ncommits = 0;
1700 2b779855 2020-12-05 naddy entry = s->first_displayed_entry;
1701 2b779855 2020-12-05 naddy while (entry) {
1702 2b779855 2020-12-05 naddy if (ncommits == s->selected) {
1703 2b779855 2020-12-05 naddy s->selected_entry = entry;
1706 2b779855 2020-12-05 naddy entry = TAILQ_NEXT(entry, entry);
1707 2b779855 2020-12-05 naddy ncommits++;
1711 0553a4e3 2018-04-30 stsp static const struct got_error *
1712 8fdc79fe 2020-12-01 naddy draw_commits(struct tog_view *view)
1714 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1715 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1716 2b779855 2020-12-05 naddy struct commit_queue_entry *entry = s->selected_entry;
1717 8fdc79fe 2020-12-01 naddy const int limit = view->nlines;
1718 60493ae3 2019-06-20 stsp int width;
1719 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1720 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1721 8b473291 2019-02-21 stsp char *refs_str = NULL;
1722 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1723 11b20872 2019-11-08 stsp struct tog_color *tc;
1724 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1726 8fdc79fe 2020-12-01 naddy if (s->selected_entry &&
1727 8fdc79fe 2020-12-01 naddy !(view->searching && view->search_next_done == 0)) {
1728 d2075bf3 2020-12-25 stsp struct got_reflist_head *refs;
1729 8fdc79fe 2020-12-01 naddy err = got_object_id_str(&id_str, s->selected_entry->id);
1731 ecb28ae0 2018-07-16 stsp return err;
1732 51a10b52 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(tog_refs_idmap,
1733 d2075bf3 2020-12-25 stsp s->selected_entry->id);
1734 d2075bf3 2020-12-25 stsp if (refs) {
1735 d2075bf3 2020-12-25 stsp err = build_refs_str(&refs_str, refs,
1736 d2075bf3 2020-12-25 stsp s->selected_entry->id, s->repo);
1738 d2075bf3 2020-12-25 stsp goto done;
1742 8fdc79fe 2020-12-01 naddy if (s->thread_args.commits_needed == 0)
1743 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1745 fb280deb 2021-08-30 stsp if (s->thread_args.commits_needed > 0 || s->thread_args.load_all) {
1746 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1747 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
1748 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
1749 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
1750 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1751 8f4ed634 2020-03-26 stsp goto done;
1754 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
1756 f9686aa5 2020-03-27 stsp if (view->searching) {
1757 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
1758 f9686aa5 2020-03-27 stsp search_str = "no more matches";
1759 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1760 f9686aa5 2020-03-27 stsp search_str = "no matches found";
1761 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
1762 f9686aa5 2020-03-27 stsp search_str = "searching...";
1765 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1766 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
1767 f9686aa5 2020-03-27 stsp search_str ? search_str :
1768 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
1769 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1770 8f4ed634 2020-03-26 stsp goto done;
1774 8fdc79fe 2020-12-01 naddy if (s->in_repo_path && strcmp(s->in_repo_path, "/") != 0) {
1775 87411fa9 2022-06-16 stsp if (asprintf(&header, "commit %s %s%s", id_str ? id_str :
1776 87411fa9 2022-06-16 stsp "........................................",
1777 8fdc79fe 2020-12-01 naddy s->in_repo_path, ncommits_str) == -1) {
1778 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1779 1a76625f 2018-10-22 stsp header = NULL;
1780 1a76625f 2018-10-22 stsp goto done;
1782 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1783 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1784 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1785 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1786 1a76625f 2018-10-22 stsp header = NULL;
1787 1a76625f 2018-10-22 stsp goto done;
1789 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, header, 0, view->ncols, 0, 0);
1791 1a76625f 2018-10-22 stsp goto done;
1793 2814baeb 2018-08-01 stsp werase(view->window);
1795 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1796 a3404814 2018-09-02 stsp wstandout(view->window);
1797 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
1799 11b20872 2019-11-08 stsp wattr_on(view->window,
1800 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1801 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1803 11b20872 2019-11-08 stsp wattr_off(view->window,
1804 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1805 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1806 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1809 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1810 a3404814 2018-09-02 stsp wstandend(view->window);
1811 ecb28ae0 2018-07-16 stsp free(wline);
1812 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1813 1a76625f 2018-10-22 stsp goto done;
1815 29688b02 2022-06-16 stsp /* Grow author column size if necessary, and set view->maxx. */
1816 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
1817 5813d178 2019-03-09 stsp ncommits = 0;
1818 145b6838 2022-06-16 stsp view->maxx = 0;
1819 5813d178 2019-03-09 stsp while (entry) {
1820 145b6838 2022-06-16 stsp char *author, *eol, *msg, *msg0;
1821 29688b02 2022-06-16 stsp wchar_t *wauthor, *wmsg;
1822 5813d178 2019-03-09 stsp int width;
1823 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1825 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1826 5813d178 2019-03-09 stsp if (author == NULL) {
1827 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1828 5813d178 2019-03-09 stsp goto done;
1830 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1831 27a741e5 2019-09-11 stsp date_display_cols);
1832 5813d178 2019-03-09 stsp if (author_cols < width)
1833 5813d178 2019-03-09 stsp author_cols = width;
1834 5813d178 2019-03-09 stsp free(wauthor);
1835 5813d178 2019-03-09 stsp free(author);
1836 145b6838 2022-06-16 stsp err = got_object_commit_get_logmsg(&msg0, entry->commit);
1838 145b6838 2022-06-16 stsp goto done;
1839 145b6838 2022-06-16 stsp msg = msg0;
1840 145b6838 2022-06-16 stsp while (*msg == '\n')
1842 145b6838 2022-06-16 stsp if ((eol = strchr(msg, '\n')))
1843 29688b02 2022-06-16 stsp *eol = '\0';
1844 ccda2f4d 2022-06-16 stsp err = format_line(&wmsg, &width, NULL, msg, 0, INT_MAX,
1845 29688b02 2022-06-16 stsp date_display_cols + author_cols, 0);
1847 29688b02 2022-06-16 stsp goto done;
1848 29688b02 2022-06-16 stsp view->maxx = MAX(view->maxx, width);
1849 145b6838 2022-06-16 stsp free(msg0);
1850 29688b02 2022-06-16 stsp free(wmsg);
1851 7ca04879 2019-10-19 stsp ncommits++;
1852 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1855 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
1856 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = s->first_displayed_entry;
1857 867c6645 2018-07-10 stsp ncommits = 0;
1858 899d86c2 2018-05-10 stsp while (entry) {
1859 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1861 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
1862 2814baeb 2018-08-01 stsp wstandout(view->window);
1863 8fdc79fe 2020-12-01 naddy err = draw_commit(view, entry->commit, entry->id,
1864 8fdc79fe 2020-12-01 naddy date_display_cols, author_cols);
1865 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
1866 2814baeb 2018-08-01 stsp wstandend(view->window);
1868 60493ae3 2019-06-20 stsp goto done;
1869 0553a4e3 2018-04-30 stsp ncommits++;
1870 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = entry;
1871 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1874 1a57306a 2018-09-02 stsp view_vborder(view);
1876 1a76625f 2018-10-22 stsp free(id_str);
1877 8b473291 2019-02-21 stsp free(refs_str);
1878 1a76625f 2018-10-22 stsp free(ncommits_str);
1879 1a76625f 2018-10-22 stsp free(header);
1880 80ddbec8 2018-04-29 stsp return err;
1883 07b55e75 2018-05-10 stsp static void
1884 3e135950 2020-12-01 naddy log_scroll_up(struct tog_log_view_state *s, int maxscroll)
1886 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1887 07b55e75 2018-05-10 stsp int nscrolled = 0;
1889 ffe38506 2020-12-01 naddy entry = TAILQ_FIRST(&s->commits.head);
1890 ffe38506 2020-12-01 naddy if (s->first_displayed_entry == entry)
1893 ffe38506 2020-12-01 naddy entry = s->first_displayed_entry;
1894 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1895 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1896 07b55e75 2018-05-10 stsp if (entry) {
1897 ffe38506 2020-12-01 naddy s->first_displayed_entry = entry;
1898 07b55e75 2018-05-10 stsp nscrolled++;
1903 aa075928 2018-05-10 stsp static const struct got_error *
1904 ffe38506 2020-12-01 naddy trigger_log_thread(struct tog_view *view, int wait)
1906 ffe38506 2020-12-01 naddy struct tog_log_thread_args *ta = &view->state.log.thread_args;
1907 5e224a3e 2019-02-22 stsp int errcode;
1909 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1911 fb280deb 2021-08-30 stsp while (ta->commits_needed > 0 || ta->load_all) {
1912 ffe38506 2020-12-01 naddy if (ta->log_complete)
1915 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1916 ffe38506 2020-12-01 naddy errcode = pthread_cond_signal(&ta->need_commits);
1917 7aafa0d1 2019-02-22 stsp if (errcode)
1918 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1919 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1922 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
1923 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
1925 7c1452c1 2020-03-26 stsp if (!wait)
1928 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1929 ffe38506 2020-12-01 naddy show_log_view(view);
1930 7c1452c1 2020-03-26 stsp update_panels();
1931 7c1452c1 2020-03-26 stsp doupdate();
1933 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
1934 ffe38506 2020-12-01 naddy errcode = pthread_cond_wait(&ta->commit_loaded, &tog_mutex);
1935 82954512 2020-02-03 stsp if (errcode)
1936 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1937 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1939 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1940 ffe38506 2020-12-01 naddy show_log_view(view);
1941 7c1452c1 2020-03-26 stsp update_panels();
1942 7c1452c1 2020-03-26 stsp doupdate();
1945 5e224a3e 2019-02-22 stsp return NULL;
1948 5e224a3e 2019-02-22 stsp static const struct got_error *
1949 ffe38506 2020-12-01 naddy log_scroll_down(struct tog_view *view, int maxscroll)
1951 ffe38506 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
1952 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1953 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1954 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
1956 ffe38506 2020-12-01 naddy if (s->last_displayed_entry == NULL)
1957 5e224a3e 2019-02-22 stsp return NULL;
1959 bf30f154 2020-12-07 naddy ncommits_needed = s->last_displayed_entry->idx + 1 + maxscroll;
1960 ffe38506 2020-12-01 naddy if (s->commits.ncommits < ncommits_needed &&
1961 ffe38506 2020-12-01 naddy !s->thread_args.log_complete) {
1963 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
1965 ffe38506 2020-12-01 naddy s->thread_args.commits_needed += maxscroll;
1966 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
1968 5e224a3e 2019-02-22 stsp return err;
1972 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->last_displayed_entry, entry);
1973 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1976 ffe38506 2020-12-01 naddy s->last_displayed_entry = pentry;
1978 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->first_displayed_entry, entry);
1979 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1981 ffe38506 2020-12-01 naddy s->first_displayed_entry = pentry;
1982 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1984 dd0a52c1 2018-05-20 stsp return err;
1987 cd0acaa7 2018-05-20 stsp static const struct got_error *
1988 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1989 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1990 78756c87 2020-11-24 stsp struct tog_view *log_view, struct got_repository *repo)
1992 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1993 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1994 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1996 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1997 15a94983 2018-12-23 stsp if (diff_view == NULL)
1998 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
2000 dbdddfee 2021-06-23 naddy parent_id = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
2001 d7b5a0e8 2022-04-20 stsp err = open_diff_view(diff_view, parent_id ? &parent_id->id : NULL,
2002 78756c87 2020-11-24 stsp commit_id, NULL, NULL, 3, 0, 0, log_view, repo);
2003 e5a0f69f 2018-08-18 stsp if (err == NULL)
2004 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
2005 cd0acaa7 2018-05-20 stsp return err;
2008 80ddbec8 2018-04-29 stsp static const struct got_error *
2009 42a2230c 2020-12-01 naddy tree_view_visit_subtree(struct tog_tree_view_state *s,
2010 42a2230c 2020-12-01 naddy struct got_tree_object *subtree)
2012 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
2014 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
2015 941e9f74 2019-05-21 stsp if (parent == NULL)
2016 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
2018 941e9f74 2019-05-21 stsp parent->tree = s->tree;
2019 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
2020 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
2021 941e9f74 2019-05-21 stsp parent->selected = s->selected;
2022 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
2023 941e9f74 2019-05-21 stsp s->tree = subtree;
2024 941e9f74 2019-05-21 stsp s->selected = 0;
2025 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
2026 941e9f74 2019-05-21 stsp return NULL;
2029 941e9f74 2019-05-21 stsp static const struct got_error *
2030 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
2031 a44927cc 2022-04-07 stsp struct got_commit_object *commit, const char *path)
2033 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
2034 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
2035 941e9f74 2019-05-21 stsp const char *p;
2036 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
2038 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
2040 941e9f74 2019-05-21 stsp while (*p) {
2041 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
2042 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
2043 56e0773d 2019-11-28 stsp char *te_name;
2045 33cbf02b 2020-01-12 stsp while (p[0] == '/')
2048 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
2049 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
2050 941e9f74 2019-05-21 stsp if (slash == NULL)
2051 33cbf02b 2020-01-12 stsp te_name = strdup(p);
2053 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
2054 56e0773d 2019-11-28 stsp if (te_name == NULL) {
2055 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
2058 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
2059 56e0773d 2019-11-28 stsp if (te == NULL) {
2060 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
2061 56e0773d 2019-11-28 stsp free(te_name);
2064 56e0773d 2019-11-28 stsp free(te_name);
2065 9a1d5146 2020-11-27 naddy s->first_displayed_entry = s->selected_entry = te;
2067 9a1d5146 2020-11-27 naddy if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry)))
2068 9a1d5146 2020-11-27 naddy break; /* jump to this file's entry */
2070 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
2071 941e9f74 2019-05-21 stsp if (slash)
2072 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
2074 941e9f74 2019-05-21 stsp subpath = strdup(path);
2075 941e9f74 2019-05-21 stsp if (subpath == NULL) {
2076 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
2080 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&tree_id, s->repo, commit,
2085 d91faf3b 2020-12-01 naddy err = got_object_open_as_tree(&tree, s->repo, tree_id);
2086 941e9f74 2019-05-21 stsp free(tree_id);
2090 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, tree);
2091 941e9f74 2019-05-21 stsp if (err) {
2092 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
2095 941e9f74 2019-05-21 stsp if (slash == NULL)
2097 941e9f74 2019-05-21 stsp free(subpath);
2098 941e9f74 2019-05-21 stsp subpath = NULL;
2099 941e9f74 2019-05-21 stsp p = slash;
2102 941e9f74 2019-05-21 stsp free(subpath);
2103 1a76625f 2018-10-22 stsp return err;
2106 61266923 2020-01-14 stsp static const struct got_error *
2107 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
2108 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
2109 4e97c21c 2020-12-06 stsp const char *head_ref_name, struct got_repository *repo)
2111 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
2112 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
2113 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
2115 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
2116 55cccc34 2020-02-20 stsp if (tree_view == NULL)
2117 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
2119 bc573f3b 2021-07-10 stsp err = open_tree_view(tree_view, entry->id, head_ref_name, repo);
2121 55cccc34 2020-02-20 stsp return err;
2122 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
2124 55cccc34 2020-02-20 stsp *new_view = tree_view;
2126 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
2127 55cccc34 2020-02-20 stsp return NULL;
2129 a44927cc 2022-04-07 stsp return tree_view_walk_path(s, entry->commit, path);
2132 55cccc34 2020-02-20 stsp static const struct got_error *
2133 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
2135 61266923 2020-01-14 stsp sigset_t sigset;
2136 61266923 2020-01-14 stsp int errcode;
2138 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
2139 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
2141 2497f032 2022-05-31 stsp /* tog handles SIGWINCH, SIGCONT, SIGINT, SIGTERM */
2142 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
2143 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2144 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
2145 2497f032 2022-05-31 stsp return got_error_from_errno("sigaddset");
2146 2497f032 2022-05-31 stsp if (sigaddset(&sigset, SIGINT) == -1)
2147 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2148 2497f032 2022-05-31 stsp if (sigaddset(&sigset, SIGTERM) == -1)
2149 2497f032 2022-05-31 stsp return got_error_from_errno("sigaddset");
2151 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
2152 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
2153 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
2155 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
2156 61266923 2020-01-14 stsp if (errcode)
2157 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
2159 61266923 2020-01-14 stsp return NULL;
2162 1a76625f 2018-10-22 stsp static void *
2163 1a76625f 2018-10-22 stsp log_thread(void *arg)
2165 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2166 1a76625f 2018-10-22 stsp int errcode = 0;
2167 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
2168 1a76625f 2018-10-22 stsp int done = 0;
2170 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
2172 61266923 2020-01-14 stsp return (void *)err;
2174 2497f032 2022-05-31 stsp while (!done && !err && !tog_fatal_signal_received()) {
2175 4e0d2870 2020-12-07 naddy err = queue_commits(a);
2176 1a76625f 2018-10-22 stsp if (err) {
2177 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
2178 1a76625f 2018-10-22 stsp return (void *)err;
2179 1a76625f 2018-10-22 stsp err = NULL;
2181 fb280deb 2021-08-30 stsp } else if (a->commits_needed > 0 && !a->load_all)
2182 1a76625f 2018-10-22 stsp a->commits_needed--;
2184 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2185 3abe8080 2019-04-10 stsp if (errcode) {
2186 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2187 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2189 3abe8080 2019-04-10 stsp } else if (*a->quit)
2191 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
2192 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
2193 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
2194 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
2197 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
2198 7c1452c1 2020-03-26 stsp if (errcode) {
2199 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2200 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
2201 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
2206 1a76625f 2018-10-22 stsp a->commits_needed = 0;
2208 fb280deb 2021-08-30 stsp if (a->commits_needed == 0 && !a->load_all) {
2209 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
2210 7c1452c1 2020-03-26 stsp &tog_mutex);
2211 7c1452c1 2020-03-26 stsp if (errcode)
2212 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2213 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
2214 21355643 2020-12-06 stsp if (*a->quit)
2219 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2220 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2221 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2222 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2224 3abe8080 2019-04-10 stsp a->log_complete = 1;
2225 1a76625f 2018-10-22 stsp return (void *)err;
2228 1a76625f 2018-10-22 stsp static const struct got_error *
2229 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2231 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2232 1a76625f 2018-10-22 stsp int errcode;
2234 1a76625f 2018-10-22 stsp if (s->thread) {
2235 1a76625f 2018-10-22 stsp s->quit = 1;
2236 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2237 1a76625f 2018-10-22 stsp if (errcode)
2238 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2239 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2240 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2241 1a76625f 2018-10-22 stsp if (errcode)
2242 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2243 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2244 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
2245 1a76625f 2018-10-22 stsp if (errcode)
2246 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2247 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2248 1a76625f 2018-10-22 stsp if (errcode)
2249 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2250 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2251 1a76625f 2018-10-22 stsp s->thread = NULL;
2254 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2255 1d0f4054 2021-06-17 stsp err = got_repo_close(s->thread_args.repo);
2256 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2259 74467cc8 2022-06-15 stsp if (s->thread_args.pack_fds) {
2260 74467cc8 2022-06-15 stsp const struct got_error *pack_err =
2261 74467cc8 2022-06-15 stsp got_repo_pack_fds_close(s->thread_args.pack_fds);
2262 74467cc8 2022-06-15 stsp if (err == NULL)
2263 74467cc8 2022-06-15 stsp err = pack_err;
2264 74467cc8 2022-06-15 stsp s->thread_args.pack_fds = NULL;
2267 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2268 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2269 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2272 9343a5fb 2018-06-23 stsp return err;
2275 9343a5fb 2018-06-23 stsp static const struct got_error *
2276 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2278 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2279 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2280 276b94a1 2020-11-13 naddy int errcode;
2282 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2284 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2285 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2286 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2288 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.commit_loaded);
2289 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2290 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2292 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2293 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2294 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2295 1a76625f 2018-10-22 stsp free(s->start_id);
2296 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2297 9cd7cbd1 2020-12-07 stsp free(s->head_ref_name);
2298 9cd7cbd1 2020-12-07 stsp s->head_ref_name = NULL;
2299 1a76625f 2018-10-22 stsp return err;
2302 1a76625f 2018-10-22 stsp static const struct got_error *
2303 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2305 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2307 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2308 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2309 60493ae3 2019-06-20 stsp return NULL;
2312 60493ae3 2019-06-20 stsp static const struct got_error *
2313 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2315 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2316 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2317 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2319 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2320 f9686aa5 2020-03-27 stsp show_log_view(view);
2321 f9686aa5 2020-03-27 stsp update_panels();
2322 f9686aa5 2020-03-27 stsp doupdate();
2324 96e2b566 2019-07-08 stsp if (s->search_entry) {
2325 13add988 2019-10-15 stsp int errcode, ch;
2326 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2327 13add988 2019-10-15 stsp if (errcode)
2328 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2329 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2330 13add988 2019-10-15 stsp ch = wgetch(view->window);
2331 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2332 13add988 2019-10-15 stsp if (errcode)
2333 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2334 13add988 2019-10-15 stsp "pthread_mutex_lock");
2335 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2336 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2337 678cbce5 2019-07-28 stsp return NULL;
2339 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2340 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2342 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2343 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2344 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2345 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2346 8f4ed634 2020-03-26 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2348 8f4ed634 2020-03-26 stsp entry = TAILQ_PREV(s->matched_entry,
2349 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2351 5a5ede53 2021-12-09 stsp entry = s->selected_entry;
2354 60493ae3 2019-06-20 stsp while (1) {
2355 13add988 2019-10-15 stsp int have_match = 0;
2357 60493ae3 2019-06-20 stsp if (entry == NULL) {
2358 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2359 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2360 f9967bca 2020-03-27 stsp view->search_next_done =
2361 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2362 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2363 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2364 f801134a 2019-06-25 stsp return NULL;
2367 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2368 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2369 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2371 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2372 ffe38506 2020-12-01 naddy return trigger_log_thread(view, 0);
2375 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2376 13add988 2019-10-15 stsp &view->regex);
2379 13add988 2019-10-15 stsp if (have_match) {
2380 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2381 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2385 96e2b566 2019-07-08 stsp s->search_entry = entry;
2386 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2387 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2389 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2392 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2393 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2394 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2395 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_DOWN);
2397 60493ae3 2019-06-20 stsp return err;
2400 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2401 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_UP);
2403 60493ae3 2019-06-20 stsp return err;
2408 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2410 60493ae3 2019-06-20 stsp return NULL;
2413 60493ae3 2019-06-20 stsp static const struct got_error *
2414 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2415 78756c87 2020-11-24 stsp struct got_repository *repo, const char *head_ref_name,
2416 78756c87 2020-11-24 stsp const char *in_repo_path, int log_branches)
2418 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2419 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2420 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2421 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2422 1a76625f 2018-10-22 stsp int errcode;
2424 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2425 f135c941 2020-02-20 stsp free(s->in_repo_path);
2426 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2427 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2428 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2431 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2432 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2433 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2435 fb2756b9 2018-08-04 stsp s->repo = repo;
2436 9cd7cbd1 2020-12-07 stsp if (head_ref_name) {
2437 9cd7cbd1 2020-12-07 stsp s->head_ref_name = strdup(head_ref_name);
2438 9cd7cbd1 2020-12-07 stsp if (s->head_ref_name == NULL) {
2439 9cd7cbd1 2020-12-07 stsp err = got_error_from_errno("strdup");
2440 9cd7cbd1 2020-12-07 stsp goto done;
2443 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2444 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2445 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2446 5036bf37 2018-09-24 stsp goto done;
2448 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2450 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
2451 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2452 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2453 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2455 11b20872 2019-11-08 stsp goto done;
2456 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2457 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2458 11b20872 2019-11-08 stsp if (err) {
2459 11b20872 2019-11-08 stsp free_colors(&s->colors);
2460 11b20872 2019-11-08 stsp goto done;
2462 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2463 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2464 11b20872 2019-11-08 stsp if (err) {
2465 11b20872 2019-11-08 stsp free_colors(&s->colors);
2466 11b20872 2019-11-08 stsp goto done;
2470 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2471 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2472 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2473 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2474 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2476 74467cc8 2022-06-15 stsp if (s->thread_args.pack_fds == NULL) {
2477 74467cc8 2022-06-15 stsp err = got_repo_pack_fds_open(&s->thread_args.pack_fds);
2479 74467cc8 2022-06-15 stsp goto done;
2481 0ae84acc 2022-06-15 tracey err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL,
2482 74467cc8 2022-06-15 stsp s->thread_args.pack_fds);
2483 0ae84acc 2022-06-15 tracey if (err)
2484 0ae84acc 2022-06-15 tracey goto done;
2485 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2486 b672a97a 2020-01-27 stsp !s->log_branches);
2488 1a76625f 2018-10-22 stsp goto done;
2489 62d463ca 2020-10-20 naddy err = got_commit_graph_iter_start(thread_graph, s->start_id,
2490 62d463ca 2020-10-20 naddy s->repo, NULL, NULL);
2492 c5b78334 2020-01-12 stsp goto done;
2494 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2495 1a76625f 2018-10-22 stsp if (errcode) {
2496 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2497 1a76625f 2018-10-22 stsp goto done;
2499 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2500 7c1452c1 2020-03-26 stsp if (errcode) {
2501 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
2502 7c1452c1 2020-03-26 stsp goto done;
2505 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2506 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2507 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2508 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2509 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2510 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2511 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2512 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2513 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2514 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2515 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2516 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2517 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2520 1a76625f 2018-10-22 stsp close_log_view(view);
2521 ba4f502b 2018-08-04 stsp return err;
2524 e5a0f69f 2018-08-18 stsp static const struct got_error *
2525 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2527 f2f6d207 2020-11-24 stsp const struct got_error *err;
2528 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2530 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2531 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2532 2b380cc8 2018-10-24 stsp &s->thread_args);
2533 2b380cc8 2018-10-24 stsp if (errcode)
2534 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2535 f2f6d207 2020-11-24 stsp if (s->thread_args.commits_needed > 0) {
2536 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
2538 f2f6d207 2020-11-24 stsp return err;
2542 8fdc79fe 2020-12-01 naddy return draw_commits(view);
2545 e5a0f69f 2018-08-18 stsp static const struct got_error *
2546 e78dc838 2020-12-04 stsp input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
2548 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2549 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2550 21355643 2020-12-06 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
2551 6458efa5 2020-11-24 stsp struct tog_view *ref_view = NULL;
2552 f3bc9f1d 2021-09-05 naddy struct commit_queue_entry *entry;
2553 83cc4199 2022-06-13 stsp int begin_x = 0, n, nscroll = view->nlines - 1;
2555 528dedf3 2021-08-30 stsp if (s->thread_args.load_all) {
2556 528dedf3 2021-08-30 stsp if (ch == KEY_BACKSPACE)
2557 fb280deb 2021-08-30 stsp s->thread_args.load_all = 0;
2558 528dedf3 2021-08-30 stsp else if (s->thread_args.log_complete) {
2559 528dedf3 2021-08-30 stsp s->thread_args.load_all = 0;
2560 fb280deb 2021-08-30 stsp log_scroll_down(view, s->commits.ncommits);
2561 fb280deb 2021-08-30 stsp s->selected = MIN(view->nlines - 2,
2562 fb280deb 2021-08-30 stsp s->commits.ncommits - 1);
2563 fb280deb 2021-08-30 stsp select_commit(s);
2565 528dedf3 2021-08-30 stsp return NULL;
2568 528dedf3 2021-08-30 stsp switch (ch) {
2570 1e37a5c2 2019-05-12 jcs s->quit = 1;
2573 145b6838 2022-06-16 stsp view->x = 0;
2576 145b6838 2022-06-16 stsp view->x = MAX(view->maxx - view->ncols / 2, 0);
2578 145b6838 2022-06-16 stsp case KEY_RIGHT:
2580 145b6838 2022-06-16 stsp if (view->x + view->ncols / 2 < view->maxx)
2581 145b6838 2022-06-16 stsp view->x += 2; /* move two columns right */
2583 145b6838 2022-06-16 stsp case KEY_LEFT:
2585 145b6838 2022-06-16 stsp view->x -= MIN(view->x, 2); /* move two columns back */
2588 1e37a5c2 2019-05-12 jcs case KEY_UP:
2591 02ffd0d5 2021-10-17 stsp case CTRL('p'):
2592 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2594 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2595 1e37a5c2 2019-05-12 jcs s->selected--;
2597 3e135950 2020-12-01 naddy log_scroll_up(s, 1);
2598 912a3f79 2021-08-30 j select_commit(s);
2601 912a3f79 2021-08-30 j case KEY_HOME:
2602 912a3f79 2021-08-30 j s->selected = 0;
2603 ea66598a 2021-09-03 naddy s->first_displayed_entry = TAILQ_FIRST(&s->commits.head);
2604 2b779855 2020-12-05 naddy select_commit(s);
2606 83cc4199 2022-06-13 stsp case CTRL('u'):
2608 83cc4199 2022-06-13 stsp nscroll /= 2;
2609 83cc4199 2022-06-13 stsp /* FALL THROUGH */
2610 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2611 a4292ac5 2019-05-12 jcs case CTRL('b'):
2612 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2614 2b779855 2020-12-05 naddy if (TAILQ_FIRST(&s->commits.head) == s->first_displayed_entry)
2615 83cc4199 2022-06-13 stsp s->selected = MAX(0, s->selected - nscroll - 1);
2617 83cc4199 2022-06-13 stsp log_scroll_up(s, nscroll);
2618 2b779855 2020-12-05 naddy select_commit(s);
2621 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2624 02ffd0d5 2021-10-17 stsp case CTRL('n'):
2625 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2627 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2628 2b779855 2020-12-05 naddy s->commits.ncommits - 1))
2629 1e37a5c2 2019-05-12 jcs s->selected++;
2631 2b779855 2020-12-05 naddy err = log_scroll_down(view, 1);
2635 912a3f79 2021-08-30 j select_commit(s);
2638 912a3f79 2021-08-30 j case KEY_END: {
2639 912a3f79 2021-08-30 j /* We don't know yet how many commits, so we're forced to
2640 912a3f79 2021-08-30 j * traverse them all. */
2641 fb280deb 2021-08-30 stsp if (!s->thread_args.log_complete) {
2642 fb280deb 2021-08-30 stsp s->thread_args.load_all = 1;
2643 fb280deb 2021-08-30 stsp return trigger_log_thread(view, 0);
2646 f3bc9f1d 2021-09-05 naddy s->selected = 0;
2647 f3bc9f1d 2021-09-05 naddy entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2648 f3bc9f1d 2021-09-05 naddy for (n = 0; n < view->nlines - 1; n++) {
2649 f3bc9f1d 2021-09-05 naddy if (entry == NULL)
2651 f3bc9f1d 2021-09-05 naddy s->first_displayed_entry = entry;
2652 f3bc9f1d 2021-09-05 naddy entry = TAILQ_PREV(entry, commit_queue_head, entry);
2654 f3bc9f1d 2021-09-05 naddy if (n > 0)
2655 f3bc9f1d 2021-09-05 naddy s->selected = n - 1;
2656 2b779855 2020-12-05 naddy select_commit(s);
2659 80b7e8da 2022-06-11 stsp case CTRL('d'):
2661 83cc4199 2022-06-13 stsp nscroll /= 2;
2662 83cc4199 2022-06-13 stsp /* FALL THROUGH */
2663 83cc4199 2022-06-13 stsp case KEY_NPAGE:
2664 83cc4199 2022-06-13 stsp case CTRL('f'): {
2665 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2666 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2667 1e37a5c2 2019-05-12 jcs if (first == NULL)
2669 83cc4199 2022-06-13 stsp err = log_scroll_down(view, nscroll);
2672 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2673 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2674 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2675 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2676 83cc4199 2022-06-13 stsp s->selected += MIN(s->last_displayed_entry->idx -
2677 83cc4199 2022-06-13 stsp s->selected_entry->idx, nscroll + 1);
2679 2b779855 2020-12-05 naddy select_commit(s);
2682 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2683 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2684 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2685 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2686 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2687 2b779855 2020-12-05 naddy select_commit(s);
2688 0bf7f153 2020-12-02 naddy if (s->commits.ncommits < view->nlines - 1 &&
2689 0bf7f153 2020-12-02 naddy !s->thread_args.log_complete) {
2690 0bf7f153 2020-12-02 naddy s->thread_args.commits_needed += (view->nlines - 1) -
2691 0bf7f153 2020-12-02 naddy s->commits.ncommits;
2692 0bf7f153 2020-12-02 naddy err = trigger_log_thread(view, 1);
2695 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2698 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2700 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2701 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2702 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2703 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2704 78756c87 2020-11-24 stsp view, s->repo);
2707 e78dc838 2020-12-04 stsp view->focussed = 0;
2708 e78dc838 2020-12-04 stsp diff_view->focussed = 1;
2709 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2710 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2712 1e37a5c2 2019-05-12 jcs return err;
2713 0dbbbe90 2022-06-17 op err = view_set_child(view, diff_view);
2716 e78dc838 2020-12-04 stsp view->focus_child = 1;
2718 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2721 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2723 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2724 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2725 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2726 4e97c21c 2020-12-06 stsp s->selected_entry, s->in_repo_path, s->head_ref_name,
2730 e78dc838 2020-12-04 stsp view->focussed = 0;
2731 e78dc838 2020-12-04 stsp tree_view->focussed = 1;
2732 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2733 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2735 1e37a5c2 2019-05-12 jcs return err;
2736 0dbbbe90 2022-06-17 op err = view_set_child(view, tree_view);
2739 e78dc838 2020-12-04 stsp view->focus_child = 1;
2741 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2743 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2744 21355643 2020-12-06 stsp case CTRL('l'):
2746 21355643 2020-12-06 stsp if (ch == KEY_BACKSPACE &&
2747 21355643 2020-12-06 stsp got_path_is_root_dir(s->in_repo_path))
2749 21355643 2020-12-06 stsp err = stop_log_thread(s);
2751 74cfe85e 2020-10-20 stsp return err;
2752 21355643 2020-12-06 stsp if (ch == KEY_BACKSPACE) {
2753 21355643 2020-12-06 stsp char *parent_path;
2754 21355643 2020-12-06 stsp err = got_path_dirname(&parent_path, s->in_repo_path);
2756 21355643 2020-12-06 stsp return err;
2757 21355643 2020-12-06 stsp free(s->in_repo_path);
2758 21355643 2020-12-06 stsp s->in_repo_path = parent_path;
2759 21355643 2020-12-06 stsp s->thread_args.in_repo_path = s->in_repo_path;
2760 21355643 2020-12-06 stsp } else if (ch == CTRL('l')) {
2761 21355643 2020-12-06 stsp struct got_object_id *start_id;
2762 21355643 2020-12-06 stsp err = got_repo_match_object_id(&start_id, NULL,
2763 21355643 2020-12-06 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2764 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_COMMIT, &tog_refs, s->repo);
2766 21355643 2020-12-06 stsp return err;
2767 21355643 2020-12-06 stsp free(s->start_id);
2768 21355643 2020-12-06 stsp s->start_id = start_id;
2769 21355643 2020-12-06 stsp s->thread_args.start_id = s->start_id;
2770 21355643 2020-12-06 stsp } else /* 'B' */
2771 21355643 2020-12-06 stsp s->log_branches = !s->log_branches;
2773 b0dd8d27 2022-06-16 stsp if (s->thread_args.pack_fds == NULL) {
2774 b0dd8d27 2022-06-16 stsp err = got_repo_pack_fds_open(&s->thread_args.pack_fds);
2776 b0dd8d27 2022-06-16 stsp return err;
2778 74467cc8 2022-06-15 stsp err = got_repo_open(&s->thread_args.repo,
2779 74467cc8 2022-06-15 stsp got_repo_get_path(s->repo), NULL,
2780 74467cc8 2022-06-15 stsp s->thread_args.pack_fds);
2782 21355643 2020-12-06 stsp return err;
2783 51a10b52 2020-12-26 stsp tog_free_refs();
2784 7f66531d 2021-11-16 stsp err = tog_load_refs(s->repo, 0);
2786 ca51c541 2020-12-07 stsp return err;
2787 21355643 2020-12-06 stsp err = got_commit_graph_open(&s->thread_args.graph,
2788 21355643 2020-12-06 stsp s->in_repo_path, !s->log_branches);
2790 d01904d4 2019-06-25 stsp return err;
2791 21355643 2020-12-06 stsp err = got_commit_graph_iter_start(s->thread_args.graph,
2792 21355643 2020-12-06 stsp s->start_id, s->repo, NULL, NULL);
2794 b672a97a 2020-01-27 stsp return err;
2795 21355643 2020-12-06 stsp free_commits(&s->commits);
2796 21355643 2020-12-06 stsp s->first_displayed_entry = NULL;
2797 21355643 2020-12-06 stsp s->last_displayed_entry = NULL;
2798 21355643 2020-12-06 stsp s->selected_entry = NULL;
2799 21355643 2020-12-06 stsp s->selected = 0;
2800 21355643 2020-12-06 stsp s->thread_args.log_complete = 0;
2801 21355643 2020-12-06 stsp s->quit = 0;
2802 21355643 2020-12-06 stsp s->thread_args.commits_needed = view->nlines;
2805 6458efa5 2020-11-24 stsp if (view_is_parent_view(view))
2806 6458efa5 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
2807 6458efa5 2020-11-24 stsp ref_view = view_open(view->nlines, view->ncols,
2808 6458efa5 2020-11-24 stsp view->begin_y, begin_x, TOG_VIEW_REF);
2809 6458efa5 2020-11-24 stsp if (ref_view == NULL)
2810 6458efa5 2020-11-24 stsp return got_error_from_errno("view_open");
2811 6458efa5 2020-11-24 stsp err = open_ref_view(ref_view, s->repo);
2812 6458efa5 2020-11-24 stsp if (err) {
2813 6458efa5 2020-11-24 stsp view_close(ref_view);
2814 6458efa5 2020-11-24 stsp return err;
2816 e78dc838 2020-12-04 stsp view->focussed = 0;
2817 e78dc838 2020-12-04 stsp ref_view->focussed = 1;
2818 6458efa5 2020-11-24 stsp if (view_is_parent_view(view)) {
2819 6458efa5 2020-11-24 stsp err = view_close_child(view);
2821 6458efa5 2020-11-24 stsp return err;
2822 0dbbbe90 2022-06-17 op err = view_set_child(view, ref_view);
2825 e78dc838 2020-12-04 stsp view->focus_child = 1;
2827 6458efa5 2020-11-24 stsp *new_view = ref_view;
2833 80ddbec8 2018-04-29 stsp return err;
2836 4ed7e80c 2018-05-20 stsp static const struct got_error *
2837 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2839 c2db6724 2019-01-04 stsp const struct got_error *error;
2841 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2842 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2843 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2845 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2846 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2848 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2849 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2851 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2852 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2854 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2855 c2db6724 2019-01-04 stsp if (error != NULL)
2856 c2db6724 2019-01-04 stsp return error;
2858 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2859 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2861 c2db6724 2019-01-04 stsp return NULL;
2864 a915003a 2019-02-05 stsp static void
2865 a915003a 2019-02-05 stsp init_curses(void)
2868 2497f032 2022-05-31 stsp * Override default signal handlers before starting ncurses.
2869 2497f032 2022-05-31 stsp * This should prevent ncurses from installing its own
2870 2497f032 2022-05-31 stsp * broken cleanup() signal handler.
2872 2497f032 2022-05-31 stsp signal(SIGWINCH, tog_sigwinch);
2873 2497f032 2022-05-31 stsp signal(SIGPIPE, tog_sigpipe);
2874 2497f032 2022-05-31 stsp signal(SIGCONT, tog_sigcont);
2875 2497f032 2022-05-31 stsp signal(SIGINT, tog_sigint);
2876 2497f032 2022-05-31 stsp signal(SIGTERM, tog_sigterm);
2878 a915003a 2019-02-05 stsp initscr();
2880 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2883 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2884 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2885 a915003a 2019-02-05 stsp curs_set(0);
2886 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2887 6d17833f 2019-11-08 stsp start_color();
2888 6d17833f 2019-11-08 stsp use_default_colors();
2892 c2db6724 2019-01-04 stsp static const struct got_error *
2893 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2894 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2896 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2898 f135c941 2020-02-20 stsp if (argc == 0) {
2899 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2900 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2901 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2902 f135c941 2020-02-20 stsp return NULL;
2905 f135c941 2020-02-20 stsp if (worktree) {
2906 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2909 bfd61697 2020-11-14 stsp err = got_worktree_resolve_path(&p, worktree, argv[0]);
2911 f135c941 2020-02-20 stsp return err;
2912 bfd61697 2020-11-14 stsp if (asprintf(in_repo_path, "%s%s%s", prefix,
2913 bfd61697 2020-11-14 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
2914 bfd61697 2020-11-14 stsp p) == -1) {
2915 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2916 bfd61697 2020-11-14 stsp *in_repo_path = NULL;
2920 8fa913ec 2020-11-14 stsp err = got_repo_map_path(in_repo_path, repo, argv[0]);
2922 f135c941 2020-02-20 stsp return err;
2925 f135c941 2020-02-20 stsp static const struct got_error *
2926 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2928 80ddbec8 2018-04-29 stsp const struct got_error *error;
2929 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2930 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2931 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2932 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2933 d8f38dc4 2020-12-05 stsp char *start_commit = NULL, *label = NULL;
2934 d8f38dc4 2020-12-05 stsp struct got_reference *ref = NULL;
2935 d8f38dc4 2020-12-05 stsp const char *head_ref_name = NULL;
2936 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2937 04cc582a 2018-08-01 stsp struct tog_view *view;
2938 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
2940 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2941 80ddbec8 2018-04-29 stsp switch (ch) {
2943 b672a97a 2020-01-27 stsp log_branches = 1;
2946 80ddbec8 2018-04-29 stsp start_commit = optarg;
2949 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2950 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2951 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2955 17020d27 2019-03-07 stsp usage_log();
2956 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2960 80ddbec8 2018-04-29 stsp argc -= optind;
2961 80ddbec8 2018-04-29 stsp argv += optind;
2963 f135c941 2020-02-20 stsp if (argc > 1)
2964 f135c941 2020-02-20 stsp usage_log();
2966 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
2967 0ae84acc 2022-06-15 tracey if (error != NULL)
2968 0ae84acc 2022-06-15 tracey goto done;
2970 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2971 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
2972 c156c7a4 2020-12-18 stsp if (cwd == NULL)
2973 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
2974 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
2975 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2976 c156c7a4 2020-12-18 stsp goto done;
2977 a1fbf39a 2019-08-11 stsp if (worktree)
2978 6962eb72 2020-02-20 stsp repo_path =
2979 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2981 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2982 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
2983 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
2984 c156c7a4 2020-12-18 stsp goto done;
2988 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2989 80ddbec8 2018-04-29 stsp if (error != NULL)
2990 ecb28ae0 2018-07-16 stsp goto done;
2992 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2993 f135c941 2020-02-20 stsp repo, worktree);
2994 f135c941 2020-02-20 stsp if (error)
2995 f135c941 2020-02-20 stsp goto done;
2997 f135c941 2020-02-20 stsp init_curses();
2999 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
3000 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
3001 c02c541e 2019-03-29 stsp if (error)
3002 c02c541e 2019-03-29 stsp goto done;
3004 87670572 2020-12-26 naddy /* already loaded by tog_log_with_path()? */
3005 d9dff0e5 2020-12-26 stsp if (TAILQ_EMPTY(&tog_refs)) {
3006 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
3007 87670572 2020-12-26 naddy if (error)
3008 87670572 2020-12-26 naddy goto done;
3011 d8f38dc4 2020-12-05 stsp if (start_commit == NULL) {
3012 d8f38dc4 2020-12-05 stsp error = got_repo_match_object_id(&start_id, &label,
3013 d8f38dc4 2020-12-05 stsp worktree ? got_worktree_get_head_ref_name(worktree) :
3014 84de9106 2020-12-26 stsp GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
3015 d8f38dc4 2020-12-05 stsp if (error)
3016 d8f38dc4 2020-12-05 stsp goto done;
3017 d8f38dc4 2020-12-05 stsp head_ref_name = label;
3019 d8f38dc4 2020-12-05 stsp error = got_ref_open(&ref, repo, start_commit, 0);
3020 d8f38dc4 2020-12-05 stsp if (error == NULL)
3021 d8f38dc4 2020-12-05 stsp head_ref_name = got_ref_get_name(ref);
3022 d8f38dc4 2020-12-05 stsp else if (error->code != GOT_ERR_NOT_REF)
3023 d8f38dc4 2020-12-05 stsp goto done;
3024 d8f38dc4 2020-12-05 stsp error = got_repo_match_object_id(&start_id, NULL,
3025 84de9106 2020-12-26 stsp start_commit, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
3026 d8f38dc4 2020-12-05 stsp if (error)
3027 d8f38dc4 2020-12-05 stsp goto done;
3030 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
3031 04cc582a 2018-08-01 stsp if (view == NULL) {
3032 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3033 04cc582a 2018-08-01 stsp goto done;
3035 78756c87 2020-11-24 stsp error = open_log_view(view, start_id, repo, head_ref_name,
3036 f135c941 2020-02-20 stsp in_repo_path, log_branches);
3037 ba4f502b 2018-08-04 stsp if (error)
3038 ba4f502b 2018-08-04 stsp goto done;
3039 2fc00ff4 2019-08-31 stsp if (worktree) {
3040 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
3041 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
3042 2fc00ff4 2019-08-31 stsp worktree = NULL;
3044 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3046 f135c941 2020-02-20 stsp free(in_repo_path);
3047 ecb28ae0 2018-07-16 stsp free(repo_path);
3048 ecb28ae0 2018-07-16 stsp free(cwd);
3049 899d86c2 2018-05-10 stsp free(start_id);
3050 d8f38dc4 2020-12-05 stsp free(label);
3052 d8f38dc4 2020-12-05 stsp got_ref_close(ref);
3053 1d0f4054 2021-06-17 stsp if (repo) {
3054 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
3055 1d0f4054 2021-06-17 stsp if (error == NULL)
3056 1d0f4054 2021-06-17 stsp error = close_err;
3058 ec142235 2019-03-07 stsp if (worktree)
3059 ec142235 2019-03-07 stsp got_worktree_close(worktree);
3060 0ae84acc 2022-06-15 tracey if (pack_fds) {
3061 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
3062 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
3063 0ae84acc 2022-06-15 tracey if (error == NULL)
3064 0ae84acc 2022-06-15 tracey error = pack_err;
3066 51a10b52 2020-12-26 stsp tog_free_refs();
3067 80ddbec8 2018-04-29 stsp return error;
3070 4ed7e80c 2018-05-20 stsp __dead static void
3071 9f7d7167 2018-04-29 stsp usage_diff(void)
3074 3dbaef42 2020-11-24 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
3075 3dbaef42 2020-11-24 stsp "[-w] object1 object2\n", getprogname());
3079 6d17833f 2019-11-08 stsp static int
3080 41605754 2020-11-12 stsp match_line(const char *line, regex_t *regex, size_t nmatch,
3081 41605754 2020-11-12 stsp regmatch_t *regmatch)
3083 41605754 2020-11-12 stsp return regexec(regex, line, nmatch, regmatch, 0) == 0;
3086 f26dddb7 2019-11-08 stsp struct tog_color *
3087 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
3089 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
3091 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(tc, colors, entry) {
3092 41605754 2020-11-12 stsp if (match_line(line, &tc->regex, 0, NULL))
3093 6d17833f 2019-11-08 stsp return tc;
3096 6d17833f 2019-11-08 stsp return NULL;
3099 4ed7e80c 2018-05-20 stsp static const struct got_error *
3100 41605754 2020-11-12 stsp add_matched_line(int *wtotal, const char *line, int wlimit, int col_tab_align,
3101 1853e0f4 2022-06-16 stsp WINDOW *window, int skipcol, regmatch_t *regmatch)
3103 41605754 2020-11-12 stsp const struct got_error *err = NULL;
3104 44a87665 2022-06-16 stsp char *exstr = NULL;
3105 1853e0f4 2022-06-16 stsp wchar_t *wline = NULL;
3106 1853e0f4 2022-06-16 stsp int rme, rms, n, width, scrollx;
3107 1853e0f4 2022-06-16 stsp int width0 = 0, width1 = 0, width2 = 0;
3108 1853e0f4 2022-06-16 stsp char *seg0 = NULL, *seg1 = NULL, *seg2 = NULL;
3110 41605754 2020-11-12 stsp *wtotal = 0;
3112 145b6838 2022-06-16 stsp rms = regmatch->rm_so;
3113 145b6838 2022-06-16 stsp rme = regmatch->rm_eo;
3115 44a87665 2022-06-16 stsp err = expand_tab(&exstr, line);
3117 44a87665 2022-06-16 stsp return err;
3119 1853e0f4 2022-06-16 stsp /* Split the line into 3 segments, according to match offsets. */
3120 44a87665 2022-06-16 stsp seg0 = strndup(exstr, rms);
3121 44a87665 2022-06-16 stsp if (seg0 == NULL) {
3122 44a87665 2022-06-16 stsp err = got_error_from_errno("strndup");
3123 44a87665 2022-06-16 stsp goto done;
3125 44a87665 2022-06-16 stsp seg1 = strndup(exstr + rms, rme - rms);
3126 1853e0f4 2022-06-16 stsp if (seg1 == NULL) {
3127 1853e0f4 2022-06-16 stsp err = got_error_from_errno("strndup");
3128 1853e0f4 2022-06-16 stsp goto done;
3130 44a87665 2022-06-16 stsp seg2 = strdup(exstr + rme);
3131 95d136ac 2022-06-16 stsp if (seg2 == NULL) {
3132 1853e0f4 2022-06-16 stsp err = got_error_from_errno("strndup");
3133 1853e0f4 2022-06-16 stsp goto done;
3136 145b6838 2022-06-16 stsp /* draw up to matched token if we haven't scrolled past it */
3137 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width0, NULL, seg0, 0, wlimit,
3138 1853e0f4 2022-06-16 stsp col_tab_align, 1);
3140 1853e0f4 2022-06-16 stsp goto done;
3141 1853e0f4 2022-06-16 stsp n = MAX(width0 - skipcol, 0);
3143 1853e0f4 2022-06-16 stsp free(wline);
3144 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width, &scrollx, seg0, skipcol,
3145 1853e0f4 2022-06-16 stsp wlimit, col_tab_align, 1);
3147 1853e0f4 2022-06-16 stsp goto done;
3148 1853e0f4 2022-06-16 stsp waddwstr(window, &wline[scrollx]);
3149 1853e0f4 2022-06-16 stsp wlimit -= width;
3150 1853e0f4 2022-06-16 stsp *wtotal += width;
3153 41605754 2020-11-12 stsp if (wlimit > 0) {
3154 1853e0f4 2022-06-16 stsp int i = 0, w = 0;
3155 1853e0f4 2022-06-16 stsp size_t wlen;
3157 1853e0f4 2022-06-16 stsp free(wline);
3158 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width1, NULL, seg1, 0, wlimit,
3159 1853e0f4 2022-06-16 stsp col_tab_align, 1);
3161 1853e0f4 2022-06-16 stsp goto done;
3162 1853e0f4 2022-06-16 stsp wlen = wcslen(wline);
3163 1853e0f4 2022-06-16 stsp while (i < wlen) {
3164 1853e0f4 2022-06-16 stsp width = wcwidth(wline[i]);
3165 1853e0f4 2022-06-16 stsp if (width == -1) {
3166 1853e0f4 2022-06-16 stsp /* should not happen, tabs are expanded */
3167 1853e0f4 2022-06-16 stsp err = got_error(GOT_ERR_RANGE);
3168 1853e0f4 2022-06-16 stsp goto done;
3170 1853e0f4 2022-06-16 stsp if (width0 + w + width > skipcol)
3172 1853e0f4 2022-06-16 stsp w += width;
3175 145b6838 2022-06-16 stsp /* draw (visible part of) matched token (if scrolled into it) */
3176 1853e0f4 2022-06-16 stsp if (width1 - w > 0) {
3177 145b6838 2022-06-16 stsp wattron(window, A_STANDOUT);
3178 1853e0f4 2022-06-16 stsp waddwstr(window, &wline[i]);
3179 145b6838 2022-06-16 stsp wattroff(window, A_STANDOUT);
3180 1853e0f4 2022-06-16 stsp wlimit -= (width1 - w);
3181 1853e0f4 2022-06-16 stsp *wtotal += (width1 - w);
3185 1853e0f4 2022-06-16 stsp if (wlimit > 0) { /* draw rest of line */
3186 1853e0f4 2022-06-16 stsp free(wline);
3187 1853e0f4 2022-06-16 stsp if (skipcol > width0 + width1) {
3188 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width2, &scrollx, seg2,
3189 1853e0f4 2022-06-16 stsp skipcol - (width0 + width1), wlimit,
3190 1853e0f4 2022-06-16 stsp col_tab_align, 1);
3192 1853e0f4 2022-06-16 stsp goto done;
3193 1853e0f4 2022-06-16 stsp waddwstr(window, &wline[scrollx]);
3195 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width2, NULL, seg2, 0,
3196 1853e0f4 2022-06-16 stsp wlimit, col_tab_align, 1);
3198 1853e0f4 2022-06-16 stsp goto done;
3199 1853e0f4 2022-06-16 stsp waddwstr(window, wline);
3201 1853e0f4 2022-06-16 stsp *wtotal += width2;
3204 145b6838 2022-06-16 stsp free(wline);
3205 44a87665 2022-06-16 stsp free(exstr);
3206 1853e0f4 2022-06-16 stsp free(seg0);
3207 1853e0f4 2022-06-16 stsp free(seg1);
3208 1853e0f4 2022-06-16 stsp free(seg2);
3209 1853e0f4 2022-06-16 stsp return err;
3212 41605754 2020-11-12 stsp static const struct got_error *
3213 89f1a395 2020-12-01 naddy draw_file(struct tog_view *view, const char *header)
3215 89f1a395 2020-12-01 naddy struct tog_diff_view_state *s = &view->state.diff;
3216 89f1a395 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
3217 61e69b96 2018-05-20 stsp const struct got_error *err;
3218 fe621944 2020-11-10 stsp int nprinted = 0;
3219 b304db33 2018-05-20 stsp char *line;
3220 826082fe 2020-12-10 stsp size_t linesize = 0;
3221 826082fe 2020-12-10 stsp ssize_t linelen;
3222 f26dddb7 2019-11-08 stsp struct tog_color *tc;
3223 61e69b96 2018-05-20 stsp wchar_t *wline;
3224 e0b650dd 2018-05-20 stsp int width;
3225 89f1a395 2020-12-01 naddy int max_lines = view->nlines;
3226 89f1a395 2020-12-01 naddy int nlines = s->nlines;
3227 fe621944 2020-11-10 stsp off_t line_offset;
3229 89f1a395 2020-12-01 naddy line_offset = s->line_offsets[s->first_displayed_line - 1];
3230 89f1a395 2020-12-01 naddy if (fseeko(s->f, line_offset, SEEK_SET) == -1)
3231 fe621944 2020-11-10 stsp return got_error_from_errno("fseek");
3233 f7d12f7e 2018-08-01 stsp werase(view->window);
3235 a3404814 2018-09-02 stsp if (header) {
3236 135a2da0 2020-11-11 stsp if (asprintf(&line, "[%d/%d] %s",
3237 89f1a395 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, nlines,
3238 135a2da0 2020-11-11 stsp header) == -1)
3239 135a2da0 2020-11-11 stsp return got_error_from_errno("asprintf");
3240 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols,
3242 135a2da0 2020-11-11 stsp free(line);
3244 a3404814 2018-09-02 stsp return err;
3246 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3247 a3404814 2018-09-02 stsp wstandout(view->window);
3248 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
3249 e54cc94a 2020-11-11 stsp free(wline);
3250 e54cc94a 2020-11-11 stsp wline = NULL;
3251 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3252 a3404814 2018-09-02 stsp wstandend(view->window);
3253 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
3254 a3404814 2018-09-02 stsp waddch(view->window, '\n');
3256 a3404814 2018-09-02 stsp if (max_lines <= 1)
3257 a3404814 2018-09-02 stsp return NULL;
3258 a3404814 2018-09-02 stsp max_lines--;
3261 89f1a395 2020-12-01 naddy s->eof = 0;
3262 145b6838 2022-06-16 stsp view->maxx = 0;
3263 826082fe 2020-12-10 stsp line = NULL;
3264 fe621944 2020-11-10 stsp while (max_lines > 0 && nprinted < max_lines) {
3265 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
3266 826082fe 2020-12-10 stsp if (linelen == -1) {
3267 826082fe 2020-12-10 stsp if (feof(s->f)) {
3268 826082fe 2020-12-10 stsp s->eof = 1;
3271 826082fe 2020-12-10 stsp free(line);
3272 826082fe 2020-12-10 stsp return got_ferror(s->f, GOT_ERR_IO);
3275 1853e0f4 2022-06-16 stsp /* Set view->maxx based on full line length. */
3276 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, INT_MAX, 0,
3277 1853e0f4 2022-06-16 stsp view->x ? 1 : 0);
3278 1853e0f4 2022-06-16 stsp if (err) {
3279 1853e0f4 2022-06-16 stsp free(line);
3280 1853e0f4 2022-06-16 stsp return err;
3282 1853e0f4 2022-06-16 stsp view->maxx = MAX(view->maxx, width);
3283 1853e0f4 2022-06-16 stsp free(wline);
3284 1853e0f4 2022-06-16 stsp wline = NULL;
3286 89f1a395 2020-12-01 naddy tc = match_color(&s->colors, line);
3288 f26dddb7 2019-11-08 stsp wattr_on(view->window,
3289 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3290 89f1a395 2020-12-01 naddy if (s->first_displayed_line + nprinted == s->matched_line &&
3291 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
3292 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols, 0,
3293 145b6838 2022-06-16 stsp view->window, view->x, regmatch);
3294 41605754 2020-11-12 stsp if (err) {
3295 41605754 2020-11-12 stsp free(line);
3296 41605754 2020-11-12 stsp return err;
3300 969c159c 2022-06-16 stsp err = format_line(&wline, &width, &skip, line,
3301 969c159c 2022-06-16 stsp view->x, view->ncols, 0, view->x ? 1 : 0);
3302 969c159c 2022-06-16 stsp if (err) {
3303 969c159c 2022-06-16 stsp free(line);
3304 969c159c 2022-06-16 stsp return err;
3306 969c159c 2022-06-16 stsp waddwstr(view->window, &wline[skip]);
3307 969c159c 2022-06-16 stsp free(wline);
3308 41605754 2020-11-12 stsp wline = NULL;
3311 6d17833f 2019-11-08 stsp wattr_off(view->window,
3312 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3313 969c159c 2022-06-16 stsp if (width <= view->ncols - 1)
3314 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3315 fe621944 2020-11-10 stsp nprinted++;
3317 826082fe 2020-12-10 stsp free(line);
3318 fe621944 2020-11-10 stsp if (nprinted >= 1)
3319 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line +
3320 89f1a395 2020-12-01 naddy (nprinted - 1);
3322 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line;
3324 1a57306a 2018-09-02 stsp view_vborder(view);
3326 89f1a395 2020-12-01 naddy if (s->eof) {
3327 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
3328 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
3329 c3e9aa98 2019-05-13 jcs nprinted++;
3332 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, TOG_EOF_STRING, 0,
3333 ccda2f4d 2022-06-16 stsp view->ncols, 0, 0);
3335 c3e9aa98 2019-05-13 jcs return err;
3338 c3e9aa98 2019-05-13 jcs wstandout(view->window);
3339 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
3340 e54cc94a 2020-11-11 stsp free(wline);
3341 e54cc94a 2020-11-11 stsp wline = NULL;
3342 c3e9aa98 2019-05-13 jcs wstandend(view->window);
3345 26ed57b2 2018-05-19 stsp return NULL;
3348 abd2672a 2018-12-23 stsp static char *
3349 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
3351 09867e48 2019-08-13 stsp struct tm mytm, *tm;
3352 09867e48 2019-08-13 stsp char *p, *s;
3354 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
3355 09867e48 2019-08-13 stsp if (tm == NULL)
3356 09867e48 2019-08-13 stsp return NULL;
3357 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3358 09867e48 2019-08-13 stsp if (s == NULL)
3359 09867e48 2019-08-13 stsp return NULL;
3360 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
3362 abd2672a 2018-12-23 stsp *p = '\0';
3366 4ed7e80c 2018-05-20 stsp static const struct got_error *
3367 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3368 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3370 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3371 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3372 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3373 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3375 dbdddfee 2021-06-23 naddy qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3376 0208f208 2020-05-05 stsp if (qid != NULL) {
3377 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3378 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3379 d7b5a0e8 2022-04-20 stsp &qid->id);
3381 0208f208 2020-05-05 stsp return err;
3383 aa8b5dd0 2021-08-01 stsp tree_id1 = got_object_id_dup(
3384 aa8b5dd0 2021-08-01 stsp got_object_commit_get_tree_id(pcommit));
3385 aa8b5dd0 2021-08-01 stsp if (tree_id1 == NULL) {
3386 aa8b5dd0 2021-08-01 stsp got_object_commit_close(pcommit);
3387 aa8b5dd0 2021-08-01 stsp return got_error_from_errno("got_object_id_dup");
3389 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3393 0208f208 2020-05-05 stsp if (tree_id1) {
3394 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3396 0208f208 2020-05-05 stsp goto done;
3399 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3400 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3402 0208f208 2020-05-05 stsp goto done;
3404 b72706c3 2022-06-01 stsp err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
3405 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3407 0208f208 2020-05-05 stsp if (tree1)
3408 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3409 0208f208 2020-05-05 stsp if (tree2)
3410 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3411 aa8b5dd0 2021-08-01 stsp free(tree_id1);
3412 0208f208 2020-05-05 stsp return err;
3415 0208f208 2020-05-05 stsp static const struct got_error *
3416 fe621944 2020-11-10 stsp add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
3420 fe621944 2020-11-10 stsp p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
3421 fe621944 2020-11-10 stsp if (p == NULL)
3422 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
3423 fe621944 2020-11-10 stsp *line_offsets = p;
3424 fe621944 2020-11-10 stsp (*line_offsets)[*nlines] = off;
3425 fe621944 2020-11-10 stsp (*nlines)++;
3426 fe621944 2020-11-10 stsp return NULL;
3429 fe621944 2020-11-10 stsp static const struct got_error *
3430 fe621944 2020-11-10 stsp write_commit_info(off_t **line_offsets, size_t *nlines,
3431 fe621944 2020-11-10 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3432 fe621944 2020-11-10 stsp struct got_repository *repo, FILE *outfile)
3434 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
3435 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
3436 15a94983 2018-12-23 stsp struct got_commit_object *commit;
3437 fe621944 2020-11-10 stsp char *id_str = NULL, *logmsg = NULL, *s = NULL, *line;
3438 45d799e2 2018-12-23 stsp time_t committer_time;
3439 45d799e2 2018-12-23 stsp const char *author, *committer;
3440 8b473291 2019-02-21 stsp char *refs_str = NULL;
3441 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3442 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3443 fe621944 2020-11-10 stsp off_t outoff = 0;
3446 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3448 8b473291 2019-02-21 stsp if (refs) {
3449 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
3451 8b473291 2019-02-21 stsp return err;
3454 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3456 abd2672a 2018-12-23 stsp return err;
3458 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
3459 15a94983 2018-12-23 stsp if (err) {
3460 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
3461 15a94983 2018-12-23 stsp goto done;
3464 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, 0);
3466 fe621944 2020-11-10 stsp goto done;
3468 fe621944 2020-11-10 stsp n = fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3469 fe621944 2020-11-10 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3470 fe621944 2020-11-10 stsp if (n < 0) {
3471 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3472 abd2672a 2018-12-23 stsp goto done;
3474 fe621944 2020-11-10 stsp outoff += n;
3475 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3477 fe621944 2020-11-10 stsp goto done;
3479 fe621944 2020-11-10 stsp n = fprintf(outfile, "from: %s\n",
3480 fe621944 2020-11-10 stsp got_object_commit_get_author(commit));
3481 fe621944 2020-11-10 stsp if (n < 0) {
3482 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3483 abd2672a 2018-12-23 stsp goto done;
3485 fe621944 2020-11-10 stsp outoff += n;
3486 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3488 fe621944 2020-11-10 stsp goto done;
3490 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3491 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
3492 fe621944 2020-11-10 stsp if (datestr) {
3493 fe621944 2020-11-10 stsp n = fprintf(outfile, "date: %s UTC\n", datestr);
3494 fe621944 2020-11-10 stsp if (n < 0) {
3495 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3496 fe621944 2020-11-10 stsp goto done;
3498 fe621944 2020-11-10 stsp outoff += n;
3499 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3501 fe621944 2020-11-10 stsp goto done;
3503 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3504 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3505 fe621944 2020-11-10 stsp if (strcmp(author, committer) != 0) {
3506 fe621944 2020-11-10 stsp n = fprintf(outfile, "via: %s\n", committer);
3507 fe621944 2020-11-10 stsp if (n < 0) {
3508 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3509 fe621944 2020-11-10 stsp goto done;
3511 fe621944 2020-11-10 stsp outoff += n;
3512 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3514 fe621944 2020-11-10 stsp goto done;
3516 9f98ca05 2021-09-24 stsp if (got_object_commit_get_nparents(commit) > 1) {
3517 9f98ca05 2021-09-24 stsp const struct got_object_id_queue *parent_ids;
3518 9f98ca05 2021-09-24 stsp struct got_object_qid *qid;
3519 9f98ca05 2021-09-24 stsp int pn = 1;
3520 9f98ca05 2021-09-24 stsp parent_ids = got_object_commit_get_parent_ids(commit);
3521 9f98ca05 2021-09-24 stsp STAILQ_FOREACH(qid, parent_ids, entry) {
3522 d7b5a0e8 2022-04-20 stsp err = got_object_id_str(&id_str, &qid->id);
3524 9f98ca05 2021-09-24 stsp goto done;
3525 9f98ca05 2021-09-24 stsp n = fprintf(outfile, "parent %d: %s\n", pn++, id_str);
3526 9f98ca05 2021-09-24 stsp if (n < 0) {
3527 9f98ca05 2021-09-24 stsp err = got_error_from_errno("fprintf");
3528 9f98ca05 2021-09-24 stsp goto done;
3530 9f98ca05 2021-09-24 stsp outoff += n;
3531 9f98ca05 2021-09-24 stsp err = add_line_offset(line_offsets, nlines, outoff);
3533 9f98ca05 2021-09-24 stsp goto done;
3534 9f98ca05 2021-09-24 stsp free(id_str);
3535 9f98ca05 2021-09-24 stsp id_str = NULL;
3539 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
3541 5943eee2 2019-08-13 stsp goto done;
3542 fe621944 2020-11-10 stsp s = logmsg;
3543 fe621944 2020-11-10 stsp while ((line = strsep(&s, "\n")) != NULL) {
3544 fe621944 2020-11-10 stsp n = fprintf(outfile, "%s\n", line);
3545 fe621944 2020-11-10 stsp if (n < 0) {
3546 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3547 fe621944 2020-11-10 stsp goto done;
3549 fe621944 2020-11-10 stsp outoff += n;
3550 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3552 fe621944 2020-11-10 stsp goto done;
3555 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3557 0208f208 2020-05-05 stsp goto done;
3558 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3559 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3560 fe621944 2020-11-10 stsp n = fprintf(outfile, "%c %s\n", cp->status, pe->path);
3561 fe621944 2020-11-10 stsp if (n < 0) {
3562 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3563 fe621944 2020-11-10 stsp goto done;
3565 fe621944 2020-11-10 stsp outoff += n;
3566 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3568 fe621944 2020-11-10 stsp goto done;
3569 0208f208 2020-05-05 stsp free((char *)pe->path);
3570 0208f208 2020-05-05 stsp free(pe->data);
3573 0208f208 2020-05-05 stsp fputc('\n', outfile);
3575 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3577 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3578 abd2672a 2018-12-23 stsp free(id_str);
3579 5943eee2 2019-08-13 stsp free(logmsg);
3580 8b473291 2019-02-21 stsp free(refs_str);
3581 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3582 7510f233 2020-08-09 stsp if (err) {
3583 ae6a6978 2020-08-09 stsp free(*line_offsets);
3584 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3585 ae6a6978 2020-08-09 stsp *nlines = 0;
3587 fe621944 2020-11-10 stsp return err;
3590 abd2672a 2018-12-23 stsp static const struct got_error *
3591 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
3593 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
3594 48ae06ee 2018-10-18 stsp FILE *f = NULL;
3595 15a94983 2018-12-23 stsp int obj_type;
3597 fe621944 2020-11-10 stsp free(s->line_offsets);
3598 fe621944 2020-11-10 stsp s->line_offsets = malloc(sizeof(off_t));
3599 fe621944 2020-11-10 stsp if (s->line_offsets == NULL)
3600 fe621944 2020-11-10 stsp return got_error_from_errno("malloc");
3601 fe621944 2020-11-10 stsp s->nlines = 0;
3603 511a516b 2018-05-19 stsp f = got_opentemp();
3604 48ae06ee 2018-10-18 stsp if (f == NULL) {
3605 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3606 48ae06ee 2018-10-18 stsp goto done;
3608 56b63ca4 2021-01-22 stsp if (s->f && fclose(s->f) == EOF) {
3609 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3610 fb43ecf1 2019-02-11 stsp goto done;
3614 15a94983 2018-12-23 stsp if (s->id1)
3615 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3617 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3619 15a94983 2018-12-23 stsp goto done;
3621 15a94983 2018-12-23 stsp switch (obj_type) {
3622 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3623 fe621944 2020-11-10 stsp err = got_diff_objects_as_blobs(&s->line_offsets, &s->nlines,
3624 b72706c3 2022-06-01 stsp s->f1, s->f2, s->id1, s->id2, s->label1, s->label2,
3625 b72706c3 2022-06-01 stsp s->diff_context, s->ignore_whitespace, s->force_text_diff,
3626 b72706c3 2022-06-01 stsp s->repo, s->f);
3628 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3629 fe621944 2020-11-10 stsp err = got_diff_objects_as_trees(&s->line_offsets, &s->nlines,
3630 b72706c3 2022-06-01 stsp s->f1, s->f2, s->id1, s->id2, NULL, "", "", s->diff_context,
3631 3dbaef42 2020-11-24 stsp s->ignore_whitespace, s->force_text_diff, s->repo, s->f);
3633 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3634 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3635 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3636 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3637 d2075bf3 2020-12-25 stsp struct got_reflist_head *refs;
3639 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3641 3ffacbe1 2020-02-02 tracey goto done;
3642 51a10b52 2020-12-26 stsp refs = got_reflist_object_id_map_lookup(tog_refs_idmap, s->id2);
3643 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3644 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3645 fe621944 2020-11-10 stsp err = write_commit_info(&s->line_offsets, &s->nlines,
3646 d2075bf3 2020-12-25 stsp s->id2, refs, s->repo, s->f);
3647 f44b1f58 2020-02-02 tracey if (err)
3648 f44b1f58 2020-02-02 tracey goto done;
3649 f44b1f58 2020-02-02 tracey } else {
3650 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3651 dbdddfee 2021-06-23 naddy STAILQ_FOREACH(pid, parent_ids, entry) {
3652 d7b5a0e8 2022-04-20 stsp if (got_object_id_cmp(s->id1, &pid->id) == 0) {
3653 fe621944 2020-11-10 stsp err = write_commit_info(
3654 fe621944 2020-11-10 stsp &s->line_offsets, &s->nlines,
3655 d2075bf3 2020-12-25 stsp s->id2, refs, s->repo, s->f);
3656 f44b1f58 2020-02-02 tracey if (err)
3657 f44b1f58 2020-02-02 tracey goto done;
3662 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3664 fe621944 2020-11-10 stsp err = got_diff_objects_as_commits(&s->line_offsets, &s->nlines,
3665 b72706c3 2022-06-01 stsp s->f1, s->f2, s->id1, s->id2, NULL, s->diff_context,
3666 b72706c3 2022-06-01 stsp s->ignore_whitespace, s->force_text_diff, s->repo, s->f);
3670 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3673 f44b1f58 2020-02-02 tracey if (err)
3674 f44b1f58 2020-02-02 tracey goto done;
3676 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3677 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3678 48ae06ee 2018-10-18 stsp return err;
3681 f5215bb9 2019-02-22 stsp static void
3682 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3684 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3685 f5215bb9 2019-02-22 stsp update_panels();
3686 f5215bb9 2019-02-22 stsp doupdate();
3689 f44b1f58 2020-02-02 tracey static const struct got_error *
3690 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3692 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3694 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3695 f44b1f58 2020-02-02 tracey return NULL;
3698 f44b1f58 2020-02-02 tracey static const struct got_error *
3699 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3701 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3702 145b6838 2022-06-16 stsp const struct got_error *err = NULL;
3703 f44b1f58 2020-02-02 tracey int lineno;
3704 cb713507 2022-06-16 stsp char *line = NULL;
3705 826082fe 2020-12-10 stsp size_t linesize = 0;
3706 826082fe 2020-12-10 stsp ssize_t linelen;
3708 f44b1f58 2020-02-02 tracey if (!view->searching) {
3709 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3710 f44b1f58 2020-02-02 tracey return NULL;
3713 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3714 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3715 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3717 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3719 487cd7d2 2021-12-17 stsp lineno = s->first_displayed_line;
3721 f44b1f58 2020-02-02 tracey while (1) {
3722 f44b1f58 2020-02-02 tracey off_t offset;
3724 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3725 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3726 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3730 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3731 f44b1f58 2020-02-02 tracey lineno = 1;
3733 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3736 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3737 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3738 f44b1f58 2020-02-02 tracey free(line);
3739 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3741 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
3742 cb713507 2022-06-16 stsp if (linelen != -1) {
3743 cb713507 2022-06-16 stsp char *exstr;
3744 cb713507 2022-06-16 stsp err = expand_tab(&exstr, line);
3747 cb713507 2022-06-16 stsp if (match_line(exstr, &view->regex, 1,
3748 cb713507 2022-06-16 stsp &view->regmatch)) {
3749 cb713507 2022-06-16 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3750 cb713507 2022-06-16 stsp s->matched_line = lineno;
3751 cb713507 2022-06-16 stsp free(exstr);
3754 cb713507 2022-06-16 stsp free(exstr);
3756 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3757 f44b1f58 2020-02-02 tracey lineno++;
3759 f44b1f58 2020-02-02 tracey lineno--;
3761 826082fe 2020-12-10 stsp free(line);
3763 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3764 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3765 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3768 145b6838 2022-06-16 stsp return err;
3771 48ae06ee 2018-10-18 stsp static const struct got_error *
3772 b72706c3 2022-06-01 stsp close_diff_view(struct tog_view *view)
3774 b72706c3 2022-06-01 stsp const struct got_error *err = NULL;
3775 b72706c3 2022-06-01 stsp struct tog_diff_view_state *s = &view->state.diff;
3777 b72706c3 2022-06-01 stsp free(s->id1);
3778 b72706c3 2022-06-01 stsp s->id1 = NULL;
3779 b72706c3 2022-06-01 stsp free(s->id2);
3780 b72706c3 2022-06-01 stsp s->id2 = NULL;
3781 b72706c3 2022-06-01 stsp if (s->f && fclose(s->f) == EOF)
3782 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3783 b72706c3 2022-06-01 stsp s->f = NULL;
3784 b72706c3 2022-06-01 stsp if (s->f1 && fclose(s->f1) == EOF)
3785 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3786 b72706c3 2022-06-01 stsp s->f1 = NULL;
3787 b72706c3 2022-06-01 stsp if (s->f2 && fclose(s->f2) == EOF)
3788 b72706c3 2022-06-01 stsp err = got_error_from_errno("fclose");
3789 b72706c3 2022-06-01 stsp s->f2 = NULL;
3790 b72706c3 2022-06-01 stsp free_colors(&s->colors);
3791 b72706c3 2022-06-01 stsp free(s->line_offsets);
3792 b72706c3 2022-06-01 stsp s->line_offsets = NULL;
3793 b72706c3 2022-06-01 stsp s->nlines = 0;
3794 b72706c3 2022-06-01 stsp return err;
3797 b72706c3 2022-06-01 stsp static const struct got_error *
3798 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3799 3dbaef42 2020-11-24 stsp struct got_object_id *id2, const char *label1, const char *label2,
3800 3dbaef42 2020-11-24 stsp int diff_context, int ignore_whitespace, int force_text_diff,
3801 78756c87 2020-11-24 stsp struct tog_view *log_view, struct got_repository *repo)
3803 48ae06ee 2018-10-18 stsp const struct got_error *err;
3804 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3806 b72706c3 2022-06-01 stsp memset(s, 0, sizeof(*s));
3808 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3809 15a94983 2018-12-23 stsp int type1, type2;
3810 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3812 15a94983 2018-12-23 stsp return err;
3813 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3815 15a94983 2018-12-23 stsp return err;
3817 15a94983 2018-12-23 stsp if (type1 != type2)
3818 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3820 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3821 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3822 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3823 f44b1f58 2020-02-02 tracey s->repo = repo;
3824 f44b1f58 2020-02-02 tracey s->id1 = id1;
3825 f44b1f58 2020-02-02 tracey s->id2 = id2;
3826 3dbaef42 2020-11-24 stsp s->label1 = label1;
3827 3dbaef42 2020-11-24 stsp s->label2 = label2;
3829 15a94983 2018-12-23 stsp if (id1) {
3830 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3831 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3832 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3834 5465d566 2020-02-01 tracey s->id1 = NULL;
3836 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3837 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3838 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_object_id_dup");
3839 b72706c3 2022-06-01 stsp goto done;
3842 a00719e9 2022-06-17 stsp s->f1 = got_opentemp();
3843 a00719e9 2022-06-17 stsp if (s->f1 == NULL) {
3844 a00719e9 2022-06-17 stsp err = got_error_from_errno("got_opentemp");
3845 a00719e9 2022-06-17 stsp goto done;
3848 b72706c3 2022-06-01 stsp s->f2 = got_opentemp();
3849 b72706c3 2022-06-01 stsp if (s->f2 == NULL) {
3850 b72706c3 2022-06-01 stsp err = got_error_from_errno("got_opentemp");
3851 b72706c3 2022-06-01 stsp goto done;
3854 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3855 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3856 3dbaef42 2020-11-24 stsp s->diff_context = diff_context;
3857 3dbaef42 2020-11-24 stsp s->ignore_whitespace = ignore_whitespace;
3858 64453f7e 2020-11-21 stsp s->force_text_diff = force_text_diff;
3859 5465d566 2020-02-01 tracey s->log_view = log_view;
3860 5465d566 2020-02-01 tracey s->repo = repo;
3862 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
3863 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3864 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3865 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3866 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3868 b72706c3 2022-06-01 stsp goto done;
3869 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
3870 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
3871 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
3873 b72706c3 2022-06-01 stsp goto done;
3874 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3875 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3876 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3878 b72706c3 2022-06-01 stsp goto done;
3880 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3881 9f98ca05 2021-09-24 stsp "^(commit [0-9a-f]|parent [0-9]|(blob|file) [-+] |"
3882 9f98ca05 2021-09-24 stsp "[MDmA] [^ ])", TOG_COLOR_DIFF_META,
3883 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3885 b72706c3 2022-06-01 stsp goto done;
3887 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3888 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3889 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3891 b72706c3 2022-06-01 stsp goto done;
3893 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3894 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3895 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3897 b72706c3 2022-06-01 stsp goto done;
3900 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3901 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3902 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3904 5465d566 2020-02-01 tracey err = create_diff(s);
3906 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3907 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3908 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3909 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3910 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3913 b72706c3 2022-06-01 stsp close_diff_view(view);
3914 e5a0f69f 2018-08-18 stsp return err;
3917 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3918 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3920 a3404814 2018-09-02 stsp const struct got_error *err;
3921 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3922 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3923 3dbaef42 2020-11-24 stsp const char *label1, *label2;
3925 a3404814 2018-09-02 stsp if (s->id1) {
3926 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3928 a3404814 2018-09-02 stsp return err;
3929 3dbaef42 2020-11-24 stsp label1 = s->label1 ? : id_str1;
3931 3dbaef42 2020-11-24 stsp label1 = "/dev/null";
3933 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3935 a3404814 2018-09-02 stsp return err;
3936 3dbaef42 2020-11-24 stsp label2 = s->label2 ? : id_str2;
3938 3dbaef42 2020-11-24 stsp if (asprintf(&header, "diff %s %s", label1, label2) == -1) {
3939 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3940 a3404814 2018-09-02 stsp free(id_str1);
3941 a3404814 2018-09-02 stsp free(id_str2);
3942 a3404814 2018-09-02 stsp return err;
3944 a3404814 2018-09-02 stsp free(id_str1);
3945 a3404814 2018-09-02 stsp free(id_str2);
3947 267bb3b8 2021-08-01 stsp err = draw_file(view, header);
3948 267bb3b8 2021-08-01 stsp free(header);
3949 267bb3b8 2021-08-01 stsp return err;
3952 15a087fe 2019-02-21 stsp static const struct got_error *
3953 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3954 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3956 d7a04538 2019-02-21 stsp const struct got_error *err;
3957 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3958 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3959 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3961 15a087fe 2019-02-21 stsp free(s->id2);
3962 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3963 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3964 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3966 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3968 d7a04538 2019-02-21 stsp return err;
3969 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3970 15a087fe 2019-02-21 stsp free(s->id1);
3971 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(parent_ids);
3972 d7b5a0e8 2022-04-20 stsp s->id1 = pid ? got_object_id_dup(&pid->id) : NULL;
3973 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3974 15a087fe 2019-02-21 stsp return NULL;
3977 0cf4efb1 2018-09-29 stsp static const struct got_error *
3978 e78dc838 2020-12-04 stsp input_diff_view(struct tog_view **new_view, struct tog_view *view, int ch)
3980 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3981 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3982 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3983 5a8b5076 2020-12-05 stsp struct commit_queue_entry *old_selected_entry;
3984 826082fe 2020-12-10 stsp char *line = NULL;
3985 826082fe 2020-12-10 stsp size_t linesize = 0;
3986 826082fe 2020-12-10 stsp ssize_t linelen;
3987 83cc4199 2022-06-13 stsp int i, nscroll = view->nlines - 1;
3989 e5a0f69f 2018-08-18 stsp switch (ch) {
3991 145b6838 2022-06-16 stsp view->x = 0;
3994 145b6838 2022-06-16 stsp view->x = MAX(view->maxx - view->ncols / 3, 0);
3996 145b6838 2022-06-16 stsp case KEY_RIGHT:
3998 145b6838 2022-06-16 stsp if (view->x + view->ncols / 3 < view->maxx)
3999 145b6838 2022-06-16 stsp view->x += 2; /* move two columns right */
4001 145b6838 2022-06-16 stsp case KEY_LEFT:
4003 145b6838 2022-06-16 stsp view->x -= MIN(view->x, 2); /* move two columns back */
4007 3dbaef42 2020-11-24 stsp if (ch == 'a')
4008 3dbaef42 2020-11-24 stsp s->force_text_diff = !s->force_text_diff;
4009 3dbaef42 2020-11-24 stsp if (ch == 'w')
4010 3dbaef42 2020-11-24 stsp s->ignore_whitespace = !s->ignore_whitespace;
4011 64453f7e 2020-11-21 stsp wclear(view->window);
4012 64453f7e 2020-11-21 stsp s->first_displayed_line = 1;
4013 64453f7e 2020-11-21 stsp s->last_displayed_line = view->nlines;
4014 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4015 64453f7e 2020-11-21 stsp diff_view_indicate_progress(view);
4016 64453f7e 2020-11-21 stsp err = create_diff(s);
4019 912a3f79 2021-08-30 j case KEY_HOME:
4020 912a3f79 2021-08-30 j s->first_displayed_line = 1;
4023 912a3f79 2021-08-30 j case KEY_END:
4027 912a3f79 2021-08-30 j s->first_displayed_line = (s->nlines - view->nlines) + 2;
4031 1e37a5c2 2019-05-12 jcs case KEY_UP:
4032 02ffd0d5 2021-10-17 stsp case CTRL('p'):
4033 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
4034 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4036 83cc4199 2022-06-13 stsp case CTRL('u'):
4038 83cc4199 2022-06-13 stsp nscroll /= 2;
4039 83cc4199 2022-06-13 stsp /* FALL THROUGH */
4040 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4041 a60a9dc4 2019-05-13 jcs case CTRL('b'):
4042 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
4045 83cc4199 2022-06-13 stsp while (i++ < nscroll && s->first_displayed_line > 1)
4046 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4049 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4050 02ffd0d5 2021-10-17 stsp case CTRL('n'):
4051 1e37a5c2 2019-05-12 jcs if (!s->eof)
4052 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4054 83cc4199 2022-06-13 stsp case CTRL('d'):
4056 83cc4199 2022-06-13 stsp nscroll /= 2;
4057 83cc4199 2022-06-13 stsp /* FALL THROUGH */
4058 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4059 a60a9dc4 2019-05-13 jcs case CTRL('f'):
4061 00ba99a7 2019-05-12 jcs if (s->eof)
4064 83cc4199 2022-06-13 stsp while (!s->eof && i++ < nscroll) {
4065 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->f);
4066 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4067 826082fe 2020-12-10 stsp if (linelen == -1) {
4068 826082fe 2020-12-10 stsp if (feof(s->f)) {
4069 826082fe 2020-12-10 stsp s->eof = 1;
4071 826082fe 2020-12-10 stsp err = got_ferror(s->f, GOT_ERR_IO);
4075 826082fe 2020-12-10 stsp free(line);
4078 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
4079 1e37a5c2 2019-05-12 jcs s->diff_context--;
4080 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4081 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
4082 1e37a5c2 2019-05-12 jcs err = create_diff(s);
4083 27829c9e 2020-11-21 stsp if (s->first_displayed_line + view->nlines - 1 >
4084 27829c9e 2020-11-21 stsp s->nlines) {
4085 27829c9e 2020-11-21 stsp s->first_displayed_line = 1;
4086 27829c9e 2020-11-21 stsp s->last_displayed_line = view->nlines;
4091 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
4092 1e37a5c2 2019-05-12 jcs s->diff_context++;
4093 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4094 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
4095 1e37a5c2 2019-05-12 jcs err = create_diff(s);
4100 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
4102 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
4103 5a8b5076 2020-12-05 stsp old_selected_entry = ls->selected_entry;
4105 e78dc838 2020-12-04 stsp err = input_log_view(NULL, s->log_view, KEY_UP);
4109 5a8b5076 2020-12-05 stsp if (old_selected_entry == ls->selected_entry)
4112 2b779855 2020-12-05 naddy err = set_selected_commit(s, ls->selected_entry);
4116 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4117 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
4118 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4119 145b6838 2022-06-16 stsp view->x = 0;
4121 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
4122 1e37a5c2 2019-05-12 jcs err = create_diff(s);
4126 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
4128 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
4129 5a8b5076 2020-12-05 stsp old_selected_entry = ls->selected_entry;
4131 e78dc838 2020-12-04 stsp err = input_log_view(NULL, s->log_view, KEY_DOWN);
4135 5a8b5076 2020-12-05 stsp if (old_selected_entry == ls->selected_entry)
4138 2b779855 2020-12-05 naddy err = set_selected_commit(s, ls->selected_entry);
4142 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4143 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
4144 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4145 145b6838 2022-06-16 stsp view->x = 0;
4147 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
4148 1e37a5c2 2019-05-12 jcs err = create_diff(s);
4154 bcbd79e2 2018-08-19 stsp return err;
4157 4ed7e80c 2018-05-20 stsp static const struct got_error *
4158 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
4160 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
4161 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
4162 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
4163 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
4164 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
4165 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
4166 3dbaef42 2020-11-24 stsp char *label1 = NULL, *label2 = NULL;
4167 3dbaef42 2020-11-24 stsp int diff_context = 3, ignore_whitespace = 0;
4168 64453f7e 2020-11-21 stsp int ch, force_text_diff = 0;
4169 3dbaef42 2020-11-24 stsp const char *errstr;
4170 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
4171 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
4173 3dbaef42 2020-11-24 stsp while ((ch = getopt(argc, argv, "aC:r:w")) != -1) {
4174 26ed57b2 2018-05-19 stsp switch (ch) {
4176 64453f7e 2020-11-21 stsp force_text_diff = 1;
4179 3dbaef42 2020-11-24 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4181 3dbaef42 2020-11-24 stsp if (errstr != NULL)
4182 5a20d08d 2022-02-09 op errx(1, "number of context lines is %s: %s",
4183 5a20d08d 2022-02-09 op errstr, errstr);
4185 09b5bff8 2020-02-23 naddy case 'r':
4186 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
4187 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
4188 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
4190 3dbaef42 2020-11-24 stsp got_path_strip_trailing_slashes(repo_path);
4193 3dbaef42 2020-11-24 stsp ignore_whitespace = 1;
4196 17020d27 2019-03-07 stsp usage_diff();
4197 26ed57b2 2018-05-19 stsp /* NOTREACHED */
4201 26ed57b2 2018-05-19 stsp argc -= optind;
4202 26ed57b2 2018-05-19 stsp argv += optind;
4204 26ed57b2 2018-05-19 stsp if (argc == 0) {
4205 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
4206 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
4207 15a94983 2018-12-23 stsp id_str1 = argv[0];
4208 15a94983 2018-12-23 stsp id_str2 = argv[1];
4210 26ed57b2 2018-05-19 stsp usage_diff();
4212 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
4213 0ae84acc 2022-06-15 tracey if (error)
4214 0ae84acc 2022-06-15 tracey goto done;
4216 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
4217 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
4218 c156c7a4 2020-12-18 stsp if (cwd == NULL)
4219 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
4220 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
4221 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4222 c156c7a4 2020-12-18 stsp goto done;
4223 a273ac94 2020-02-23 naddy if (worktree)
4224 a273ac94 2020-02-23 naddy repo_path =
4225 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
4227 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
4228 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
4229 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
4230 c156c7a4 2020-12-18 stsp goto done;
4234 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4235 eb6600df 2019-01-04 stsp if (error)
4236 eb6600df 2019-01-04 stsp goto done;
4238 a273ac94 2020-02-23 naddy init_curses();
4240 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4241 51a10b52 2020-12-26 stsp if (error)
4242 51a10b52 2020-12-26 stsp goto done;
4244 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
4245 26ed57b2 2018-05-19 stsp if (error)
4246 26ed57b2 2018-05-19 stsp goto done;
4248 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
4249 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &tog_refs, repo);
4250 26ed57b2 2018-05-19 stsp if (error)
4251 26ed57b2 2018-05-19 stsp goto done;
4253 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
4254 84de9106 2020-12-26 stsp GOT_OBJ_TYPE_ANY, &tog_refs, repo);
4255 26ed57b2 2018-05-19 stsp if (error)
4256 26ed57b2 2018-05-19 stsp goto done;
4258 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
4259 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
4260 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4261 ea5e7bb5 2018-08-01 stsp goto done;
4263 3dbaef42 2020-11-24 stsp error = open_diff_view(view, id1, id2, label1, label2, diff_context,
4264 78756c87 2020-11-24 stsp ignore_whitespace, force_text_diff, NULL, repo);
4265 5dc9f4bc 2018-08-04 stsp if (error)
4266 5dc9f4bc 2018-08-04 stsp goto done;
4267 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4269 3dbaef42 2020-11-24 stsp free(label1);
4270 3dbaef42 2020-11-24 stsp free(label2);
4271 c02c541e 2019-03-29 stsp free(repo_path);
4272 a273ac94 2020-02-23 naddy free(cwd);
4273 1d0f4054 2021-06-17 stsp if (repo) {
4274 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
4275 1d0f4054 2021-06-17 stsp if (error == NULL)
4276 1d0f4054 2021-06-17 stsp error = close_err;
4278 a273ac94 2020-02-23 naddy if (worktree)
4279 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
4280 0ae84acc 2022-06-15 tracey if (pack_fds) {
4281 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
4282 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
4283 0ae84acc 2022-06-15 tracey if (error == NULL)
4284 0ae84acc 2022-06-15 tracey error = pack_err;
4286 51a10b52 2020-12-26 stsp tog_free_refs();
4287 26ed57b2 2018-05-19 stsp return error;
4290 4ed7e80c 2018-05-20 stsp __dead static void
4291 9f7d7167 2018-04-29 stsp usage_blame(void)
4294 87411fa9 2022-06-16 stsp fprintf(stderr,
4295 87411fa9 2022-06-16 stsp "usage: %s blame [-c commit] [-r repository-path] path\n",
4296 9f7d7167 2018-04-29 stsp getprogname());
4300 84451b3e 2018-07-10 stsp struct tog_blame_line {
4301 84451b3e 2018-07-10 stsp int annotated;
4302 84451b3e 2018-07-10 stsp struct got_object_id *id;
4305 4ed7e80c 2018-05-20 stsp static const struct got_error *
4306 4f7c3e5e 2020-12-01 naddy draw_blame(struct tog_view *view)
4308 4f7c3e5e 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
4309 4f7c3e5e 2020-12-01 naddy struct tog_blame *blame = &s->blame;
4310 4f7c3e5e 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
4311 84451b3e 2018-07-10 stsp const struct got_error *err;
4312 4cb9d869 2022-06-16 stsp int lineno = 0, nprinted = 0;
4313 826082fe 2020-12-10 stsp char *line = NULL;
4314 826082fe 2020-12-10 stsp size_t linesize = 0;
4315 826082fe 2020-12-10 stsp ssize_t linelen;
4316 84451b3e 2018-07-10 stsp wchar_t *wline;
4317 27a741e5 2019-09-11 stsp int width;
4318 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
4319 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
4320 ab089a2a 2018-07-12 stsp char *id_str;
4321 11b20872 2019-11-08 stsp struct tog_color *tc;
4323 d7b5a0e8 2022-04-20 stsp err = got_object_id_str(&id_str, &s->blamed_commit->id);
4325 ab089a2a 2018-07-12 stsp return err;
4327 4f7c3e5e 2020-12-01 naddy rewind(blame->f);
4328 f7d12f7e 2018-08-01 stsp werase(view->window);
4330 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
4331 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4332 ab089a2a 2018-07-12 stsp free(id_str);
4333 ab089a2a 2018-07-12 stsp return err;
4336 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
4337 ab089a2a 2018-07-12 stsp free(line);
4338 2550e4c3 2018-07-13 stsp line = NULL;
4340 1cae65b4 2019-09-22 stsp return err;
4341 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4342 a3404814 2018-09-02 stsp wstandout(view->window);
4343 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
4345 11b20872 2019-11-08 stsp wattr_on(view->window,
4346 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4347 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4349 11b20872 2019-11-08 stsp wattr_off(view->window,
4350 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4351 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4352 a3404814 2018-09-02 stsp wstandend(view->window);
4353 2550e4c3 2018-07-13 stsp free(wline);
4354 2550e4c3 2018-07-13 stsp wline = NULL;
4355 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4356 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4358 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
4359 4f7c3e5e 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, blame->nlines,
4360 4f7c3e5e 2020-12-01 naddy s->blame_complete ? "" : "annotating... ", s->path) == -1) {
4361 ab089a2a 2018-07-12 stsp free(id_str);
4362 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4364 ab089a2a 2018-07-12 stsp free(id_str);
4365 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
4366 3f60a8ef 2018-07-10 stsp free(line);
4367 2550e4c3 2018-07-13 stsp line = NULL;
4369 3f60a8ef 2018-07-10 stsp return err;
4370 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4371 2550e4c3 2018-07-13 stsp free(wline);
4372 2550e4c3 2018-07-13 stsp wline = NULL;
4373 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4374 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4376 4f7c3e5e 2020-12-01 naddy s->eof = 0;
4377 145b6838 2022-06-16 stsp view->maxx = 0;
4378 4f7c3e5e 2020-12-01 naddy while (nprinted < view->nlines - 2) {
4379 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, blame->f);
4380 826082fe 2020-12-10 stsp if (linelen == -1) {
4381 826082fe 2020-12-10 stsp if (feof(blame->f)) {
4382 826082fe 2020-12-10 stsp s->eof = 1;
4385 84451b3e 2018-07-10 stsp free(line);
4386 826082fe 2020-12-10 stsp return got_ferror(blame->f, GOT_ERR_IO);
4388 826082fe 2020-12-10 stsp if (++lineno < s->first_displayed_line)
4391 1853e0f4 2022-06-16 stsp /* Set view->maxx based on full line length. */
4392 1853e0f4 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, INT_MAX, 9, 1);
4393 1853e0f4 2022-06-16 stsp if (err) {
4394 1853e0f4 2022-06-16 stsp free(line);
4395 1853e0f4 2022-06-16 stsp return err;
4397 1853e0f4 2022-06-16 stsp free(wline);
4398 1853e0f4 2022-06-16 stsp wline = NULL;
4399 1853e0f4 2022-06-16 stsp view->maxx = MAX(view->maxx, width);
4401 4f7c3e5e 2020-12-01 naddy if (view->focussed && nprinted == s->selected_line - 1)
4402 f7d12f7e 2018-08-01 stsp wstandout(view->window);
4404 4f7c3e5e 2020-12-01 naddy if (blame->nlines > 0) {
4405 4f7c3e5e 2020-12-01 naddy blame_line = &blame->lines[lineno - 1];
4406 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
4407 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
4408 27a741e5 2019-09-11 stsp !(view->focussed &&
4409 4f7c3e5e 2020-12-01 naddy nprinted == s->selected_line - 1)) {
4410 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
4411 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
4412 8d0fe45a 2019-08-12 stsp char *id_str;
4413 87411fa9 2022-06-16 stsp err = got_object_id_str(&id_str,
4414 87411fa9 2022-06-16 stsp blame_line->id);
4415 8d0fe45a 2019-08-12 stsp if (err) {
4416 8d0fe45a 2019-08-12 stsp free(line);
4417 8d0fe45a 2019-08-12 stsp return err;
4419 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
4421 11b20872 2019-11-08 stsp wattr_on(view->window,
4422 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4423 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
4425 11b20872 2019-11-08 stsp wattr_off(view->window,
4426 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4427 8d0fe45a 2019-08-12 stsp free(id_str);
4428 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
4430 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
4431 8d0fe45a 2019-08-12 stsp prev_id = NULL;
4434 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
4435 ee41ec32 2018-07-10 stsp prev_id = NULL;
4438 4f7c3e5e 2020-12-01 naddy if (view->focussed && nprinted == s->selected_line - 1)
4439 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4440 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
4442 41605754 2020-11-12 stsp if (view->ncols <= 9) {
4443 41605754 2020-11-12 stsp width = 9;
4444 4f7c3e5e 2020-12-01 naddy } else if (s->first_displayed_line + nprinted ==
4445 4f7c3e5e 2020-12-01 naddy s->matched_line &&
4446 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
4447 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols - 9, 9,
4448 145b6838 2022-06-16 stsp view->window, view->x, regmatch);
4449 41605754 2020-11-12 stsp if (err) {
4450 41605754 2020-11-12 stsp free(line);
4451 41605754 2020-11-12 stsp return err;
4453 41605754 2020-11-12 stsp width += 9;
4456 4cb9d869 2022-06-16 stsp err = format_line(&wline, &width, &skip, line,
4457 4cb9d869 2022-06-16 stsp view->x, view->ncols - 9, 9, 1);
4458 4cb9d869 2022-06-16 stsp if (err) {
4459 4cb9d869 2022-06-16 stsp free(line);
4460 4cb9d869 2022-06-16 stsp return err;
4462 4cb9d869 2022-06-16 stsp waddwstr(view->window, &wline[skip]);
4463 a75b3e2d 2022-06-16 stsp width += 9;
4464 41605754 2020-11-12 stsp free(wline);
4465 41605754 2020-11-12 stsp wline = NULL;
4468 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
4469 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
4470 84451b3e 2018-07-10 stsp if (++nprinted == 1)
4471 4f7c3e5e 2020-12-01 naddy s->first_displayed_line = lineno;
4473 826082fe 2020-12-10 stsp free(line);
4474 4f7c3e5e 2020-12-01 naddy s->last_displayed_line = lineno;
4476 1a57306a 2018-09-02 stsp view_vborder(view);
4478 84451b3e 2018-07-10 stsp return NULL;
4481 84451b3e 2018-07-10 stsp static const struct got_error *
4482 392891ce 2022-04-07 stsp blame_cb(void *arg, int nlines, int lineno,
4483 392891ce 2022-04-07 stsp struct got_commit_object *commit, struct got_object_id *id)
4485 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
4486 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
4487 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
4488 1a76625f 2018-10-22 stsp int errcode;
4490 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
4491 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4492 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
4494 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4495 1a76625f 2018-10-22 stsp if (errcode)
4496 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
4498 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
4499 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
4500 d68a0a7d 2018-07-10 stsp goto done;
4503 d68a0a7d 2018-07-10 stsp if (lineno == -1)
4504 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
4506 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
4507 d68a0a7d 2018-07-10 stsp if (line->annotated)
4508 d68a0a7d 2018-07-10 stsp goto done;
4510 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
4511 84451b3e 2018-07-10 stsp if (line->id == NULL) {
4512 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4513 84451b3e 2018-07-10 stsp goto done;
4515 84451b3e 2018-07-10 stsp line->annotated = 1;
4517 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4518 1a76625f 2018-10-22 stsp if (errcode)
4519 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4520 84451b3e 2018-07-10 stsp return err;
4523 84451b3e 2018-07-10 stsp static void *
4524 84451b3e 2018-07-10 stsp blame_thread(void *arg)
4526 1d0f4054 2021-06-17 stsp const struct got_error *err, *close_err;
4527 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
4528 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
4529 1a76625f 2018-10-22 stsp int errcode;
4531 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
4533 61266923 2020-01-14 stsp return (void *)err;
4535 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
4536 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
4537 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
4538 fc06ba56 2019-08-22 stsp err = NULL;
4540 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4541 1a76625f 2018-10-22 stsp if (errcode)
4542 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
4543 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4545 1d0f4054 2021-06-17 stsp close_err = got_repo_close(ta->repo);
4546 1d0f4054 2021-06-17 stsp if (err == NULL)
4547 1d0f4054 2021-06-17 stsp err = close_err;
4548 c9beca56 2018-07-22 stsp ta->repo = NULL;
4549 c9beca56 2018-07-22 stsp *ta->complete = 1;
4551 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4552 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
4553 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4555 18430de3 2018-07-10 stsp return (void *)err;
4558 245d91c1 2018-07-12 stsp static struct got_object_id *
4559 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
4560 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
4562 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
4564 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
4565 8d0fe45a 2019-08-12 stsp return NULL;
4567 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
4568 245d91c1 2018-07-12 stsp if (!line->annotated)
4569 245d91c1 2018-07-12 stsp return NULL;
4571 245d91c1 2018-07-12 stsp return line->id;
4574 b880a918 2018-07-10 stsp static const struct got_error *
4575 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
4577 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
4580 245d91c1 2018-07-12 stsp if (blame->thread) {
4581 1a76625f 2018-10-22 stsp int errcode;
4582 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4583 1a76625f 2018-10-22 stsp if (errcode)
4584 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4585 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
4586 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
4587 1a76625f 2018-10-22 stsp if (errcode)
4588 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
4589 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4590 1a76625f 2018-10-22 stsp if (errcode)
4591 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4592 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4593 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
4594 245d91c1 2018-07-12 stsp err = NULL;
4595 245d91c1 2018-07-12 stsp blame->thread = NULL;
4597 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
4598 1d0f4054 2021-06-17 stsp const struct got_error *close_err;
4599 1d0f4054 2021-06-17 stsp close_err = got_repo_close(blame->thread_args.repo);
4600 1d0f4054 2021-06-17 stsp if (err == NULL)
4601 1d0f4054 2021-06-17 stsp err = close_err;
4602 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
4604 245d91c1 2018-07-12 stsp if (blame->f) {
4605 56b63ca4 2021-01-22 stsp if (fclose(blame->f) == EOF && err == NULL)
4606 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4607 245d91c1 2018-07-12 stsp blame->f = NULL;
4609 57670559 2018-12-23 stsp if (blame->lines) {
4610 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
4611 57670559 2018-12-23 stsp free(blame->lines[i].id);
4612 57670559 2018-12-23 stsp free(blame->lines);
4613 57670559 2018-12-23 stsp blame->lines = NULL;
4615 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
4616 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
4617 0ae84acc 2022-06-15 tracey if (blame->pack_fds) {
4618 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
4619 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(blame->pack_fds);
4620 0ae84acc 2022-06-15 tracey if (err == NULL)
4621 0ae84acc 2022-06-15 tracey err = pack_err;
4622 8b195234 2022-06-15 stsp blame->pack_fds = NULL;
4624 245d91c1 2018-07-12 stsp return err;
4627 245d91c1 2018-07-12 stsp static const struct got_error *
4628 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
4630 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
4631 fc06ba56 2019-08-22 stsp int *done = arg;
4632 fc06ba56 2019-08-22 stsp int errcode;
4634 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4635 fc06ba56 2019-08-22 stsp if (errcode)
4636 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4637 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
4639 fc06ba56 2019-08-22 stsp if (*done)
4640 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
4642 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4643 fc06ba56 2019-08-22 stsp if (errcode)
4644 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4645 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
4647 fc06ba56 2019-08-22 stsp return err;
4650 fc06ba56 2019-08-22 stsp static const struct got_error *
4651 a5388363 2020-12-01 naddy run_blame(struct tog_view *view)
4653 a5388363 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
4654 a5388363 2020-12-01 naddy struct tog_blame *blame = &s->blame;
4655 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
4656 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
4657 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
4658 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
4659 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
4660 15a94983 2018-12-23 stsp int obj_type;
4661 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
4663 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&commit, s->repo,
4664 d7b5a0e8 2022-04-20 stsp &s->blamed_commit->id);
4666 15a94983 2018-12-23 stsp return err;
4668 a44927cc 2022-04-07 stsp err = got_object_id_by_path(&obj_id, s->repo, commit, s->path);
4670 a44927cc 2022-04-07 stsp goto done;
4672 a5388363 2020-12-01 naddy err = got_object_get_type(&obj_type, s->repo, obj_id);
4674 84451b3e 2018-07-10 stsp goto done;
4676 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4677 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
4678 84451b3e 2018-07-10 stsp goto done;
4681 a5388363 2020-12-01 naddy err = got_object_open_as_blob(&blob, s->repo, obj_id, 8192);
4683 a70480e0 2018-06-23 stsp goto done;
4684 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
4685 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
4686 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
4687 84451b3e 2018-07-10 stsp goto done;
4689 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4690 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
4692 1fddf795 2021-01-20 stsp goto done;
4693 1fddf795 2021-01-20 stsp if (blame->nlines == 0) {
4694 1fddf795 2021-01-20 stsp s->blame_complete = 1;
4695 84451b3e 2018-07-10 stsp goto done;
4698 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4699 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4700 b02560ec 2019-08-19 stsp blame->nlines--;
4702 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4703 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
4704 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4705 84451b3e 2018-07-10 stsp goto done;
4708 0ae84acc 2022-06-15 tracey err = got_repo_pack_fds_open(&pack_fds);
4710 bd24772e 2018-07-11 stsp goto done;
4711 0ae84acc 2022-06-15 tracey err = got_repo_open(&thread_repo, got_repo_get_path(s->repo), NULL,
4712 0ae84acc 2022-06-15 tracey pack_fds);
4713 0ae84acc 2022-06-15 tracey if (err)
4714 0ae84acc 2022-06-15 tracey goto done;
4716 0ae84acc 2022-06-15 tracey blame->pack_fds = pack_fds;
4717 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
4718 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
4719 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
4720 d7b5a0e8 2022-04-20 stsp blame->cb_args.commit_id = got_object_id_dup(&s->blamed_commit->id);
4721 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
4722 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4723 245d91c1 2018-07-12 stsp goto done;
4725 a5388363 2020-12-01 naddy blame->cb_args.quit = &s->done;
4727 a5388363 2020-12-01 naddy blame->thread_args.path = s->path;
4728 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
4729 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
4730 a5388363 2020-12-01 naddy blame->thread_args.complete = &s->blame_complete;
4731 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
4732 a5388363 2020-12-01 naddy blame->thread_args.cancel_arg = &s->done;
4733 a5388363 2020-12-01 naddy s->blame_complete = 0;
4735 f5a09613 2020-12-13 naddy if (s->first_displayed_line + view->nlines - 1 > blame->nlines) {
4736 f5a09613 2020-12-13 naddy s->first_displayed_line = 1;
4737 f5a09613 2020-12-13 naddy s->last_displayed_line = view->nlines;
4738 f5a09613 2020-12-13 naddy s->selected_line = 1;
4740 67b5eae1 2021-12-27 naddy s->matched_line = 0;
4743 a44927cc 2022-04-07 stsp if (commit)
4744 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
4746 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
4747 27d434c2 2018-09-15 stsp free(obj_id);
4749 245d91c1 2018-07-12 stsp stop_blame(blame);
4750 245d91c1 2018-07-12 stsp return err;
4753 245d91c1 2018-07-12 stsp static const struct got_error *
4754 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
4755 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4757 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
4758 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4760 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->blamed_commits);
4762 c4843652 2019-08-12 stsp s->path = strdup(path);
4763 c4843652 2019-08-12 stsp if (s->path == NULL)
4764 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4766 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4767 c4843652 2019-08-12 stsp if (err) {
4768 c4843652 2019-08-12 stsp free(s->path);
4769 7cbe629d 2018-08-04 stsp return err;
4772 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4773 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4774 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4775 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4776 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4777 fb2756b9 2018-08-04 stsp s->repo = repo;
4778 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4779 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4781 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
4782 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4783 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4784 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4786 11b20872 2019-11-08 stsp return err;
4789 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4790 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4791 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4792 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4793 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4795 a5388363 2020-12-01 naddy return run_blame(view);
4798 e5a0f69f 2018-08-18 stsp static const struct got_error *
4799 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4801 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4802 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4804 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4805 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4807 dbdddfee 2021-06-23 naddy while (!STAILQ_EMPTY(&s->blamed_commits)) {
4808 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4809 dbdddfee 2021-06-23 naddy blamed_commit = STAILQ_FIRST(&s->blamed_commits);
4810 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
4811 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4814 e5a0f69f 2018-08-18 stsp free(s->path);
4815 11b20872 2019-11-08 stsp free_colors(&s->colors);
4816 e5a0f69f 2018-08-18 stsp return err;
4819 7cbe629d 2018-08-04 stsp static const struct got_error *
4820 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4822 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4824 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4825 6c4c42e0 2019-06-24 stsp return NULL;
4828 6c4c42e0 2019-06-24 stsp static const struct got_error *
4829 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4831 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4832 145b6838 2022-06-16 stsp const struct got_error *err = NULL;
4833 6c4c42e0 2019-06-24 stsp int lineno;
4834 cb713507 2022-06-16 stsp char *line = NULL;
4835 826082fe 2020-12-10 stsp size_t linesize = 0;
4836 826082fe 2020-12-10 stsp ssize_t linelen;
4838 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4839 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4840 6c4c42e0 2019-06-24 stsp return NULL;
4843 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4844 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4845 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4847 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4849 487cd7d2 2021-12-17 stsp lineno = s->first_displayed_line - 1 + s->selected_line;
4851 6c4c42e0 2019-06-24 stsp while (1) {
4852 6c4c42e0 2019-06-24 stsp off_t offset;
4854 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4855 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4856 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4860 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4861 6c4c42e0 2019-06-24 stsp lineno = 1;
4863 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4866 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4867 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4868 6c4c42e0 2019-06-24 stsp free(line);
4869 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4871 826082fe 2020-12-10 stsp linelen = getline(&line, &linesize, s->blame.f);
4872 cb713507 2022-06-16 stsp if (linelen != -1) {
4873 cb713507 2022-06-16 stsp char *exstr;
4874 cb713507 2022-06-16 stsp err = expand_tab(&exstr, line);
4877 cb713507 2022-06-16 stsp if (match_line(exstr, &view->regex, 1,
4878 cb713507 2022-06-16 stsp &view->regmatch)) {
4879 cb713507 2022-06-16 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4880 cb713507 2022-06-16 stsp s->matched_line = lineno;
4881 cb713507 2022-06-16 stsp free(exstr);
4884 cb713507 2022-06-16 stsp free(exstr);
4886 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4891 826082fe 2020-12-10 stsp free(line);
4893 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4894 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4895 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4898 145b6838 2022-06-16 stsp return err;
4901 6c4c42e0 2019-06-24 stsp static const struct got_error *
4902 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4904 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4905 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4906 2b380cc8 2018-10-24 stsp int errcode;
4908 1fddf795 2021-01-20 stsp if (s->blame.thread == NULL && !s->blame_complete) {
4909 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4910 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4911 2b380cc8 2018-10-24 stsp if (errcode)
4912 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4914 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4917 51fe7530 2019-08-19 stsp if (s->blame_complete)
4918 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4920 4f7c3e5e 2020-12-01 naddy err = draw_blame(view);
4922 669b5ffa 2018-10-07 stsp view_vborder(view);
4923 e5a0f69f 2018-08-18 stsp return err;
4926 e5a0f69f 2018-08-18 stsp static const struct got_error *
4927 e78dc838 2020-12-04 stsp input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
4929 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4930 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4931 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4932 83cc4199 2022-06-13 stsp int begin_x = 0, nscroll = view->nlines - 2;
4934 e5a0f69f 2018-08-18 stsp switch (ch) {
4936 145b6838 2022-06-16 stsp view->x = 0;
4939 145b6838 2022-06-16 stsp view->x = MAX(view->maxx - view->ncols / 3, 0);
4941 145b6838 2022-06-16 stsp case KEY_RIGHT:
4943 145b6838 2022-06-16 stsp if (view->x + view->ncols / 3 < view->maxx)
4944 145b6838 2022-06-16 stsp view->x += 2; /* move two columns right */
4946 145b6838 2022-06-16 stsp case KEY_LEFT:
4948 145b6838 2022-06-16 stsp view->x -= MIN(view->x, 2); /* move two columns back */
4951 1e37a5c2 2019-05-12 jcs s->done = 1;
4953 4deef56f 2021-09-02 naddy case 'g':
4954 4deef56f 2021-09-02 naddy case KEY_HOME:
4955 4deef56f 2021-09-02 naddy s->selected_line = 1;
4956 4deef56f 2021-09-02 naddy s->first_displayed_line = 1;
4958 4deef56f 2021-09-02 naddy case 'G':
4959 4deef56f 2021-09-02 naddy case KEY_END:
4960 4deef56f 2021-09-02 naddy if (s->blame.nlines < view->nlines - 2) {
4961 4deef56f 2021-09-02 naddy s->selected_line = s->blame.nlines;
4962 4deef56f 2021-09-02 naddy s->first_displayed_line = 1;
4964 4deef56f 2021-09-02 naddy s->selected_line = view->nlines - 2;
4965 4deef56f 2021-09-02 naddy s->first_displayed_line = s->blame.nlines -
4966 4deef56f 2021-09-02 naddy (view->nlines - 3);
4970 1e37a5c2 2019-05-12 jcs case KEY_UP:
4971 02ffd0d5 2021-10-17 stsp case CTRL('p'):
4972 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4973 1e37a5c2 2019-05-12 jcs s->selected_line--;
4974 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4975 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4976 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4978 83cc4199 2022-06-13 stsp case CTRL('u'):
4980 83cc4199 2022-06-13 stsp nscroll /= 2;
4981 83cc4199 2022-06-13 stsp /* FALL THROUGH */
4982 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4983 ea025d1d 2020-02-22 naddy case CTRL('b'):
4984 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4985 83cc4199 2022-06-13 stsp s->selected_line = MAX(1, s->selected_line - nscroll);
4988 83cc4199 2022-06-13 stsp if (s->first_displayed_line > nscroll)
4989 83cc4199 2022-06-13 stsp s->first_displayed_line -= nscroll;
4991 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4994 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4995 02ffd0d5 2021-10-17 stsp case CTRL('n'):
4996 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4997 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4998 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4999 1e37a5c2 2019-05-12 jcs s->selected_line++;
5000 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
5001 1e37a5c2 2019-05-12 jcs s->blame.nlines)
5002 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
5005 1e37a5c2 2019-05-12 jcs case 'p': {
5006 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
5007 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
5008 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
5009 1e37a5c2 2019-05-12 jcs if (id == NULL)
5011 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
5012 a44927cc 2022-04-07 stsp struct got_commit_object *commit, *pcommit;
5013 15a94983 2018-12-23 stsp struct got_object_qid *pid;
5014 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
5015 1e37a5c2 2019-05-12 jcs int obj_type;
5016 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
5017 1e37a5c2 2019-05-12 jcs s->repo, id);
5020 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(
5021 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
5022 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
5023 15a94983 2018-12-23 stsp got_object_commit_close(commit);
5026 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
5027 a44927cc 2022-04-07 stsp err = got_object_open_as_commit(&pcommit,
5028 d7b5a0e8 2022-04-20 stsp s->repo, &pid->id);
5031 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
5032 a44927cc 2022-04-07 stsp pcommit, s->path);
5033 a44927cc 2022-04-07 stsp got_object_commit_close(pcommit);
5034 e5a0f69f 2018-08-18 stsp if (err) {
5035 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
5036 1e37a5c2 2019-05-12 jcs err = NULL;
5037 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5040 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
5042 1e37a5c2 2019-05-12 jcs free(blob_id);
5043 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
5044 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
5045 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5048 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
5049 d7b5a0e8 2022-04-20 stsp &pid->id);
5050 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5052 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
5053 d7b5a0e8 2022-04-20 stsp &s->blamed_commit->id) == 0)
5055 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
5060 1e37a5c2 2019-05-12 jcs s->done = 1;
5061 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
5062 1e37a5c2 2019-05-12 jcs s->done = 0;
5063 1e37a5c2 2019-05-12 jcs if (thread_err)
5065 dbdddfee 2021-06-23 naddy STAILQ_INSERT_HEAD(&s->blamed_commits,
5066 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
5067 a5388363 2020-12-01 naddy err = run_blame(view);
5072 1e37a5c2 2019-05-12 jcs case 'B': {
5073 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
5074 dbdddfee 2021-06-23 naddy first = STAILQ_FIRST(&s->blamed_commits);
5075 d7b5a0e8 2022-04-20 stsp if (!got_object_id_cmp(&first->id, s->commit_id))
5077 1e37a5c2 2019-05-12 jcs s->done = 1;
5078 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
5079 1e37a5c2 2019-05-12 jcs s->done = 0;
5080 1e37a5c2 2019-05-12 jcs if (thread_err)
5082 dbdddfee 2021-06-23 naddy STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
5083 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
5084 1e37a5c2 2019-05-12 jcs s->blamed_commit =
5085 dbdddfee 2021-06-23 naddy STAILQ_FIRST(&s->blamed_commits);
5086 a5388363 2020-12-01 naddy err = run_blame(view);
5091 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5092 1e37a5c2 2019-05-12 jcs case '\r': {
5093 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
5094 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
5095 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
5096 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
5097 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
5098 1e37a5c2 2019-05-12 jcs if (id == NULL)
5100 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
5103 dbdddfee 2021-06-23 naddy pid = STAILQ_FIRST(
5104 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
5105 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5106 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5107 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
5108 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
5109 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5110 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
5113 d7b5a0e8 2022-04-20 stsp err = open_diff_view(diff_view, pid ? &pid->id : NULL,
5114 78756c87 2020-11-24 stsp id, NULL, NULL, 3, 0, 0, NULL, s->repo);
5115 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
5117 1e37a5c2 2019-05-12 jcs view_close(diff_view);
5120 e78dc838 2020-12-04 stsp view->focussed = 0;
5121 e78dc838 2020-12-04 stsp diff_view->focussed = 1;
5122 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5123 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5126 0dbbbe90 2022-06-17 op err = view_set_child(view, diff_view);
5129 e78dc838 2020-12-04 stsp view->focus_child = 1;
5131 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
5136 83cc4199 2022-06-13 stsp case CTRL('d'):
5138 83cc4199 2022-06-13 stsp nscroll /= 2;
5139 83cc4199 2022-06-13 stsp /* FALL THROUGH */
5140 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5141 ea025d1d 2020-02-22 naddy case CTRL('f'):
5143 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
5144 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
5145 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
5148 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
5149 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
5150 83cc4199 2022-06-13 stsp s->selected_line +=
5151 83cc4199 2022-06-13 stsp MIN(nscroll, s->last_displayed_line -
5152 83cc4199 2022-06-13 stsp s->first_displayed_line - s->selected_line + 1);
5154 83cc4199 2022-06-13 stsp if (s->last_displayed_line + nscroll <= s->blame.nlines)
5155 83cc4199 2022-06-13 stsp s->first_displayed_line += nscroll;
5157 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
5158 83cc4199 2022-06-13 stsp s->blame.nlines - (view->nlines - 3);
5160 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5161 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
5162 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
5163 1e37a5c2 2019-05-12 jcs view->nlines - 2);
5169 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
5172 a70480e0 2018-06-23 stsp static const struct got_error *
5173 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
5175 a70480e0 2018-06-23 stsp const struct got_error *error;
5176 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
5177 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
5178 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5179 0587e10c 2020-07-23 stsp char *link_target = NULL;
5180 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5181 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
5182 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
5184 e1cd8fed 2018-08-01 stsp struct tog_view *view;
5185 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
5187 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5188 a70480e0 2018-06-23 stsp switch (ch) {
5190 a70480e0 2018-06-23 stsp commit_id_str = optarg;
5193 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
5194 69069811 2018-08-02 stsp if (repo_path == NULL)
5195 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
5199 17020d27 2019-03-07 stsp usage_blame();
5200 a70480e0 2018-06-23 stsp /* NOTREACHED */
5204 a70480e0 2018-06-23 stsp argc -= optind;
5205 a70480e0 2018-06-23 stsp argv += optind;
5207 f135c941 2020-02-20 stsp if (argc != 1)
5208 a70480e0 2018-06-23 stsp usage_blame();
5210 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
5211 0ae84acc 2022-06-15 tracey if (error != NULL)
5212 0ae84acc 2022-06-15 tracey goto done;
5214 69069811 2018-08-02 stsp if (repo_path == NULL) {
5215 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
5216 c156c7a4 2020-12-18 stsp if (cwd == NULL)
5217 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
5218 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
5219 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5220 c156c7a4 2020-12-18 stsp goto done;
5221 f135c941 2020-02-20 stsp if (worktree)
5222 eb41ed75 2019-02-05 stsp repo_path =
5223 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5225 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
5226 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
5227 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
5228 c156c7a4 2020-12-18 stsp goto done;
5232 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5233 c02c541e 2019-03-29 stsp if (error != NULL)
5234 8e94dd5b 2019-01-04 stsp goto done;
5236 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
5237 f135c941 2020-02-20 stsp worktree);
5238 c02c541e 2019-03-29 stsp if (error)
5239 92205607 2019-01-04 stsp goto done;
5241 f135c941 2020-02-20 stsp init_curses();
5243 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5244 51a10b52 2020-12-26 stsp if (error)
5245 51a10b52 2020-12-26 stsp goto done;
5247 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
5248 eb41ed75 2019-02-05 stsp if (error)
5249 69069811 2018-08-02 stsp goto done;
5251 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
5252 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
5253 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
5254 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5255 a70480e0 2018-06-23 stsp if (error != NULL)
5256 66b4983c 2018-06-23 stsp goto done;
5257 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
5258 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
5260 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5261 84de9106 2020-12-26 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
5263 a19e88aa 2018-06-23 stsp if (error != NULL)
5264 8b473291 2019-02-21 stsp goto done;
5266 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
5267 e1cd8fed 2018-08-01 stsp if (view == NULL) {
5268 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5269 e1cd8fed 2018-08-01 stsp goto done;
5272 a44927cc 2022-04-07 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5273 a44927cc 2022-04-07 stsp if (error)
5274 a44927cc 2022-04-07 stsp goto done;
5276 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
5277 a44927cc 2022-04-07 stsp commit, repo);
5278 7cbe629d 2018-08-04 stsp if (error)
5279 7cbe629d 2018-08-04 stsp goto done;
5281 0587e10c 2020-07-23 stsp error = open_blame_view(view, link_target ? link_target : in_repo_path,
5282 78756c87 2020-11-24 stsp commit_id, repo);
5283 0587e10c 2020-07-23 stsp if (error)
5284 0587e10c 2020-07-23 stsp goto done;
5285 12314ad4 2019-08-31 stsp if (worktree) {
5286 12314ad4 2019-08-31 stsp /* Release work tree lock. */
5287 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
5288 12314ad4 2019-08-31 stsp worktree = NULL;
5290 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5292 69069811 2018-08-02 stsp free(repo_path);
5293 f135c941 2020-02-20 stsp free(in_repo_path);
5294 0587e10c 2020-07-23 stsp free(link_target);
5295 69069811 2018-08-02 stsp free(cwd);
5296 a70480e0 2018-06-23 stsp free(commit_id);
5297 a44927cc 2022-04-07 stsp if (commit)
5298 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
5299 eb41ed75 2019-02-05 stsp if (worktree)
5300 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
5301 1d0f4054 2021-06-17 stsp if (repo) {
5302 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
5303 1d0f4054 2021-06-17 stsp if (error == NULL)
5304 1d0f4054 2021-06-17 stsp error = close_err;
5306 0ae84acc 2022-06-15 tracey if (pack_fds) {
5307 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
5308 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
5309 0ae84acc 2022-06-15 tracey if (error == NULL)
5310 0ae84acc 2022-06-15 tracey error = pack_err;
5312 51a10b52 2020-12-26 stsp tog_free_refs();
5313 a70480e0 2018-06-23 stsp return error;
5316 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5317 d86d3b18 2020-12-01 naddy draw_tree_entries(struct tog_view *view, const char *parent_path)
5319 d86d3b18 2020-12-01 naddy struct tog_tree_view_state *s = &view->state.tree;
5320 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
5321 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
5322 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
5323 f26dddb7 2019-11-08 stsp struct tog_color *tc;
5324 56e0773d 2019-11-28 stsp int width, n, i, nentries;
5325 d86d3b18 2020-12-01 naddy int limit = view->nlines;
5327 d86d3b18 2020-12-01 naddy s->ndisplayed = 0;
5329 f7d12f7e 2018-08-01 stsp werase(view->window);
5331 ffd1d5e5 2018-06-23 stsp if (limit == 0)
5332 ffd1d5e5 2018-06-23 stsp return NULL;
5334 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, s->tree_label, 0, view->ncols,
5337 ffd1d5e5 2018-06-23 stsp return err;
5338 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
5339 a3404814 2018-09-02 stsp wstandout(view->window);
5340 d86d3b18 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
5342 11b20872 2019-11-08 stsp wattr_on(view->window,
5343 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5344 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
5346 11b20872 2019-11-08 stsp wattr_off(view->window,
5347 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5348 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
5349 a3404814 2018-09-02 stsp wstandend(view->window);
5350 2550e4c3 2018-07-13 stsp free(wline);
5351 2550e4c3 2018-07-13 stsp wline = NULL;
5352 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
5353 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
5354 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
5355 ffd1d5e5 2018-06-23 stsp return NULL;
5356 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, parent_path, 0, view->ncols,
5359 ce52c690 2018-06-23 stsp return err;
5360 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
5361 2550e4c3 2018-07-13 stsp free(wline);
5362 2550e4c3 2018-07-13 stsp wline = NULL;
5363 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
5364 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
5365 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
5366 ffd1d5e5 2018-06-23 stsp return NULL;
5367 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
5368 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
5369 a1eca9bb 2018-06-23 stsp return NULL;
5371 d86d3b18 2020-12-01 naddy if (s->first_displayed_entry == NULL) {
5372 d86d3b18 2020-12-01 naddy te = got_object_tree_get_first_entry(s->tree);
5373 d86d3b18 2020-12-01 naddy if (s->selected == 0) {
5374 0cf4efb1 2018-09-29 stsp if (view->focussed)
5375 0cf4efb1 2018-09-29 stsp wstandout(view->window);
5376 d86d3b18 2020-12-01 naddy s->selected_entry = NULL;
5378 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
5379 d86d3b18 2020-12-01 naddy if (s->selected == 0 && view->focussed)
5380 f7d12f7e 2018-08-01 stsp wstandend(view->window);
5381 d86d3b18 2020-12-01 naddy s->ndisplayed++;
5382 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
5383 ffd1d5e5 2018-06-23 stsp return NULL;
5387 d86d3b18 2020-12-01 naddy te = s->first_displayed_entry;
5390 d86d3b18 2020-12-01 naddy nentries = got_object_tree_get_nentries(s->tree);
5391 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
5392 0d6c6ee3 2020-05-20 stsp char *line = NULL, *id_str = NULL, *link_target = NULL;
5393 848d6979 2019-08-12 stsp const char *modestr = "";
5394 56e0773d 2019-11-28 stsp mode_t mode;
5396 d86d3b18 2020-12-01 naddy te = got_object_tree_get_entry(s->tree, i);
5397 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
5399 d86d3b18 2020-12-01 naddy if (s->show_ids) {
5400 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
5401 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
5403 638f9024 2019-05-13 stsp return got_error_from_errno(
5404 230a42bd 2019-05-11 jcs "got_object_id_str");
5406 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
5407 63c5ca5d 2019-08-24 stsp modestr = "$";
5408 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
5411 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target,
5412 d86d3b18 2020-12-01 naddy te, s->repo);
5413 0d6c6ee3 2020-05-20 stsp if (err) {
5414 0d6c6ee3 2020-05-20 stsp free(id_str);
5415 0d6c6ee3 2020-05-20 stsp return err;
5417 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
5418 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
5419 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
5421 848d6979 2019-08-12 stsp modestr = "@";
5423 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
5424 848d6979 2019-08-12 stsp modestr = "/";
5425 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
5426 848d6979 2019-08-12 stsp modestr = "*";
5427 0d6c6ee3 2020-05-20 stsp if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
5428 0d6c6ee3 2020-05-20 stsp got_tree_entry_get_name(te), modestr,
5429 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "",
5430 0d6c6ee3 2020-05-20 stsp link_target ? link_target : "") == -1) {
5431 1d13200f 2018-07-12 stsp free(id_str);
5432 0d6c6ee3 2020-05-20 stsp free(link_target);
5433 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
5435 1d13200f 2018-07-12 stsp free(id_str);
5436 0d6c6ee3 2020-05-20 stsp free(link_target);
5437 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols,
5439 ffd1d5e5 2018-06-23 stsp if (err) {
5440 ffd1d5e5 2018-06-23 stsp free(line);
5443 d86d3b18 2020-12-01 naddy if (n == s->selected) {
5444 0cf4efb1 2018-09-29 stsp if (view->focussed)
5445 0cf4efb1 2018-09-29 stsp wstandout(view->window);
5446 d86d3b18 2020-12-01 naddy s->selected_entry = te;
5448 d86d3b18 2020-12-01 naddy tc = match_color(&s->colors, line);
5450 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
5451 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5452 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
5454 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
5455 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
5456 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
5457 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
5458 d86d3b18 2020-12-01 naddy if (n == s->selected && view->focussed)
5459 f7d12f7e 2018-08-01 stsp wstandend(view->window);
5460 ffd1d5e5 2018-06-23 stsp free(line);
5461 2550e4c3 2018-07-13 stsp free(wline);
5462 2550e4c3 2018-07-13 stsp wline = NULL;
5464 d86d3b18 2020-12-01 naddy s->ndisplayed++;
5465 d86d3b18 2020-12-01 naddy s->last_displayed_entry = te;
5466 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
5470 ffd1d5e5 2018-06-23 stsp return err;
5473 ffd1d5e5 2018-06-23 stsp static void
5474 3e135950 2020-12-01 naddy tree_scroll_up(struct tog_tree_view_state *s, int maxscroll)
5476 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
5477 694d3271 2020-12-01 naddy int isroot = s->tree == s->root;
5478 fa86c4bf 2020-11-29 stsp int i = 0;
5480 694d3271 2020-12-01 naddy if (s->first_displayed_entry == NULL)
5483 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, s->first_displayed_entry);
5484 fa86c4bf 2020-11-29 stsp while (i++ < maxscroll) {
5485 fa86c4bf 2020-11-29 stsp if (te == NULL) {
5486 fa86c4bf 2020-11-29 stsp if (!isroot)
5487 694d3271 2020-12-01 naddy s->first_displayed_entry = NULL;
5490 694d3271 2020-12-01 naddy s->first_displayed_entry = te;
5491 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, te);
5495 fa86c4bf 2020-11-29 stsp static void
5496 3e135950 2020-12-01 naddy tree_scroll_down(struct tog_tree_view_state *s, int maxscroll)
5498 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
5499 ffd1d5e5 2018-06-23 stsp int n = 0;
5501 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
5502 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree,
5503 694d3271 2020-12-01 naddy s->first_displayed_entry);
5505 694d3271 2020-12-01 naddy next = got_object_tree_get_first_entry(s->tree);
5507 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
5508 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
5509 694d3271 2020-12-01 naddy last = got_tree_entry_get_next(s->tree, last);
5510 768394f3 2019-01-24 stsp if (last) {
5511 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
5512 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree, next);
5517 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5518 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
5519 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
5521 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
5522 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
5523 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
5525 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
5526 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
5527 56e0773d 2019-11-28 stsp + 1 /* slash */;
5529 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
5531 ce52c690 2018-06-23 stsp *path = calloc(1, len);
5532 ffd1d5e5 2018-06-23 stsp if (path == NULL)
5533 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
5535 ce52c690 2018-06-23 stsp (*path)[0] = '/';
5536 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
5537 d9765a41 2018-06-23 stsp while (pt) {
5538 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
5539 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
5540 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
5541 cb2ebc8a 2018-06-23 stsp goto done;
5543 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
5544 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
5545 cb2ebc8a 2018-06-23 stsp goto done;
5547 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
5550 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
5551 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
5552 ce52c690 2018-06-23 stsp goto done;
5556 ce52c690 2018-06-23 stsp if (err) {
5557 ce52c690 2018-06-23 stsp free(*path);
5558 ce52c690 2018-06-23 stsp *path = NULL;
5560 ce52c690 2018-06-23 stsp return err;
5563 ce52c690 2018-06-23 stsp static const struct got_error *
5564 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
5565 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
5566 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5568 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
5569 ce52c690 2018-06-23 stsp char *path;
5570 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
5572 a0de39f3 2019-08-09 stsp *new_view = NULL;
5574 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
5576 ce52c690 2018-06-23 stsp return err;
5578 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
5579 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
5580 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
5581 83ce39e3 2019-08-12 stsp goto done;
5584 78756c87 2020-11-24 stsp err = open_blame_view(blame_view, path, commit_id, repo);
5585 e5a0f69f 2018-08-18 stsp if (err) {
5586 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
5587 fc06ba56 2019-08-22 stsp err = NULL;
5588 e5a0f69f 2018-08-18 stsp view_close(blame_view);
5590 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
5592 83ce39e3 2019-08-12 stsp free(path);
5593 69efd4c4 2018-07-18 stsp return err;
5596 69efd4c4 2018-07-18 stsp static const struct got_error *
5597 4e97c21c 2020-12-06 stsp log_selected_tree_entry(struct tog_view **new_view, int begin_x,
5598 4e97c21c 2020-12-06 stsp struct tog_tree_view_state *s)
5600 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
5601 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
5602 69efd4c4 2018-07-18 stsp char *path;
5604 a0de39f3 2019-08-09 stsp *new_view = NULL;
5606 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
5607 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
5608 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
5610 4e97c21c 2020-12-06 stsp err = tree_entry_path(&path, &s->parents, s->selected_entry);
5612 69efd4c4 2018-07-18 stsp return err;
5614 4e97c21c 2020-12-06 stsp err = open_log_view(log_view, s->commit_id, s->repo, s->head_ref_name,
5617 e5a0f69f 2018-08-18 stsp view_close(log_view);
5619 e5a0f69f 2018-08-18 stsp *new_view = log_view;
5620 cb2ebc8a 2018-06-23 stsp free(path);
5621 cb2ebc8a 2018-06-23 stsp return err;
5624 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5625 bc573f3b 2021-07-10 stsp open_tree_view(struct tog_view *view, struct got_object_id *commit_id,
5626 bc573f3b 2021-07-10 stsp const char *head_ref_name, struct got_repository *repo)
5628 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
5629 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
5630 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5631 bc573f3b 2021-07-10 stsp struct got_commit_object *commit = NULL;
5633 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
5634 bc573f3b 2021-07-10 stsp STAILQ_INIT(&s->colors);
5636 bc573f3b 2021-07-10 stsp s->commit_id = got_object_id_dup(commit_id);
5637 bc573f3b 2021-07-10 stsp if (s->commit_id == NULL)
5638 bc573f3b 2021-07-10 stsp return got_error_from_errno("got_object_id_dup");
5640 bc573f3b 2021-07-10 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
5642 bc573f3b 2021-07-10 stsp goto done;
5645 bc573f3b 2021-07-10 stsp * The root is opened here and will be closed when the view is closed.
5646 bc573f3b 2021-07-10 stsp * Any visited subtrees and their path-wise parents are opened and
5647 bc573f3b 2021-07-10 stsp * closed on demand.
5649 bc573f3b 2021-07-10 stsp err = got_object_open_as_tree(&s->root, repo,
5650 bc573f3b 2021-07-10 stsp got_object_commit_get_tree_id(commit));
5652 bc573f3b 2021-07-10 stsp goto done;
5653 bc573f3b 2021-07-10 stsp s->tree = s->root;
5655 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
5656 ffd1d5e5 2018-06-23 stsp if (err != NULL)
5657 ffd1d5e5 2018-06-23 stsp goto done;
5659 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
5660 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5661 ffd1d5e5 2018-06-23 stsp goto done;
5664 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
5665 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
5666 9cd7cbd1 2020-12-07 stsp if (head_ref_name) {
5667 9cd7cbd1 2020-12-07 stsp s->head_ref_name = strdup(head_ref_name);
5668 9cd7cbd1 2020-12-07 stsp if (s->head_ref_name == NULL) {
5669 9cd7cbd1 2020-12-07 stsp err = got_error_from_errno("strdup");
5670 9cd7cbd1 2020-12-07 stsp goto done;
5673 fb2756b9 2018-08-04 stsp s->repo = repo;
5675 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5676 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
5677 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
5678 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
5680 c0b01bdb 2019-11-08 stsp goto done;
5681 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5682 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
5684 c0b01bdb 2019-11-08 stsp goto done;
5685 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
5686 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
5687 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5689 c0b01bdb 2019-11-08 stsp goto done;
5691 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
5692 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
5693 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5695 11b20872 2019-11-08 stsp goto done;
5697 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5698 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
5700 c0b01bdb 2019-11-08 stsp goto done;
5703 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
5704 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
5705 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
5706 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
5707 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
5709 ad80ab7b 2018-08-04 stsp free(commit_id_str);
5710 bc573f3b 2021-07-10 stsp if (commit)
5711 bc573f3b 2021-07-10 stsp got_object_commit_close(commit);
5713 bc573f3b 2021-07-10 stsp close_tree_view(view);
5714 ad80ab7b 2018-08-04 stsp return err;
5717 e5a0f69f 2018-08-18 stsp static const struct got_error *
5718 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
5720 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5722 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5723 fb2756b9 2018-08-04 stsp free(s->tree_label);
5724 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5725 6484ec90 2018-09-29 stsp free(s->commit_id);
5726 6484ec90 2018-09-29 stsp s->commit_id = NULL;
5727 9cd7cbd1 2020-12-07 stsp free(s->head_ref_name);
5728 9cd7cbd1 2020-12-07 stsp s->head_ref_name = NULL;
5729 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
5730 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
5731 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
5732 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
5733 bc573f3b 2021-07-10 stsp if (parent->tree != s->root)
5734 bc573f3b 2021-07-10 stsp got_object_tree_close(parent->tree);
5735 ad80ab7b 2018-08-04 stsp free(parent);
5738 bc573f3b 2021-07-10 stsp if (s->tree != NULL && s->tree != s->root)
5739 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
5740 bc573f3b 2021-07-10 stsp if (s->root)
5741 bc573f3b 2021-07-10 stsp got_object_tree_close(s->root);
5742 7c32bd05 2019-06-22 stsp return NULL;
5745 7c32bd05 2019-06-22 stsp static const struct got_error *
5746 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
5748 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5750 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
5751 7c32bd05 2019-06-22 stsp return NULL;
5754 7c32bd05 2019-06-22 stsp static int
5755 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5757 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
5759 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5763 7c32bd05 2019-06-22 stsp static const struct got_error *
5764 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
5766 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5767 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
5769 7c32bd05 2019-06-22 stsp if (!view->searching) {
5770 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5771 7c32bd05 2019-06-22 stsp return NULL;
5774 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5775 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5776 7c32bd05 2019-06-22 stsp if (s->selected_entry)
5777 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
5778 56e0773d 2019-11-28 stsp s->selected_entry);
5780 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5782 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
5783 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5785 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
5786 56e0773d 2019-11-28 stsp s->selected_entry);
5789 487cd7d2 2021-12-17 stsp if (s->selected_entry)
5790 487cd7d2 2021-12-17 stsp te = s->selected_entry;
5791 487cd7d2 2021-12-17 stsp else if (view->searching == TOG_SEARCH_FORWARD)
5792 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5794 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5797 7c32bd05 2019-06-22 stsp while (1) {
5798 56e0773d 2019-11-28 stsp if (te == NULL) {
5799 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
5800 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5801 ac66afb8 2019-06-24 stsp return NULL;
5803 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5804 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5806 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5809 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
5810 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5811 56e0773d 2019-11-28 stsp s->matched_entry = te;
5815 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5816 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5818 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
5821 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5822 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
5823 7c32bd05 2019-06-22 stsp s->selected = 0;
5826 e5a0f69f 2018-08-18 stsp return NULL;
5829 ad80ab7b 2018-08-04 stsp static const struct got_error *
5830 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
5832 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
5833 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5834 e5a0f69f 2018-08-18 stsp char *parent_path;
5836 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5838 e5a0f69f 2018-08-18 stsp return err;
5840 d86d3b18 2020-12-01 naddy err = draw_tree_entries(view, parent_path);
5841 e5a0f69f 2018-08-18 stsp free(parent_path);
5843 669b5ffa 2018-10-07 stsp view_vborder(view);
5844 e5a0f69f 2018-08-18 stsp return err;
5847 e5a0f69f 2018-08-18 stsp static const struct got_error *
5848 e78dc838 2020-12-04 stsp input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
5850 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5851 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
5852 152c1c93 2020-11-29 stsp struct tog_view *log_view, *ref_view;
5853 e4526bf5 2021-09-03 naddy struct got_tree_entry *te;
5854 83cc4199 2022-06-13 stsp int begin_x = 0, n, nscroll = view->nlines - 3;
5856 e5a0f69f 2018-08-18 stsp switch (ch) {
5858 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
5861 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
5863 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5864 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5865 4e97c21c 2020-12-06 stsp err = log_selected_tree_entry(&log_view, begin_x, s);
5866 e78dc838 2020-12-04 stsp view->focussed = 0;
5867 e78dc838 2020-12-04 stsp log_view->focussed = 1;
5868 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5869 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5871 1e37a5c2 2019-05-12 jcs return err;
5872 0dbbbe90 2022-06-17 op err = view_set_child(view, log_view);
5875 e78dc838 2020-12-04 stsp view->focus_child = 1;
5877 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5880 152c1c93 2020-11-29 stsp if (view_is_parent_view(view))
5881 152c1c93 2020-11-29 stsp begin_x = view_split_begin_x(view->begin_x);
5882 152c1c93 2020-11-29 stsp ref_view = view_open(view->nlines, view->ncols,
5883 152c1c93 2020-11-29 stsp view->begin_y, begin_x, TOG_VIEW_REF);
5884 152c1c93 2020-11-29 stsp if (ref_view == NULL)
5885 152c1c93 2020-11-29 stsp return got_error_from_errno("view_open");
5886 152c1c93 2020-11-29 stsp err = open_ref_view(ref_view, s->repo);
5887 152c1c93 2020-11-29 stsp if (err) {
5888 152c1c93 2020-11-29 stsp view_close(ref_view);
5889 152c1c93 2020-11-29 stsp return err;
5891 e78dc838 2020-12-04 stsp view->focussed = 0;
5892 e78dc838 2020-12-04 stsp ref_view->focussed = 1;
5893 152c1c93 2020-11-29 stsp if (view_is_parent_view(view)) {
5894 152c1c93 2020-11-29 stsp err = view_close_child(view);
5896 152c1c93 2020-11-29 stsp return err;
5897 0dbbbe90 2022-06-17 op err = view_set_child(view, ref_view);
5900 e78dc838 2020-12-04 stsp view->focus_child = 1;
5902 152c1c93 2020-11-29 stsp *new_view = ref_view;
5904 e4526bf5 2021-09-03 naddy case 'g':
5905 e4526bf5 2021-09-03 naddy case KEY_HOME:
5906 e4526bf5 2021-09-03 naddy s->selected = 0;
5907 e4526bf5 2021-09-03 naddy if (s->tree == s->root)
5908 e4526bf5 2021-09-03 naddy s->first_displayed_entry =
5909 e4526bf5 2021-09-03 naddy got_object_tree_get_first_entry(s->tree);
5911 e4526bf5 2021-09-03 naddy s->first_displayed_entry = NULL;
5913 e4526bf5 2021-09-03 naddy case 'G':
5914 e4526bf5 2021-09-03 naddy case KEY_END:
5915 e4526bf5 2021-09-03 naddy s->selected = 0;
5916 e4526bf5 2021-09-03 naddy te = got_object_tree_get_last_entry(s->tree);
5917 e4526bf5 2021-09-03 naddy for (n = 0; n < view->nlines - 3; n++) {
5918 e4526bf5 2021-09-03 naddy if (te == NULL) {
5919 e4526bf5 2021-09-03 naddy if(s->tree != s->root) {
5920 e4526bf5 2021-09-03 naddy s->first_displayed_entry = NULL;
5925 e4526bf5 2021-09-03 naddy s->first_displayed_entry = te;
5926 e4526bf5 2021-09-03 naddy te = got_tree_entry_get_prev(s->tree, te);
5928 e4526bf5 2021-09-03 naddy if (n > 0)
5929 e4526bf5 2021-09-03 naddy s->selected = n - 1;
5932 1e37a5c2 2019-05-12 jcs case KEY_UP:
5933 02ffd0d5 2021-10-17 stsp case CTRL('p'):
5934 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5935 1e37a5c2 2019-05-12 jcs s->selected--;
5938 3e135950 2020-12-01 naddy tree_scroll_up(s, 1);
5940 83cc4199 2022-06-13 stsp case CTRL('u'):
5942 83cc4199 2022-06-13 stsp nscroll /= 2;
5943 83cc4199 2022-06-13 stsp /* FALL THROUGH */
5944 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5945 ea025d1d 2020-02-22 naddy case CTRL('b'):
5946 fa86c4bf 2020-11-29 stsp if (s->tree == s->root) {
5947 fa86c4bf 2020-11-29 stsp if (got_object_tree_get_first_entry(s->tree) ==
5948 fa86c4bf 2020-11-29 stsp s->first_displayed_entry)
5949 83cc4199 2022-06-13 stsp s->selected -= MIN(s->selected, nscroll);
5951 fa86c4bf 2020-11-29 stsp if (s->first_displayed_entry == NULL)
5952 83cc4199 2022-06-13 stsp s->selected -= MIN(s->selected, nscroll);
5954 83cc4199 2022-06-13 stsp tree_scroll_up(s, MAX(0, nscroll));
5957 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5958 02ffd0d5 2021-10-17 stsp case CTRL('n'):
5959 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5960 1e37a5c2 2019-05-12 jcs s->selected++;
5963 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5965 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5967 3e135950 2020-12-01 naddy tree_scroll_down(s, 1);
5969 83cc4199 2022-06-13 stsp case CTRL('d'):
5971 83cc4199 2022-06-13 stsp nscroll /= 2;
5972 83cc4199 2022-06-13 stsp /* FALL THROUGH */
5973 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5974 ea025d1d 2020-02-22 naddy case CTRL('f'):
5975 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5977 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5978 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5979 83cc4199 2022-06-13 stsp s->selected += MIN(nscroll,
5980 83cc4199 2022-06-13 stsp s->ndisplayed - s->selected - 1);
5983 83cc4199 2022-06-13 stsp tree_scroll_down(s, nscroll);
5985 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5987 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5988 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5989 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5990 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5991 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5993 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5994 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5996 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5997 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5998 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5999 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
6000 1e37a5c2 2019-05-12 jcs s->selected_entry =
6001 1e37a5c2 2019-05-12 jcs parent->selected_entry;
6002 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
6003 1e37a5c2 2019-05-12 jcs free(parent);
6004 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
6005 56e0773d 2019-11-28 stsp s->selected_entry))) {
6006 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
6007 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
6008 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
6011 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, subtree);
6012 941e9f74 2019-05-21 stsp if (err) {
6013 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
6016 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
6017 56e0773d 2019-11-28 stsp s->selected_entry))) {
6018 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
6019 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
6020 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
6022 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
6023 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
6024 78756c87 2020-11-24 stsp s->commit_id, s->repo);
6027 e78dc838 2020-12-04 stsp view->focussed = 0;
6028 e78dc838 2020-12-04 stsp blame_view->focussed = 1;
6029 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
6030 669b5ffa 2018-10-07 stsp err = view_close_child(view);
6032 669b5ffa 2018-10-07 stsp return err;
6033 0dbbbe90 2022-06-17 op err = view_set_child(view, blame_view);
6036 e78dc838 2020-12-04 stsp view->focus_child = 1;
6038 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
6041 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
6042 1e1ff4ed 2020-12-07 stsp if (view->nlines >= 4 && s->selected >= view->nlines - 3)
6043 1e1ff4ed 2020-12-07 stsp s->selected = view->nlines - 4;
6049 ffd1d5e5 2018-06-23 stsp return err;
6052 ffd1d5e5 2018-06-23 stsp __dead static void
6053 ffd1d5e5 2018-06-23 stsp usage_tree(void)
6056 87411fa9 2022-06-16 stsp fprintf(stderr,
6057 87411fa9 2022-06-16 stsp "usage: %s tree [-c commit] [-r repository-path] [path]\n",
6058 ffd1d5e5 2018-06-23 stsp getprogname());
6062 ffd1d5e5 2018-06-23 stsp static const struct got_error *
6063 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
6065 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
6066 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
6067 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
6068 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6069 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
6070 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
6071 4e97c21c 2020-12-06 stsp const char *commit_id_arg = NULL;
6072 4e97c21c 2020-12-06 stsp char *label = NULL;
6073 4e97c21c 2020-12-06 stsp struct got_reference *ref = NULL;
6074 4e97c21c 2020-12-06 stsp const char *head_ref_name = NULL;
6076 5221c383 2018-08-01 stsp struct tog_view *view;
6077 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
6079 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
6080 ffd1d5e5 2018-06-23 stsp switch (ch) {
6082 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
6085 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
6086 74283ab8 2020-02-07 stsp if (repo_path == NULL)
6087 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
6091 e99e2d15 2020-11-24 naddy usage_tree();
6092 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
6096 ffd1d5e5 2018-06-23 stsp argc -= optind;
6097 ffd1d5e5 2018-06-23 stsp argv += optind;
6099 55cccc34 2020-02-20 stsp if (argc > 1)
6100 e99e2d15 2020-11-24 naddy usage_tree();
6102 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
6103 0ae84acc 2022-06-15 tracey if (error != NULL)
6104 0ae84acc 2022-06-15 tracey goto done;
6106 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
6107 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
6108 c156c7a4 2020-12-18 stsp if (cwd == NULL)
6109 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
6110 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
6111 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6112 c156c7a4 2020-12-18 stsp goto done;
6113 55cccc34 2020-02-20 stsp if (worktree)
6114 52185f70 2019-02-05 stsp repo_path =
6115 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
6117 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
6118 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
6119 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
6120 c156c7a4 2020-12-18 stsp goto done;
6124 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6125 c02c541e 2019-03-29 stsp if (error != NULL)
6126 52185f70 2019-02-05 stsp goto done;
6128 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
6129 55cccc34 2020-02-20 stsp repo, worktree);
6130 55cccc34 2020-02-20 stsp if (error)
6131 55cccc34 2020-02-20 stsp goto done;
6133 55cccc34 2020-02-20 stsp init_curses();
6135 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
6136 c02c541e 2019-03-29 stsp if (error)
6137 52185f70 2019-02-05 stsp goto done;
6139 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
6140 51a10b52 2020-12-26 stsp if (error)
6141 51a10b52 2020-12-26 stsp goto done;
6143 4e97c21c 2020-12-06 stsp if (commit_id_arg == NULL) {
6144 4e97c21c 2020-12-06 stsp error = got_repo_match_object_id(&commit_id, &label,
6145 4e97c21c 2020-12-06 stsp worktree ? got_worktree_get_head_ref_name(worktree) :
6146 84de9106 2020-12-26 stsp GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
6147 4e97c21c 2020-12-06 stsp if (error)
6148 4e97c21c 2020-12-06 stsp goto done;
6149 4e97c21c 2020-12-06 stsp head_ref_name = label;
6151 4e97c21c 2020-12-06 stsp error = got_ref_open(&ref, repo, commit_id_arg, 0);
6152 4e97c21c 2020-12-06 stsp if (error == NULL)
6153 4e97c21c 2020-12-06 stsp head_ref_name = got_ref_get_name(ref);
6154 4e97c21c 2020-12-06 stsp else if (error->code != GOT_ERR_NOT_REF)
6155 4e97c21c 2020-12-06 stsp goto done;
6156 4e97c21c 2020-12-06 stsp error = got_repo_match_object_id(&commit_id, NULL,
6157 84de9106 2020-12-26 stsp commit_id_arg, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
6158 4e97c21c 2020-12-06 stsp if (error)
6159 4e97c21c 2020-12-06 stsp goto done;
6162 a44927cc 2022-04-07 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
6163 a44927cc 2022-04-07 stsp if (error)
6164 a44927cc 2022-04-07 stsp goto done;
6166 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
6167 5221c383 2018-08-01 stsp if (view == NULL) {
6168 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
6169 5221c383 2018-08-01 stsp goto done;
6171 bc573f3b 2021-07-10 stsp error = open_tree_view(view, commit_id, head_ref_name, repo);
6172 ad80ab7b 2018-08-04 stsp if (error)
6173 ad80ab7b 2018-08-04 stsp goto done;
6174 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
6175 a44927cc 2022-04-07 stsp error = tree_view_walk_path(&view->state.tree, commit,
6176 d91faf3b 2020-12-01 naddy in_repo_path);
6177 55cccc34 2020-02-20 stsp if (error)
6178 55cccc34 2020-02-20 stsp goto done;
6181 55cccc34 2020-02-20 stsp if (worktree) {
6182 55cccc34 2020-02-20 stsp /* Release work tree lock. */
6183 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
6184 55cccc34 2020-02-20 stsp worktree = NULL;
6186 e5a0f69f 2018-08-18 stsp error = view_loop(view);
6188 52185f70 2019-02-05 stsp free(repo_path);
6189 e4a0e26d 2020-02-20 stsp free(cwd);
6190 ffd1d5e5 2018-06-23 stsp free(commit_id);
6191 4e97c21c 2020-12-06 stsp free(label);
6193 486cd271 2020-12-06 stsp got_ref_close(ref);
6194 1d0f4054 2021-06-17 stsp if (repo) {
6195 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
6196 1d0f4054 2021-06-17 stsp if (error == NULL)
6197 1d0f4054 2021-06-17 stsp error = close_err;
6199 0ae84acc 2022-06-15 tracey if (pack_fds) {
6200 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
6201 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
6202 0ae84acc 2022-06-15 tracey if (error == NULL)
6203 0ae84acc 2022-06-15 tracey error = pack_err;
6205 51a10b52 2020-12-26 stsp tog_free_refs();
6206 ffd1d5e5 2018-06-23 stsp return error;
6209 6458efa5 2020-11-24 stsp static const struct got_error *
6210 6458efa5 2020-11-24 stsp ref_view_load_refs(struct tog_ref_view_state *s)
6212 6458efa5 2020-11-24 stsp struct got_reflist_entry *sre;
6213 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
6215 6458efa5 2020-11-24 stsp s->nrefs = 0;
6216 d9dff0e5 2020-12-26 stsp TAILQ_FOREACH(sre, &tog_refs, entry) {
6217 cc488aa7 2022-01-23 stsp if (strncmp(got_ref_get_name(sre->ref),
6218 cc488aa7 2022-01-23 stsp "refs/got/", 9) == 0 &&
6219 cc488aa7 2022-01-23 stsp strncmp(got_ref_get_name(sre->ref),
6220 cc488aa7 2022-01-23 stsp "refs/got/backup/", 16) != 0)
6223 6458efa5 2020-11-24 stsp re = malloc(sizeof(*re));
6224 6458efa5 2020-11-24 stsp if (re == NULL)
6225 6458efa5 2020-11-24 stsp return got_error_from_errno("malloc");
6227 8924d611 2020-12-26 stsp re->ref = got_ref_dup(sre->ref);
6228 8924d611 2020-12-26 stsp if (re->ref == NULL)
6229 8924d611 2020-12-26 stsp return got_error_from_errno("got_ref_dup");
6230 6458efa5 2020-11-24 stsp re->idx = s->nrefs++;
6231 6458efa5 2020-11-24 stsp TAILQ_INSERT_TAIL(&s->refs, re, entry);
6234 8924d611 2020-12-26 stsp s->first_displayed_entry = TAILQ_FIRST(&s->refs);
6235 6458efa5 2020-11-24 stsp return NULL;
6239 6458efa5 2020-11-24 stsp ref_view_free_refs(struct tog_ref_view_state *s)
6241 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
6243 6458efa5 2020-11-24 stsp while (!TAILQ_EMPTY(&s->refs)) {
6244 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
6245 6458efa5 2020-11-24 stsp TAILQ_REMOVE(&s->refs, re, entry);
6246 8924d611 2020-12-26 stsp got_ref_close(re->ref);
6251 6458efa5 2020-11-24 stsp static const struct got_error *
6252 6458efa5 2020-11-24 stsp open_ref_view(struct tog_view *view, struct got_repository *repo)
6254 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
6255 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6257 6458efa5 2020-11-24 stsp s->selected_entry = 0;
6258 6458efa5 2020-11-24 stsp s->repo = repo;
6260 6458efa5 2020-11-24 stsp TAILQ_INIT(&s->refs);
6261 dbdddfee 2021-06-23 naddy STAILQ_INIT(&s->colors);
6263 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
6265 6458efa5 2020-11-24 stsp return err;
6267 6458efa5 2020-11-24 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
6268 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/heads/",
6269 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_HEADS,
6270 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_HEADS"));
6272 6458efa5 2020-11-24 stsp goto done;
6274 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/tags/",
6275 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_TAGS,
6276 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_TAGS"));
6278 6458efa5 2020-11-24 stsp goto done;
6280 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/remotes/",
6281 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_REMOTES,
6282 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_REMOTES"));
6284 cc488aa7 2022-01-23 stsp goto done;
6286 cc488aa7 2022-01-23 stsp err = add_color(&s->colors, "^refs/got/backup/",
6287 cc488aa7 2022-01-23 stsp TOG_COLOR_REFS_BACKUP,
6288 cc488aa7 2022-01-23 stsp get_color_value("TOG_COLOR_REFS_BACKUP"));
6290 6458efa5 2020-11-24 stsp goto done;
6293 6458efa5 2020-11-24 stsp view->show = show_ref_view;
6294 6458efa5 2020-11-24 stsp view->input = input_ref_view;
6295 6458efa5 2020-11-24 stsp view->close = close_ref_view;
6296 6458efa5 2020-11-24 stsp view->search_start = search_start_ref_view;
6297 6458efa5 2020-11-24 stsp view->search_next = search_next_ref_view;
6300 6458efa5 2020-11-24 stsp free_colors(&s->colors);
6301 6458efa5 2020-11-24 stsp return err;
6304 6458efa5 2020-11-24 stsp static const struct got_error *
6305 6458efa5 2020-11-24 stsp close_ref_view(struct tog_view *view)
6307 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6309 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
6310 6458efa5 2020-11-24 stsp free_colors(&s->colors);
6312 6458efa5 2020-11-24 stsp return NULL;
6315 6458efa5 2020-11-24 stsp static const struct got_error *
6316 c42c9805 2020-11-24 stsp resolve_reflist_entry(struct got_object_id **commit_id,
6317 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
6319 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
6320 c42c9805 2020-11-24 stsp struct got_object_id *obj_id;
6321 6458efa5 2020-11-24 stsp struct got_tag_object *tag = NULL;
6322 6458efa5 2020-11-24 stsp int obj_type;
6324 c42c9805 2020-11-24 stsp *commit_id = NULL;
6326 6458efa5 2020-11-24 stsp err = got_ref_resolve(&obj_id, repo, re->ref);
6328 6458efa5 2020-11-24 stsp return err;
6330 6458efa5 2020-11-24 stsp err = got_object_get_type(&obj_type, repo, obj_id);
6332 6458efa5 2020-11-24 stsp goto done;
6334 6458efa5 2020-11-24 stsp switch (obj_type) {
6335 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_COMMIT:
6336 c42c9805 2020-11-24 stsp *commit_id = obj_id;
6338 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_TAG:
6339 6458efa5 2020-11-24 stsp err = got_object_open_as_tag(&tag, repo, obj_id);
6341 6458efa5 2020-11-24 stsp goto done;
6342 c42c9805 2020-11-24 stsp free(obj_id);
6343 c42c9805 2020-11-24 stsp err = got_object_get_type(&obj_type, repo,
6344 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
6346 6458efa5 2020-11-24 stsp goto done;
6347 c42c9805 2020-11-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT) {
6348 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
6349 c42c9805 2020-11-24 stsp goto done;
6351 c42c9805 2020-11-24 stsp *commit_id = got_object_id_dup(
6352 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
6353 c42c9805 2020-11-24 stsp if (*commit_id == NULL) {
6354 c42c9805 2020-11-24 stsp err = got_error_from_errno("got_object_id_dup");
6355 c42c9805 2020-11-24 stsp goto done;
6359 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
6365 c42c9805 2020-11-24 stsp got_object_tag_close(tag);
6366 c42c9805 2020-11-24 stsp if (err) {
6367 c42c9805 2020-11-24 stsp free(*commit_id);
6368 c42c9805 2020-11-24 stsp *commit_id = NULL;
6370 c42c9805 2020-11-24 stsp return err;
6373 c42c9805 2020-11-24 stsp static const struct got_error *
6374 c42c9805 2020-11-24 stsp log_ref_entry(struct tog_view **new_view, int begin_x,
6375 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
6377 c42c9805 2020-11-24 stsp struct tog_view *log_view;
6378 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
6379 c42c9805 2020-11-24 stsp struct got_object_id *commit_id = NULL;
6381 c42c9805 2020-11-24 stsp *new_view = NULL;
6383 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
6384 c42c9805 2020-11-24 stsp if (err) {
6385 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
6386 c42c9805 2020-11-24 stsp return err;
6388 c42c9805 2020-11-24 stsp return NULL;
6391 6458efa5 2020-11-24 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
6392 6458efa5 2020-11-24 stsp if (log_view == NULL) {
6393 6458efa5 2020-11-24 stsp err = got_error_from_errno("view_open");
6394 6458efa5 2020-11-24 stsp goto done;
6397 ee756517 2020-12-05 stsp err = open_log_view(log_view, commit_id, repo,
6398 ee756517 2020-12-05 stsp got_ref_get_name(re->ref), "", 0);
6401 6458efa5 2020-11-24 stsp view_close(log_view);
6403 6458efa5 2020-11-24 stsp *new_view = log_view;
6404 c42c9805 2020-11-24 stsp free(commit_id);
6405 6458efa5 2020-11-24 stsp return err;
6408 ce5b7c56 2019-07-09 stsp static void
6409 3e135950 2020-12-01 naddy ref_scroll_up(struct tog_ref_view_state *s, int maxscroll)
6411 34ba6917 2020-11-30 stsp struct tog_reflist_entry *re;
6412 34ba6917 2020-11-30 stsp int i = 0;
6414 694d3271 2020-12-01 naddy if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
6417 694d3271 2020-12-01 naddy re = TAILQ_PREV(s->first_displayed_entry, tog_reflist_head, entry);
6418 34ba6917 2020-11-30 stsp while (i++ < maxscroll) {
6419 34ba6917 2020-11-30 stsp if (re == NULL)
6421 694d3271 2020-12-01 naddy s->first_displayed_entry = re;
6422 34ba6917 2020-11-30 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
6426 34ba6917 2020-11-30 stsp static void
6427 3e135950 2020-12-01 naddy ref_scroll_down(struct tog_ref_view_state *s, int maxscroll)
6429 6458efa5 2020-11-24 stsp struct tog_reflist_entry *next, *last;
6430 6458efa5 2020-11-24 stsp int n = 0;
6432 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
6433 694d3271 2020-12-01 naddy next = TAILQ_NEXT(s->first_displayed_entry, entry);
6435 694d3271 2020-12-01 naddy next = TAILQ_FIRST(&s->refs);
6437 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
6438 6458efa5 2020-11-24 stsp while (next && last && n++ < maxscroll) {
6439 6458efa5 2020-11-24 stsp last = TAILQ_NEXT(last, entry);
6440 6458efa5 2020-11-24 stsp if (last) {
6441 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
6442 6458efa5 2020-11-24 stsp next = TAILQ_NEXT(next, entry);
6447 6458efa5 2020-11-24 stsp static const struct got_error *
6448 6458efa5 2020-11-24 stsp search_start_ref_view(struct tog_view *view)
6450 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6452 6458efa5 2020-11-24 stsp s->matched_entry = NULL;
6453 6458efa5 2020-11-24 stsp return NULL;
6456 6458efa5 2020-11-24 stsp static int
6457 6458efa5 2020-11-24 stsp match_reflist_entry(struct tog_reflist_entry *re, regex_t *regex)
6459 6458efa5 2020-11-24 stsp regmatch_t regmatch;
6461 6458efa5 2020-11-24 stsp return regexec(regex, got_ref_get_name(re->ref), 1, ®match,
6465 6458efa5 2020-11-24 stsp static const struct got_error *
6466 6458efa5 2020-11-24 stsp search_next_ref_view(struct tog_view *view)
6468 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6469 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re = NULL;
6471 6458efa5 2020-11-24 stsp if (!view->searching) {
6472 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6473 6458efa5 2020-11-24 stsp return NULL;
6476 6458efa5 2020-11-24 stsp if (s->matched_entry) {
6477 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD) {
6478 6458efa5 2020-11-24 stsp if (s->selected_entry)
6479 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(s->selected_entry, entry);
6481 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
6482 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
6484 6458efa5 2020-11-24 stsp if (s->selected_entry == NULL)
6485 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
6487 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
6488 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
6491 487cd7d2 2021-12-17 stsp if (s->selected_entry)
6492 487cd7d2 2021-12-17 stsp re = s->selected_entry;
6493 487cd7d2 2021-12-17 stsp else if (view->searching == TOG_SEARCH_FORWARD)
6494 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
6496 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
6499 6458efa5 2020-11-24 stsp while (1) {
6500 6458efa5 2020-11-24 stsp if (re == NULL) {
6501 6458efa5 2020-11-24 stsp if (s->matched_entry == NULL) {
6502 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6503 6458efa5 2020-11-24 stsp return NULL;
6505 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
6506 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
6508 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
6511 6458efa5 2020-11-24 stsp if (match_reflist_entry(re, &view->regex)) {
6512 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
6513 6458efa5 2020-11-24 stsp s->matched_entry = re;
6517 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
6518 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
6520 6458efa5 2020-11-24 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
6523 6458efa5 2020-11-24 stsp if (s->matched_entry) {
6524 6458efa5 2020-11-24 stsp s->first_displayed_entry = s->matched_entry;
6525 6458efa5 2020-11-24 stsp s->selected = 0;
6528 6458efa5 2020-11-24 stsp return NULL;
6531 6458efa5 2020-11-24 stsp static const struct got_error *
6532 6458efa5 2020-11-24 stsp show_ref_view(struct tog_view *view)
6534 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
6535 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6536 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
6537 6458efa5 2020-11-24 stsp char *line = NULL;
6538 6458efa5 2020-11-24 stsp wchar_t *wline;
6539 6458efa5 2020-11-24 stsp struct tog_color *tc;
6540 6458efa5 2020-11-24 stsp int width, n;
6541 6458efa5 2020-11-24 stsp int limit = view->nlines;
6543 6458efa5 2020-11-24 stsp werase(view->window);
6545 6458efa5 2020-11-24 stsp s->ndisplayed = 0;
6547 6458efa5 2020-11-24 stsp if (limit == 0)
6548 6458efa5 2020-11-24 stsp return NULL;
6550 34ba6917 2020-11-30 stsp re = s->first_displayed_entry;
6552 6458efa5 2020-11-24 stsp if (asprintf(&line, "references [%d/%d]", re->idx + s->selected + 1,
6553 6458efa5 2020-11-24 stsp s->nrefs) == -1)
6554 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
6556 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
6557 6458efa5 2020-11-24 stsp if (err) {
6558 6458efa5 2020-11-24 stsp free(line);
6559 6458efa5 2020-11-24 stsp return err;
6561 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
6562 6458efa5 2020-11-24 stsp wstandout(view->window);
6563 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
6564 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
6565 6458efa5 2020-11-24 stsp wstandend(view->window);
6566 6458efa5 2020-11-24 stsp free(wline);
6567 6458efa5 2020-11-24 stsp wline = NULL;
6568 6458efa5 2020-11-24 stsp free(line);
6569 6458efa5 2020-11-24 stsp line = NULL;
6570 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
6571 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
6572 6458efa5 2020-11-24 stsp if (--limit <= 0)
6573 6458efa5 2020-11-24 stsp return NULL;
6576 6458efa5 2020-11-24 stsp while (re && limit > 0) {
6577 6458efa5 2020-11-24 stsp char *line = NULL;
6578 b4996bee 2022-06-16 stsp char ymd[13]; /* YYYY-MM-DD + " " + NUL */
6580 b4996bee 2022-06-16 stsp if (s->show_date) {
6581 b4996bee 2022-06-16 stsp struct got_commit_object *ci;
6582 b4996bee 2022-06-16 stsp struct got_tag_object *tag;
6583 b4996bee 2022-06-16 stsp struct got_object_id *id;
6584 b4996bee 2022-06-16 stsp struct tm tm;
6587 b4996bee 2022-06-16 stsp err = got_ref_resolve(&id, s->repo, re->ref);
6589 b4996bee 2022-06-16 stsp return err;
6590 b4996bee 2022-06-16 stsp err = got_object_open_as_tag(&tag, s->repo, id);
6591 b4996bee 2022-06-16 stsp if (err) {
6592 b4996bee 2022-06-16 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
6594 b4996bee 2022-06-16 stsp return err;
6596 b4996bee 2022-06-16 stsp err = got_object_open_as_commit(&ci, s->repo,
6598 b4996bee 2022-06-16 stsp if (err) {
6600 b4996bee 2022-06-16 stsp return err;
6602 b4996bee 2022-06-16 stsp t = got_object_commit_get_committer_time(ci);
6603 b4996bee 2022-06-16 stsp got_object_commit_close(ci);
6605 b4996bee 2022-06-16 stsp t = got_object_tag_get_tagger_time(tag);
6606 b4996bee 2022-06-16 stsp got_object_tag_close(tag);
6609 b4996bee 2022-06-16 stsp if (gmtime_r(&t, &tm) == NULL)
6610 b4996bee 2022-06-16 stsp return got_error_from_errno("gmtime_r");
6611 b4996bee 2022-06-16 stsp if (strftime(ymd, sizeof(ymd), "%G-%m-%d ", &tm) == 0)
6612 b4996bee 2022-06-16 stsp return got_error(GOT_ERR_NO_SPACE);
6614 6458efa5 2020-11-24 stsp if (got_ref_is_symbolic(re->ref)) {
6615 b4996bee 2022-06-16 stsp if (asprintf(&line, "%s%s -> %s", s->show_date ?
6616 b4996bee 2022-06-16 stsp ymd : "", got_ref_get_name(re->ref),
6617 6458efa5 2020-11-24 stsp got_ref_get_symref_target(re->ref)) == -1)
6618 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
6619 6458efa5 2020-11-24 stsp } else if (s->show_ids) {
6620 6458efa5 2020-11-24 stsp struct got_object_id *id;
6621 6458efa5 2020-11-24 stsp char *id_str;
6622 6458efa5 2020-11-24 stsp err = got_ref_resolve(&id, s->repo, re->ref);
6624 6458efa5 2020-11-24 stsp return err;
6625 6458efa5 2020-11-24 stsp err = got_object_id_str(&id_str, id);
6626 6458efa5 2020-11-24 stsp if (err) {
6628 6458efa5 2020-11-24 stsp return err;
6630 b4996bee 2022-06-16 stsp if (asprintf(&line, "%s%s: %s", s->show_date ? ymd : "",
6631 6458efa5 2020-11-24 stsp got_ref_get_name(re->ref), id_str) == -1) {
6632 6458efa5 2020-11-24 stsp err = got_error_from_errno("asprintf");
6634 6458efa5 2020-11-24 stsp free(id_str);
6635 6458efa5 2020-11-24 stsp return err;
6638 6458efa5 2020-11-24 stsp free(id_str);
6639 b4996bee 2022-06-16 stsp } else if (asprintf(&line, "%s%s", s->show_date ? ymd : "",
6640 b4996bee 2022-06-16 stsp got_ref_get_name(re->ref)) == -1)
6641 b4996bee 2022-06-16 stsp return got_error_from_errno("asprintf");
6643 ccda2f4d 2022-06-16 stsp err = format_line(&wline, &width, NULL, line, 0, view->ncols,
6645 6458efa5 2020-11-24 stsp if (err) {
6646 6458efa5 2020-11-24 stsp free(line);
6647 6458efa5 2020-11-24 stsp return err;
6649 6458efa5 2020-11-24 stsp if (n == s->selected) {
6650 6458efa5 2020-11-24 stsp if (view->focussed)
6651 6458efa5 2020-11-24 stsp wstandout(view->window);
6652 6458efa5 2020-11-24 stsp s->selected_entry = re;
6654 6458efa5 2020-11-24 stsp tc = match_color(&s->colors, got_ref_get_name(re->ref));
6656 6458efa5 2020-11-24 stsp wattr_on(view->window,
6657 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
6658 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
6660 6458efa5 2020-11-24 stsp wattr_off(view->window,
6661 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
6662 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
6663 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
6664 6458efa5 2020-11-24 stsp if (n == s->selected && view->focussed)
6665 6458efa5 2020-11-24 stsp wstandend(view->window);
6666 6458efa5 2020-11-24 stsp free(line);
6667 6458efa5 2020-11-24 stsp free(wline);
6668 6458efa5 2020-11-24 stsp wline = NULL;
6670 6458efa5 2020-11-24 stsp s->ndisplayed++;
6671 6458efa5 2020-11-24 stsp s->last_displayed_entry = re;
6674 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
6677 6458efa5 2020-11-24 stsp view_vborder(view);
6678 6458efa5 2020-11-24 stsp return err;
6681 6458efa5 2020-11-24 stsp static const struct got_error *
6682 c42c9805 2020-11-24 stsp browse_ref_tree(struct tog_view **new_view, int begin_x,
6683 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
6685 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
6686 bc573f3b 2021-07-10 stsp struct got_object_id *commit_id = NULL;
6687 c42c9805 2020-11-24 stsp struct tog_view *tree_view;
6689 c42c9805 2020-11-24 stsp *new_view = NULL;
6691 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
6692 c42c9805 2020-11-24 stsp if (err) {
6693 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
6694 c42c9805 2020-11-24 stsp return err;
6696 c42c9805 2020-11-24 stsp return NULL;
6700 c42c9805 2020-11-24 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
6701 c42c9805 2020-11-24 stsp if (tree_view == NULL) {
6702 c42c9805 2020-11-24 stsp err = got_error_from_errno("view_open");
6703 c42c9805 2020-11-24 stsp goto done;
6706 bc573f3b 2021-07-10 stsp err = open_tree_view(tree_view, commit_id,
6707 4e97c21c 2020-12-06 stsp got_ref_get_name(re->ref), repo);
6709 c42c9805 2020-11-24 stsp goto done;
6711 c42c9805 2020-11-24 stsp *new_view = tree_view;
6713 c42c9805 2020-11-24 stsp free(commit_id);
6714 c42c9805 2020-11-24 stsp return err;
6716 c42c9805 2020-11-24 stsp static const struct got_error *
6717 e78dc838 2020-12-04 stsp input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
6719 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
6720 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6721 c42c9805 2020-11-24 stsp struct tog_view *log_view, *tree_view;
6722 e4526bf5 2021-09-03 naddy struct tog_reflist_entry *re;
6723 83cc4199 2022-06-13 stsp int begin_x = 0, n, nscroll = view->nlines - 1;
6725 6458efa5 2020-11-24 stsp switch (ch) {
6727 6458efa5 2020-11-24 stsp s->show_ids = !s->show_ids;
6730 b4996bee 2022-06-16 stsp s->show_date = !s->show_date;
6733 7f66531d 2021-11-16 stsp s->sort_by_date = !s->sort_by_date;
6734 50617b77 2021-11-20 stsp err = got_reflist_sort(&tog_refs, s->sort_by_date ?
6735 50617b77 2021-11-20 stsp got_ref_cmp_by_commit_timestamp_descending :
6736 cc488aa7 2022-01-23 stsp tog_ref_cmp_by_name, s->repo);
6739 50617b77 2021-11-20 stsp got_reflist_object_id_map_free(tog_refs_idmap);
6740 50617b77 2021-11-20 stsp err = got_reflist_object_id_map_create(&tog_refs_idmap,
6741 50617b77 2021-11-20 stsp &tog_refs, s->repo);
6744 7f66531d 2021-11-16 stsp ref_view_free_refs(s);
6745 7f66531d 2021-11-16 stsp err = ref_view_load_refs(s);
6747 6458efa5 2020-11-24 stsp case KEY_ENTER:
6748 6458efa5 2020-11-24 stsp case '\r':
6749 6458efa5 2020-11-24 stsp if (!s->selected_entry)
6751 6458efa5 2020-11-24 stsp if (view_is_parent_view(view))
6752 6458efa5 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
6753 6458efa5 2020-11-24 stsp err = log_ref_entry(&log_view, begin_x, s->selected_entry,
6755 e78dc838 2020-12-04 stsp view->focussed = 0;
6756 e78dc838 2020-12-04 stsp log_view->focussed = 1;
6757 6458efa5 2020-11-24 stsp if (view_is_parent_view(view)) {
6758 6458efa5 2020-11-24 stsp err = view_close_child(view);
6760 6458efa5 2020-11-24 stsp return err;
6761 0dbbbe90 2022-06-17 op err = view_set_child(view, log_view);
6764 e78dc838 2020-12-04 stsp view->focus_child = 1;
6766 6458efa5 2020-11-24 stsp *new_view = log_view;
6769 c42c9805 2020-11-24 stsp if (!s->selected_entry)
6771 c42c9805 2020-11-24 stsp if (view_is_parent_view(view))
6772 c42c9805 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
6773 c42c9805 2020-11-24 stsp err = browse_ref_tree(&tree_view, begin_x, s->selected_entry,
6775 c42c9805 2020-11-24 stsp if (err || tree_view == NULL)
6777 e78dc838 2020-12-04 stsp view->focussed = 0;
6778 e78dc838 2020-12-04 stsp tree_view->focussed = 1;
6779 c42c9805 2020-11-24 stsp if (view_is_parent_view(view)) {
6780 c42c9805 2020-11-24 stsp err = view_close_child(view);
6782 c42c9805 2020-11-24 stsp return err;
6783 0dbbbe90 2022-06-17 op err = view_set_child(view, tree_view);
6786 e78dc838 2020-12-04 stsp view->focus_child = 1;
6788 c42c9805 2020-11-24 stsp *new_view = tree_view;
6790 e4526bf5 2021-09-03 naddy case 'g':
6791 e4526bf5 2021-09-03 naddy case KEY_HOME:
6792 e4526bf5 2021-09-03 naddy s->selected = 0;
6793 e4526bf5 2021-09-03 naddy s->first_displayed_entry = TAILQ_FIRST(&s->refs);
6795 e4526bf5 2021-09-03 naddy case 'G':
6796 e4526bf5 2021-09-03 naddy case KEY_END:
6797 e4526bf5 2021-09-03 naddy s->selected = 0;
6798 e4526bf5 2021-09-03 naddy re = TAILQ_LAST(&s->refs, tog_reflist_head);
6799 e4526bf5 2021-09-03 naddy for (n = 0; n < view->nlines - 1; n++) {
6800 e4526bf5 2021-09-03 naddy if (re == NULL)
6802 e4526bf5 2021-09-03 naddy s->first_displayed_entry = re;
6803 e4526bf5 2021-09-03 naddy re = TAILQ_PREV(re, tog_reflist_head, entry);
6805 e4526bf5 2021-09-03 naddy if (n > 0)
6806 e4526bf5 2021-09-03 naddy s->selected = n - 1;
6809 6458efa5 2020-11-24 stsp case KEY_UP:
6810 02ffd0d5 2021-10-17 stsp case CTRL('p'):
6811 6458efa5 2020-11-24 stsp if (s->selected > 0) {
6812 6458efa5 2020-11-24 stsp s->selected--;
6815 3e135950 2020-12-01 naddy ref_scroll_up(s, 1);
6817 83cc4199 2022-06-13 stsp case CTRL('u'):
6819 83cc4199 2022-06-13 stsp nscroll /= 2;
6820 83cc4199 2022-06-13 stsp /* FALL THROUGH */
6821 6458efa5 2020-11-24 stsp case KEY_PPAGE:
6822 6458efa5 2020-11-24 stsp case CTRL('b'):
6823 34ba6917 2020-11-30 stsp if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
6824 83cc4199 2022-06-13 stsp s->selected -= MIN(nscroll, s->selected);
6825 83cc4199 2022-06-13 stsp ref_scroll_up(s, MAX(0, nscroll));
6828 6458efa5 2020-11-24 stsp case KEY_DOWN:
6829 02ffd0d5 2021-10-17 stsp case CTRL('n'):
6830 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1) {
6831 6458efa5 2020-11-24 stsp s->selected++;
6834 6458efa5 2020-11-24 stsp if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL)
6835 6458efa5 2020-11-24 stsp /* can't scroll any further */
6837 3e135950 2020-12-01 naddy ref_scroll_down(s, 1);
6839 83cc4199 2022-06-13 stsp case CTRL('d'):
6841 83cc4199 2022-06-13 stsp nscroll /= 2;
6842 83cc4199 2022-06-13 stsp /* FALL THROUGH */
6843 6458efa5 2020-11-24 stsp case KEY_NPAGE:
6844 6458efa5 2020-11-24 stsp case CTRL('f'):
6845 6458efa5 2020-11-24 stsp if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL) {
6846 6458efa5 2020-11-24 stsp /* can't scroll any further; move cursor down */
6847 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1)
6848 83cc4199 2022-06-13 stsp s->selected += MIN(nscroll,
6849 83cc4199 2022-06-13 stsp s->ndisplayed - s->selected - 1);
6852 83cc4199 2022-06-13 stsp ref_scroll_down(s, nscroll);
6854 6458efa5 2020-11-24 stsp case CTRL('l'):
6855 8924d611 2020-12-26 stsp tog_free_refs();
6856 7f66531d 2021-11-16 stsp err = tog_load_refs(s->repo, s->sort_by_date);
6859 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
6860 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
6862 6458efa5 2020-11-24 stsp case KEY_RESIZE:
6863 8b5b8d0c 2020-12-06 stsp if (view->nlines >= 2 && s->selected >= view->nlines - 1)
6864 8b5b8d0c 2020-12-06 stsp s->selected = view->nlines - 2;
6870 6458efa5 2020-11-24 stsp return err;
6873 6458efa5 2020-11-24 stsp __dead static void
6874 6458efa5 2020-11-24 stsp usage_ref(void)
6877 6458efa5 2020-11-24 stsp fprintf(stderr, "usage: %s ref [-r repository-path]\n",
6878 6458efa5 2020-11-24 stsp getprogname());
6882 6458efa5 2020-11-24 stsp static const struct got_error *
6883 6458efa5 2020-11-24 stsp cmd_ref(int argc, char *argv[])
6885 6458efa5 2020-11-24 stsp const struct got_error *error;
6886 6458efa5 2020-11-24 stsp struct got_repository *repo = NULL;
6887 6458efa5 2020-11-24 stsp struct got_worktree *worktree = NULL;
6888 6458efa5 2020-11-24 stsp char *cwd = NULL, *repo_path = NULL;
6890 6458efa5 2020-11-24 stsp struct tog_view *view;
6891 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
6893 6458efa5 2020-11-24 stsp while ((ch = getopt(argc, argv, "r:")) != -1) {
6894 6458efa5 2020-11-24 stsp switch (ch) {
6896 6458efa5 2020-11-24 stsp repo_path = realpath(optarg, NULL);
6897 6458efa5 2020-11-24 stsp if (repo_path == NULL)
6898 6458efa5 2020-11-24 stsp return got_error_from_errno2("realpath",
6902 e99e2d15 2020-11-24 naddy usage_ref();
6903 6458efa5 2020-11-24 stsp /* NOTREACHED */
6907 6458efa5 2020-11-24 stsp argc -= optind;
6908 6458efa5 2020-11-24 stsp argv += optind;
6910 6458efa5 2020-11-24 stsp if (argc > 1)
6911 e99e2d15 2020-11-24 naddy usage_ref();
6913 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
6914 0ae84acc 2022-06-15 tracey if (error != NULL)
6915 0ae84acc 2022-06-15 tracey goto done;
6917 6458efa5 2020-11-24 stsp if (repo_path == NULL) {
6918 c156c7a4 2020-12-18 stsp cwd = getcwd(NULL, 0);
6919 c156c7a4 2020-12-18 stsp if (cwd == NULL)
6920 c156c7a4 2020-12-18 stsp return got_error_from_errno("getcwd");
6921 c156c7a4 2020-12-18 stsp error = got_worktree_open(&worktree, cwd);
6922 c156c7a4 2020-12-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6923 c156c7a4 2020-12-18 stsp goto done;
6924 6458efa5 2020-11-24 stsp if (worktree)
6925 6458efa5 2020-11-24 stsp repo_path =
6926 6458efa5 2020-11-24 stsp strdup(got_worktree_get_repo_path(worktree));
6928 6458efa5 2020-11-24 stsp repo_path = strdup(cwd);
6929 c156c7a4 2020-12-18 stsp if (repo_path == NULL) {
6930 c156c7a4 2020-12-18 stsp error = got_error_from_errno("strdup");
6931 c156c7a4 2020-12-18 stsp goto done;
6935 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6936 6458efa5 2020-11-24 stsp if (error != NULL)
6937 6458efa5 2020-11-24 stsp goto done;
6939 6458efa5 2020-11-24 stsp init_curses();
6941 6458efa5 2020-11-24 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
6942 51a10b52 2020-12-26 stsp if (error)
6943 51a10b52 2020-12-26 stsp goto done;
6945 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
6946 6458efa5 2020-11-24 stsp if (error)
6947 6458efa5 2020-11-24 stsp goto done;
6949 6458efa5 2020-11-24 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_REF);
6950 6458efa5 2020-11-24 stsp if (view == NULL) {
6951 6458efa5 2020-11-24 stsp error = got_error_from_errno("view_open");
6952 6458efa5 2020-11-24 stsp goto done;
6955 6458efa5 2020-11-24 stsp error = open_ref_view(view, repo);
6956 6458efa5 2020-11-24 stsp if (error)
6957 6458efa5 2020-11-24 stsp goto done;
6959 6458efa5 2020-11-24 stsp if (worktree) {
6960 6458efa5 2020-11-24 stsp /* Release work tree lock. */
6961 6458efa5 2020-11-24 stsp got_worktree_close(worktree);
6962 6458efa5 2020-11-24 stsp worktree = NULL;
6964 6458efa5 2020-11-24 stsp error = view_loop(view);
6966 6458efa5 2020-11-24 stsp free(repo_path);
6967 6458efa5 2020-11-24 stsp free(cwd);
6968 1d0f4054 2021-06-17 stsp if (repo) {
6969 1d0f4054 2021-06-17 stsp const struct got_error *close_err = got_repo_close(repo);
6970 1d0f4054 2021-06-17 stsp if (close_err)
6971 1d0f4054 2021-06-17 stsp error = close_err;
6973 0ae84acc 2022-06-15 tracey if (pack_fds) {
6974 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
6975 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
6976 0ae84acc 2022-06-15 tracey if (error == NULL)
6977 0ae84acc 2022-06-15 tracey error = pack_err;
6979 51a10b52 2020-12-26 stsp tog_free_refs();
6980 6458efa5 2020-11-24 stsp return error;
6983 6458efa5 2020-11-24 stsp static void
6984 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
6988 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
6989 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
6990 3e166534 2022-02-16 naddy const struct tog_cmd *cmd = &tog_commands[i];
6991 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->name);
6993 6879ba42 2020-10-01 naddy fputc('\n', fp);
6996 4ed7e80c 2018-05-20 stsp __dead static void
6997 6879ba42 2020-10-01 naddy usage(int hflag, int status)
6999 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
7001 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
7002 6879ba42 2020-10-01 naddy getprogname());
7003 6879ba42 2020-10-01 naddy if (hflag) {
7004 6879ba42 2020-10-01 naddy fprintf(fp, "lazy usage: %s path\n", getprogname());
7005 6879ba42 2020-10-01 naddy list_commands(fp);
7007 6879ba42 2020-10-01 naddy exit(status);
7010 c2301be8 2018-04-30 stsp static char **
7011 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
7013 ee85c5e8 2020-02-29 stsp va_list ap;
7014 c2301be8 2018-04-30 stsp char **argv;
7017 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
7019 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
7020 c2301be8 2018-04-30 stsp if (argv == NULL)
7021 c2301be8 2018-04-30 stsp err(1, "calloc");
7022 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
7023 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
7024 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
7025 e10c916e 2019-09-15 hiltjo err(1, "strdup");
7028 ee85c5e8 2020-02-29 stsp va_end(ap);
7029 c2301be8 2018-04-30 stsp return argv;
7033 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
7034 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
7035 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
7036 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
7037 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
7039 ee85c5e8 2020-02-29 stsp static const struct got_error *
7040 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
7042 1d0f4054 2021-06-17 stsp const struct got_error *error = NULL, *close_err;
7043 3e166534 2022-02-16 naddy const struct tog_cmd *cmd = NULL;
7044 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
7045 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
7046 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
7047 a44927cc 2022-04-07 stsp struct got_commit_object *commit = NULL;
7048 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
7049 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
7050 0ae84acc 2022-06-15 tracey int *pack_fds = NULL;
7052 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
7053 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
7054 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
7056 0ae84acc 2022-06-15 tracey error = got_repo_pack_fds_open(&pack_fds);
7057 0ae84acc 2022-06-15 tracey if (error != NULL)
7058 0ae84acc 2022-06-15 tracey goto done;
7060 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
7061 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
7062 ee85c5e8 2020-02-29 stsp goto done;
7064 ee85c5e8 2020-02-29 stsp if (worktree)
7065 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
7067 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
7068 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
7069 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
7070 ee85c5e8 2020-02-29 stsp goto done;
7073 0ae84acc 2022-06-15 tracey error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7074 ee85c5e8 2020-02-29 stsp if (error != NULL)
7075 ee85c5e8 2020-02-29 stsp goto done;
7077 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
7078 ee85c5e8 2020-02-29 stsp repo, worktree);
7079 ee85c5e8 2020-02-29 stsp if (error)
7080 ee85c5e8 2020-02-29 stsp goto done;
7082 7f66531d 2021-11-16 stsp error = tog_load_refs(repo, 0);
7083 84de9106 2020-12-26 stsp if (error)
7084 84de9106 2020-12-26 stsp goto done;
7085 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
7086 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
7087 87670572 2020-12-26 naddy GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
7088 ee85c5e8 2020-02-29 stsp if (error)
7089 ee85c5e8 2020-02-29 stsp goto done;
7091 ee85c5e8 2020-02-29 stsp if (worktree) {
7092 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
7093 ee85c5e8 2020-02-29 stsp worktree = NULL;
7096 a44927cc 2022-04-07 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
7097 a44927cc 2022-04-07 stsp if (error)
7098 a44927cc 2022-04-07 stsp goto done;
7100 a44927cc 2022-04-07 stsp error = got_object_id_by_path(&id, repo, commit, in_repo_path);
7101 ee85c5e8 2020-02-29 stsp if (error) {
7102 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
7103 ee85c5e8 2020-02-29 stsp goto done;
7104 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
7105 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
7106 6879ba42 2020-10-01 naddy usage(1, 1);
7107 ee85c5e8 2020-02-29 stsp /* not reached */
7110 1d0f4054 2021-06-17 stsp close_err = got_repo_close(repo);
7111 1d0f4054 2021-06-17 stsp if (error == NULL)
7112 1d0f4054 2021-06-17 stsp error = close_err;
7113 ee85c5e8 2020-02-29 stsp repo = NULL;
7115 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
7116 ee85c5e8 2020-02-29 stsp if (error)
7117 ee85c5e8 2020-02-29 stsp goto done;
7119 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
7121 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
7122 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
7124 1d0f4054 2021-06-17 stsp if (repo) {
7125 1d0f4054 2021-06-17 stsp close_err = got_repo_close(repo);
7126 1d0f4054 2021-06-17 stsp if (error == NULL)
7127 1d0f4054 2021-06-17 stsp error = close_err;
7129 a44927cc 2022-04-07 stsp if (commit)
7130 a44927cc 2022-04-07 stsp got_object_commit_close(commit);
7131 ee85c5e8 2020-02-29 stsp if (worktree)
7132 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
7133 0ae84acc 2022-06-15 tracey if (pack_fds) {
7134 0ae84acc 2022-06-15 tracey const struct got_error *pack_err =
7135 0ae84acc 2022-06-15 tracey got_repo_pack_fds_close(pack_fds);
7136 0ae84acc 2022-06-15 tracey if (error == NULL)
7137 0ae84acc 2022-06-15 tracey error = pack_err;
7140 ee85c5e8 2020-02-29 stsp free(commit_id_str);
7141 ee85c5e8 2020-02-29 stsp free(commit_id);
7142 ee85c5e8 2020-02-29 stsp free(cwd);
7143 ee85c5e8 2020-02-29 stsp free(repo_path);
7144 ee85c5e8 2020-02-29 stsp free(in_repo_path);
7145 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
7147 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
7148 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
7149 ee85c5e8 2020-02-29 stsp free(cmd_argv);
7151 87670572 2020-12-26 naddy tog_free_refs();
7152 ee85c5e8 2020-02-29 stsp return error;
7156 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
7158 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
7159 3e166534 2022-02-16 naddy const struct tog_cmd *cmd = NULL;
7160 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
7161 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
7162 3e166534 2022-02-16 naddy static const struct option longopts[] = {
7163 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
7164 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0}
7167 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
7169 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
7170 9f7d7167 2018-04-29 stsp switch (ch) {
7172 9f7d7167 2018-04-29 stsp hflag = 1;
7175 53ccebc2 2019-07-30 stsp Vflag = 1;
7178 6879ba42 2020-10-01 naddy usage(hflag, 1);
7179 9f7d7167 2018-04-29 stsp /* NOTREACHED */
7183 9f7d7167 2018-04-29 stsp argc -= optind;
7184 9f7d7167 2018-04-29 stsp argv += optind;
7185 9814e6a3 2020-09-27 naddy optind = 1;
7186 c2301be8 2018-04-30 stsp optreset = 1;
7188 53ccebc2 2019-07-30 stsp if (Vflag) {
7189 53ccebc2 2019-07-30 stsp got_version_print_str();
7190 6879ba42 2020-10-01 naddy return 0;
7193 4010e238 2020-12-04 stsp #ifndef PROFILE
7194 4010e238 2020-12-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
7195 4010e238 2020-12-04 stsp NULL) == -1)
7196 4010e238 2020-12-04 stsp err(1, "pledge");
7199 c2301be8 2018-04-30 stsp if (argc == 0) {
7200 f29d3e89 2018-06-23 stsp if (hflag)
7201 6879ba42 2020-10-01 naddy usage(hflag, 0);
7202 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
7203 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
7205 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
7209 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
7210 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
7211 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
7212 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
7213 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
7219 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
7220 ee85c5e8 2020-02-29 stsp if (argc != 1)
7221 6879ba42 2020-10-01 naddy usage(0, 1);
7222 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
7223 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
7225 ee85c5e8 2020-02-29 stsp if (hflag)
7226 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
7228 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
7232 b46c1e04 2020-09-20 naddy putchar('\n');
7233 a2f4a359 2020-02-28 stsp if (cmd_argv) {
7235 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
7236 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
7237 a2f4a359 2020-02-28 stsp free(cmd_argv);
7240 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
7241 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
