2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 9f7d7167 2018-04-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 9f7d7167 2018-04-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 9f7d7167 2018-04-29 stsp * copyright notice and this permission notice appear in all copies.
8 9f7d7167 2018-04-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 9f7d7167 2018-04-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 9f7d7167 2018-04-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 9f7d7167 2018-04-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 9f7d7167 2018-04-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 9f7d7167 2018-04-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 9f7d7167 2018-04-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 80ddbec8 2018-04-29 stsp #include <sys/queue.h>
18 ffd1d5e5 2018-06-23 stsp #include <sys/stat.h>
19 25791caa 2018-10-24 stsp #include <sys/ioctl.h>
21 0d6c6ee3 2020-05-20 stsp #include <ctype.h>
22 31120ada 2018-04-30 stsp #include <errno.h>
23 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
24 9f7d7167 2018-04-29 stsp #include <curses.h>
25 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
26 9f7d7167 2018-04-29 stsp #include <panel.h>
27 9f7d7167 2018-04-29 stsp #include <locale.h>
28 61266923 2020-01-14 stsp #include <signal.h>
29 9f7d7167 2018-04-29 stsp #include <stdlib.h>
30 ee85c5e8 2020-02-29 stsp #include <stdarg.h>
31 26ed57b2 2018-05-19 stsp #include <stdio.h>
32 9f7d7167 2018-04-29 stsp #include <getopt.h>
33 9f7d7167 2018-04-29 stsp #include <string.h>
34 9f7d7167 2018-04-29 stsp #include <err.h>
35 80ddbec8 2018-04-29 stsp #include <unistd.h>
36 26ed57b2 2018-05-19 stsp #include <util.h>
37 26ed57b2 2018-05-19 stsp #include <limits.h>
38 61e69b96 2018-05-20 stsp #include <wchar.h>
39 788c352e 2018-06-16 stsp #include <time.h>
40 84451b3e 2018-07-10 stsp #include <pthread.h>
41 5036bf37 2018-09-24 stsp #include <libgen.h>
42 60493ae3 2019-06-20 stsp #include <regex.h>
44 53ccebc2 2019-07-30 stsp #include "got_version.h"
45 9f7d7167 2018-04-29 stsp #include "got_error.h"
46 80ddbec8 2018-04-29 stsp #include "got_object.h"
47 80ddbec8 2018-04-29 stsp #include "got_reference.h"
48 80ddbec8 2018-04-29 stsp #include "got_repository.h"
49 80ddbec8 2018-04-29 stsp #include "got_diff.h"
50 511a516b 2018-05-19 stsp #include "got_opentemp.h"
51 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
52 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
53 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
54 a70480e0 2018-06-23 stsp #include "got_blame.h"
55 c2db6724 2019-01-04 stsp #include "got_privsep.h"
56 1dd54920 2019-05-11 stsp #include "got_path.h"
57 b7165be3 2019-02-05 stsp #include "got_worktree.h"
60 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
67 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
69 9f7d7167 2018-04-29 stsp #ifndef nitems
70 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
73 9f7d7167 2018-04-29 stsp struct tog_cmd {
74 c2301be8 2018-04-30 stsp const char *name;
75 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
76 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
79 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
83 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
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 4ed7e80c 2018-05-20 stsp static 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 f26dddb7 2019-11-08 stsp SIMPLEQ_ENTRY(tog_color) entry;
124 6d17833f 2019-11-08 stsp regex_t regex;
125 6d17833f 2019-11-08 stsp short colorpair;
127 f26dddb7 2019-11-08 stsp SIMPLEQ_HEAD(tog_colors, tog_color);
129 11b20872 2019-11-08 stsp static const struct got_error *
130 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
131 11b20872 2019-11-08 stsp int idx, short color)
133 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
134 11b20872 2019-11-08 stsp struct tog_color *tc;
135 11b20872 2019-11-08 stsp int regerr = 0;
137 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
138 11b20872 2019-11-08 stsp return NULL;
140 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
142 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
143 11b20872 2019-11-08 stsp if (tc == NULL)
144 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
145 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
146 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
147 11b20872 2019-11-08 stsp if (regerr) {
148 11b20872 2019-11-08 stsp static char regerr_msg[512];
149 11b20872 2019-11-08 stsp static char err_msg[512];
150 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
151 11b20872 2019-11-08 stsp sizeof(regerr_msg));
152 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
153 11b20872 2019-11-08 stsp regerr_msg);
154 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
156 11b20872 2019-11-08 stsp return err;
158 11b20872 2019-11-08 stsp tc->colorpair = idx;
159 11b20872 2019-11-08 stsp SIMPLEQ_INSERT_HEAD(colors, tc, entry);
160 11b20872 2019-11-08 stsp return NULL;
163 11b20872 2019-11-08 stsp static void
164 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
166 11b20872 2019-11-08 stsp struct tog_color *tc;
168 11b20872 2019-11-08 stsp while (!SIMPLEQ_EMPTY(colors)) {
169 11b20872 2019-11-08 stsp tc = SIMPLEQ_FIRST(colors);
170 11b20872 2019-11-08 stsp SIMPLEQ_REMOVE_HEAD(colors, entry);
171 11b20872 2019-11-08 stsp regfree(&tc->regex);
176 11b20872 2019-11-08 stsp struct tog_color *
177 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
179 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
181 11b20872 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
182 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
186 11b20872 2019-11-08 stsp return NULL;
190 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
192 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
193 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
194 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
195 11b20872 2019-11-08 stsp return COLOR_CYAN;
196 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
197 11b20872 2019-11-08 stsp return COLOR_YELLOW;
198 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
199 11b20872 2019-11-08 stsp return COLOR_GREEN;
200 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
201 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
202 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
203 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
204 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
205 91b8c405 2020-01-25 stsp return COLOR_CYAN;
206 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
207 11b20872 2019-11-08 stsp return COLOR_GREEN;
208 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
209 11b20872 2019-11-08 stsp return COLOR_GREEN;
210 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
211 11b20872 2019-11-08 stsp return COLOR_CYAN;
212 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
213 11b20872 2019-11-08 stsp return COLOR_YELLOW;
214 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_HEADS") == 0)
215 6458efa5 2020-11-24 stsp return COLOR_GREEN;
216 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_TAGS") == 0)
217 6458efa5 2020-11-24 stsp return COLOR_MAGENTA;
218 6458efa5 2020-11-24 stsp if (strcmp(envvar, "TOG_COLOR_REFS_REMOTES") == 0)
219 6458efa5 2020-11-24 stsp return COLOR_YELLOW;
225 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
227 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
229 11b20872 2019-11-08 stsp if (val == NULL)
230 11b20872 2019-11-08 stsp return default_color_value(envvar);
232 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
233 11b20872 2019-11-08 stsp return COLOR_BLACK;
234 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
235 11b20872 2019-11-08 stsp return COLOR_RED;
236 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
237 11b20872 2019-11-08 stsp return COLOR_GREEN;
238 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
239 11b20872 2019-11-08 stsp return COLOR_YELLOW;
240 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
241 11b20872 2019-11-08 stsp return COLOR_BLUE;
242 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
243 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
244 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
245 11b20872 2019-11-08 stsp return COLOR_CYAN;
246 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
247 11b20872 2019-11-08 stsp return COLOR_WHITE;
248 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
251 11b20872 2019-11-08 stsp return default_color_value(envvar);
255 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
256 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
257 3dbaef42 2020-11-24 stsp const char *label1, *label2;
259 15a087fe 2019-02-21 stsp int first_displayed_line;
260 15a087fe 2019-02-21 stsp int last_displayed_line;
262 15a087fe 2019-02-21 stsp int diff_context;
263 3dbaef42 2020-11-24 stsp int ignore_whitespace;
264 64453f7e 2020-11-21 stsp int force_text_diff;
265 15a087fe 2019-02-21 stsp struct got_repository *repo;
266 78756c87 2020-11-24 stsp struct got_reflist_head refs;
267 bddb1296 2019-11-08 stsp struct tog_colors colors;
268 fe621944 2020-11-10 stsp size_t nlines;
269 f44b1f58 2020-02-02 tracey off_t *line_offsets;
270 f44b1f58 2020-02-02 tracey int matched_line;
271 f44b1f58 2020-02-02 tracey int selected_line;
273 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
274 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
277 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
279 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
280 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
281 7c1452c1 2020-03-26 stsp pthread_cond_t commit_loaded;
282 1a76625f 2018-10-22 stsp int commits_needed;
283 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
284 1a76625f 2018-10-22 stsp struct commit_queue *commits;
285 1a76625f 2018-10-22 stsp const char *in_repo_path;
286 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
287 1a76625f 2018-10-22 stsp struct got_repository *repo;
288 1a76625f 2018-10-22 stsp int log_complete;
289 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
290 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
291 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
292 13add988 2019-10-15 stsp int *searching;
293 13add988 2019-10-15 stsp int *search_next_done;
294 13add988 2019-10-15 stsp regex_t *regex;
297 1a76625f 2018-10-22 stsp struct tog_log_view_state {
298 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
299 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
300 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
301 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
302 b01e7d3b 2018-08-04 stsp int selected;
303 b01e7d3b 2018-08-04 stsp char *in_repo_path;
304 d01904d4 2019-06-25 stsp const char *head_ref_name;
305 b672a97a 2020-01-27 stsp int log_branches;
306 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
307 78756c87 2020-11-24 stsp struct got_reflist_head refs;
308 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
309 1a76625f 2018-10-22 stsp sig_atomic_t quit;
310 1a76625f 2018-10-22 stsp pthread_t thread;
311 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
312 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
313 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
314 11b20872 2019-11-08 stsp struct tog_colors colors;
317 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
318 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
319 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
320 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
321 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
322 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
323 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
324 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
325 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
326 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
327 11b20872 2019-11-08 stsp #define TOG_COLOR_DATE 11
328 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_HEADS 12
329 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_TAGS 13
330 6458efa5 2020-11-24 stsp #define TOG_COLOR_REFS_REMOTES 14
332 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
333 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
334 e9424729 2018-08-04 stsp int nlines;
336 e9424729 2018-08-04 stsp struct tog_view *view;
337 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
341 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
342 e9424729 2018-08-04 stsp const char *path;
343 e9424729 2018-08-04 stsp struct got_repository *repo;
344 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
345 e9424729 2018-08-04 stsp int *complete;
346 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
347 fc06ba56 2019-08-22 stsp void *cancel_arg;
350 e9424729 2018-08-04 stsp struct tog_blame {
352 be659d10 2020-11-18 stsp off_t filesize;
353 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
354 6fcac457 2018-11-19 stsp int nlines;
355 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
356 e9424729 2018-08-04 stsp pthread_t thread;
357 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
358 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
359 e9424729 2018-08-04 stsp const char *path;
362 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
363 7cbe629d 2018-08-04 stsp int first_displayed_line;
364 7cbe629d 2018-08-04 stsp int last_displayed_line;
365 7cbe629d 2018-08-04 stsp int selected_line;
366 7cbe629d 2018-08-04 stsp int blame_complete;
369 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
370 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
371 e5a0f69f 2018-08-18 stsp char *path;
372 7cbe629d 2018-08-04 stsp struct got_repository *repo;
373 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
374 e9424729 2018-08-04 stsp struct tog_blame blame;
375 6c4c42e0 2019-06-24 stsp int matched_line;
376 11b20872 2019-11-08 stsp struct tog_colors colors;
379 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
380 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
381 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
382 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
383 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
384 ad80ab7b 2018-08-04 stsp int selected;
387 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
389 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
390 ad80ab7b 2018-08-04 stsp char *tree_label;
391 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
392 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
393 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
394 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
395 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
396 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
397 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
398 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
399 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
400 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
401 6458efa5 2020-11-24 stsp struct tog_colors colors;
404 6458efa5 2020-11-24 stsp struct tog_reflist_entry {
405 6458efa5 2020-11-24 stsp TAILQ_ENTRY(tog_reflist_entry) entry;
406 6458efa5 2020-11-24 stsp struct got_reference *ref;
410 6458efa5 2020-11-24 stsp TAILQ_HEAD(tog_reflist_head, tog_reflist_entry);
412 6458efa5 2020-11-24 stsp struct tog_ref_view_state {
413 6458efa5 2020-11-24 stsp struct got_reflist_head simplerefs; /* SIMPLEQ */
414 6458efa5 2020-11-24 stsp struct tog_reflist_head refs; /* TAILQ */
415 6458efa5 2020-11-24 stsp struct tog_reflist_entry *first_displayed_entry;
416 6458efa5 2020-11-24 stsp struct tog_reflist_entry *last_displayed_entry;
417 6458efa5 2020-11-24 stsp struct tog_reflist_entry *selected_entry;
418 6458efa5 2020-11-24 stsp int nrefs, ndisplayed, selected, show_ids;
419 6458efa5 2020-11-24 stsp struct got_repository *repo;
420 6458efa5 2020-11-24 stsp struct tog_reflist_entry *matched_entry;
421 bddb1296 2019-11-08 stsp struct tog_colors colors;
425 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
427 e78dc838 2020-12-04 stsp * The 'Tab' key switches focus between a parent view and its child view.
428 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
429 669b5ffa 2018-10-07 stsp * there is enough screen estate.
431 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
432 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
434 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
435 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
436 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
438 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
439 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
441 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
443 cc3c9aac 2018-08-01 stsp struct tog_view {
444 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
445 26ed57b2 2018-05-19 stsp WINDOW *window;
446 26ed57b2 2018-05-19 stsp PANEL *panel;
447 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
448 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
449 e78dc838 2020-12-04 stsp int focussed; /* Only set on one parent or child view at a time. */
451 669b5ffa 2018-10-07 stsp struct tog_view *parent;
452 669b5ffa 2018-10-07 stsp struct tog_view *child;
455 e78dc838 2020-12-04 stsp * This flag is initially set on parent views when a new child view
456 e78dc838 2020-12-04 stsp * is created. It gets toggled when the 'Tab' key switches focus
457 e78dc838 2020-12-04 stsp * between parent and child.
458 e78dc838 2020-12-04 stsp * The flag indicates whether focus should be passed on to our child
459 e78dc838 2020-12-04 stsp * view if this parent view gets picked for focus after another parent
460 e78dc838 2020-12-04 stsp * view was closed. This prevents child views from losing focus in such
461 e78dc838 2020-12-04 stsp * situations.
463 e78dc838 2020-12-04 stsp int focus_child;
465 5dc9f4bc 2018-08-04 stsp /* type-specific state */
466 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
468 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
469 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
470 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
471 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
472 6458efa5 2020-11-24 stsp struct tog_ref_view_state ref;
475 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
476 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
477 e78dc838 2020-12-04 stsp struct tog_view *, int);
478 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
480 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
481 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
482 60493ae3 2019-06-20 stsp int searching;
483 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
484 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
485 60493ae3 2019-06-20 stsp int search_next_done;
486 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_HAVE_MORE 1
487 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_NO_MORE 2
488 f9967bca 2020-03-27 stsp #define TOG_SEARCH_HAVE_NONE 3
489 1803e47f 2019-06-22 stsp regex_t regex;
490 41605754 2020-11-12 stsp regmatch_t regmatch;
493 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
494 3dbaef42 2020-11-24 stsp struct got_object_id *, struct got_object_id *,
495 3dbaef42 2020-11-24 stsp const char *, const char *, int, int, int, struct tog_view *,
496 78756c87 2020-11-24 stsp struct got_repository *);
497 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
498 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
499 e78dc838 2020-12-04 stsp struct tog_view *, int);
500 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
501 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
502 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
504 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
505 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *,
506 78756c87 2020-11-24 stsp const char *, const char *, int);
507 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
508 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
509 e78dc838 2020-12-04 stsp struct tog_view *, int);
510 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
511 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
512 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
514 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
515 78756c87 2020-11-24 stsp struct got_object_id *, struct got_repository *);
516 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
517 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
518 e78dc838 2020-12-04 stsp struct tog_view *, int);
519 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
520 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
521 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
523 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
524 78756c87 2020-11-24 stsp struct got_tree_object *, struct got_object_id *, struct got_repository *);
525 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
526 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
527 e78dc838 2020-12-04 stsp struct tog_view *, int);
528 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
529 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
530 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
532 6458efa5 2020-11-24 stsp static const struct got_error *open_ref_view(struct tog_view *,
533 6458efa5 2020-11-24 stsp struct got_repository *);
534 6458efa5 2020-11-24 stsp static const struct got_error *show_ref_view(struct tog_view *);
535 6458efa5 2020-11-24 stsp static const struct got_error *input_ref_view(struct tog_view **,
536 e78dc838 2020-12-04 stsp struct tog_view *, int);
537 6458efa5 2020-11-24 stsp static const struct got_error *close_ref_view(struct tog_view *);
538 6458efa5 2020-11-24 stsp static const struct got_error *search_start_ref_view(struct tog_view *);
539 6458efa5 2020-11-24 stsp static const struct got_error *search_next_ref_view(struct tog_view *);
541 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
542 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
543 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
545 25791caa 2018-10-24 stsp static void
546 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
548 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
551 83baff54 2019-08-12 stsp static void
552 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
554 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
557 61266923 2020-01-14 stsp static void
558 61266923 2020-01-14 stsp tog_sigcont(int signo)
560 61266923 2020-01-14 stsp tog_sigcont_received = 1;
563 e5a0f69f 2018-08-18 stsp static const struct got_error *
564 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
566 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
568 669b5ffa 2018-10-07 stsp if (view->child) {
569 669b5ffa 2018-10-07 stsp view_close(view->child);
570 669b5ffa 2018-10-07 stsp view->child = NULL;
572 e5a0f69f 2018-08-18 stsp if (view->close)
573 e5a0f69f 2018-08-18 stsp err = view->close(view);
574 ea5e7bb5 2018-08-01 stsp if (view->panel)
575 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
576 ea5e7bb5 2018-08-01 stsp if (view->window)
577 ea5e7bb5 2018-08-01 stsp delwin(view->window);
578 ea5e7bb5 2018-08-01 stsp free(view);
579 e5a0f69f 2018-08-18 stsp return err;
582 ea5e7bb5 2018-08-01 stsp static struct tog_view *
583 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
584 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
586 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
588 ea5e7bb5 2018-08-01 stsp if (view == NULL)
589 ea5e7bb5 2018-08-01 stsp return NULL;
591 d6b05b5b 2018-08-04 stsp view->type = type;
592 f7d12f7e 2018-08-01 stsp view->lines = LINES;
593 f7d12f7e 2018-08-01 stsp view->cols = COLS;
594 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
595 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
596 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
597 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
598 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
599 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
600 96a765a8 2018-08-04 stsp view_close(view);
601 ea5e7bb5 2018-08-01 stsp return NULL;
603 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
604 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
605 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
606 96a765a8 2018-08-04 stsp view_close(view);
607 ea5e7bb5 2018-08-01 stsp return NULL;
610 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
611 ea5e7bb5 2018-08-01 stsp return view;
615 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
617 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
619 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
622 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
624 5c60c32a 2018-10-18 stsp static const struct got_error *
625 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
627 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
629 5c60c32a 2018-10-18 stsp view->begin_y = 0;
630 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
631 5c60c32a 2018-10-18 stsp view->nlines = LINES;
632 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
633 5c60c32a 2018-10-18 stsp view->lines = LINES;
634 5c60c32a 2018-10-18 stsp view->cols = COLS;
635 5c60c32a 2018-10-18 stsp err = view_resize(view);
637 5c60c32a 2018-10-18 stsp return err;
639 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
640 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
642 5c60c32a 2018-10-18 stsp return NULL;
645 5c60c32a 2018-10-18 stsp static const struct got_error *
646 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
648 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
650 5c60c32a 2018-10-18 stsp view->begin_x = 0;
651 5c60c32a 2018-10-18 stsp view->begin_y = 0;
652 5c60c32a 2018-10-18 stsp view->nlines = LINES;
653 5c60c32a 2018-10-18 stsp view->ncols = COLS;
654 5c60c32a 2018-10-18 stsp view->lines = LINES;
655 5c60c32a 2018-10-18 stsp view->cols = COLS;
656 5c60c32a 2018-10-18 stsp err = view_resize(view);
658 5c60c32a 2018-10-18 stsp return err;
660 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
661 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
663 5c60c32a 2018-10-18 stsp return NULL;
667 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
669 5c60c32a 2018-10-18 stsp return view->parent == NULL;
672 4d8c2215 2018-08-19 stsp static const struct got_error *
673 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
675 f7d12f7e 2018-08-01 stsp int nlines, ncols;
677 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
678 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
680 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
682 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
683 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
685 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
687 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
688 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
689 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
690 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
691 25791caa 2018-10-24 stsp wclear(view->window);
693 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
694 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
695 0cf4efb1 2018-09-29 stsp view->lines = LINES;
696 0cf4efb1 2018-09-29 stsp view->cols = COLS;
698 6e3e5d9c 2018-10-18 stsp if (view->child) {
699 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
700 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
701 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
702 5c60c32a 2018-10-18 stsp if (view->child->focussed)
703 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
705 5c60c32a 2018-10-18 stsp show_panel(view->panel);
707 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
708 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
712 5c60c32a 2018-10-18 stsp return NULL;
715 669b5ffa 2018-10-07 stsp static const struct got_error *
716 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
718 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
720 669b5ffa 2018-10-07 stsp if (view->child == NULL)
721 669b5ffa 2018-10-07 stsp return NULL;
723 669b5ffa 2018-10-07 stsp err = view_close(view->child);
724 669b5ffa 2018-10-07 stsp view->child = NULL;
725 669b5ffa 2018-10-07 stsp return err;
728 72a9cb46 2020-12-03 stsp static void
729 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
731 669b5ffa 2018-10-07 stsp view->child = child;
732 669b5ffa 2018-10-07 stsp child->parent = view;
736 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
738 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
741 34bc9ec9 2019-02-22 stsp static void
742 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
744 25791caa 2018-10-24 stsp int cols, lines;
745 25791caa 2018-10-24 stsp struct winsize size;
747 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
748 25791caa 2018-10-24 stsp cols = 80; /* Default */
749 25791caa 2018-10-24 stsp lines = 24;
751 25791caa 2018-10-24 stsp cols = size.ws_col;
752 25791caa 2018-10-24 stsp lines = size.ws_row;
754 25791caa 2018-10-24 stsp resize_term(lines, cols);
757 2b49a8ae 2019-06-22 stsp static const struct got_error *
758 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
760 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
761 2b49a8ae 2019-06-22 stsp char pattern[1024];
764 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
765 2b49a8ae 2019-06-22 stsp return NULL;
767 cb1159f8 2020-02-19 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
768 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
770 2b49a8ae 2019-06-22 stsp nocbreak();
772 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
775 2b49a8ae 2019-06-22 stsp if (ret == ERR)
776 2b49a8ae 2019-06-22 stsp return NULL;
778 2b49a8ae 2019-06-22 stsp if (view->searching) {
779 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
780 2b49a8ae 2019-06-22 stsp view->searching = 0;
783 41605754 2020-11-12 stsp if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) {
784 7c32bd05 2019-06-22 stsp err = view->search_start(view);
786 7c32bd05 2019-06-22 stsp regfree(&view->regex);
787 7c32bd05 2019-06-22 stsp return err;
789 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
790 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
791 2b49a8ae 2019-06-22 stsp view->search_next(view);
794 2b49a8ae 2019-06-22 stsp return NULL;
797 0cf4efb1 2018-09-29 stsp static const struct got_error *
798 e78dc838 2020-12-04 stsp view_input(struct tog_view **new, int *done, struct tog_view *view,
799 e78dc838 2020-12-04 stsp struct tog_view_list_head *views)
801 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
802 669b5ffa 2018-10-07 stsp struct tog_view *v;
803 1a76625f 2018-10-22 stsp int ch, errcode;
805 e5a0f69f 2018-08-18 stsp *new = NULL;
807 f9967bca 2020-03-27 stsp /* Clear "no matches" indicator. */
808 f9967bca 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE ||
809 f9967bca 2020-03-27 stsp view->search_next_done == TOG_SEARCH_HAVE_NONE)
810 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
812 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
813 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
814 82954512 2020-02-03 stsp if (errcode)
815 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
816 82954512 2020-02-03 stsp "pthread_mutex_unlock");
817 82954512 2020-02-03 stsp pthread_yield();
818 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
819 82954512 2020-02-03 stsp if (errcode)
820 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
821 82954512 2020-02-03 stsp "pthread_mutex_lock");
822 60493ae3 2019-06-20 stsp view->search_next(view);
823 60493ae3 2019-06-20 stsp return NULL;
826 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
827 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
828 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
829 1a76625f 2018-10-22 stsp if (errcode)
830 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
831 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
832 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
833 1a76625f 2018-10-22 stsp if (errcode)
834 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
835 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
837 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
838 25791caa 2018-10-24 stsp tog_resizeterm();
839 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
840 61266923 2020-01-14 stsp tog_sigcont_received = 0;
841 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
842 25791caa 2018-10-24 stsp err = view_resize(v);
844 25791caa 2018-10-24 stsp return err;
845 e78dc838 2020-12-04 stsp err = v->input(new, v, KEY_RESIZE);
847 25791caa 2018-10-24 stsp return err;
851 e5a0f69f 2018-08-18 stsp switch (ch) {
855 1e37a5c2 2019-05-12 jcs if (view->child) {
856 e78dc838 2020-12-04 stsp view->focussed = 0;
857 e78dc838 2020-12-04 stsp view->child->focussed = 1;
858 e78dc838 2020-12-04 stsp view->focus_child = 1;
859 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
860 e78dc838 2020-12-04 stsp view->focussed = 0;
861 e78dc838 2020-12-04 stsp view->parent->focussed = 1;
862 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
866 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
867 9970f7fc 2020-12-03 stsp view->dying = 1;
873 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
874 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
876 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
877 e78dc838 2020-12-04 stsp view->focussed = 0;
878 e78dc838 2020-12-04 stsp view->child->focussed = 1;
879 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
881 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
884 e78dc838 2020-12-04 stsp err = view->child->input(new, view->child,
885 9970f7fc 2020-12-03 stsp KEY_RESIZE);
887 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
888 e78dc838 2020-12-04 stsp view->parent->focussed = 0;
889 e78dc838 2020-12-04 stsp view->focussed = 1;
890 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
892 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
896 e78dc838 2020-12-04 stsp err = view->input(new, view, KEY_RESIZE);
899 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
902 60493ae3 2019-06-20 stsp if (view->search_start)
903 2b49a8ae 2019-06-22 stsp view_search_start(view);
905 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
909 8f4ed634 2020-03-26 stsp if (view->search_next) {
910 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
911 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
912 60493ae3 2019-06-20 stsp view->search_next_done = 0;
913 60493ae3 2019-06-20 stsp view->search_next(view);
915 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
918 e78dc838 2020-12-04 stsp err = view->input(new, view, ch);
922 e5a0f69f 2018-08-18 stsp return err;
926 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
928 0cf4efb1 2018-09-29 stsp PANEL *panel;
929 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
931 669b5ffa 2018-10-07 stsp if (view->parent)
932 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
934 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
935 0cf4efb1 2018-09-29 stsp if (panel == NULL)
938 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
939 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
940 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
944 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
946 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
947 acdafe9c 2020-12-03 stsp if (view->child == NULL || view->child->focussed)
949 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
951 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
954 669b5ffa 2018-10-07 stsp return view->focussed;
957 bcbd79e2 2018-08-19 stsp static const struct got_error *
958 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
960 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
961 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
962 e78dc838 2020-12-04 stsp struct tog_view *new_view, *main_view;
963 fd823528 2018-10-22 stsp int fast_refresh = 10;
964 1a76625f 2018-10-22 stsp int done = 0, errcode;
966 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
967 1a76625f 2018-10-22 stsp if (errcode)
968 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
970 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
971 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
973 a81bf10d 2018-09-29 stsp main_view = view;
974 1004088d 2018-09-29 stsp view->focussed = 1;
975 878940b7 2018-09-29 stsp err = view->show(view);
977 0cf4efb1 2018-09-29 stsp return err;
978 0cf4efb1 2018-09-29 stsp update_panels();
979 0cf4efb1 2018-09-29 stsp doupdate();
980 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
981 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
982 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
983 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
985 e78dc838 2020-12-04 stsp err = view_input(&new_view, &done, view, &views);
988 9970f7fc 2020-12-03 stsp if (view->dying) {
989 e78dc838 2020-12-04 stsp struct tog_view *v, *prev = NULL;
991 9970f7fc 2020-12-03 stsp if (view_is_parent_view(view))
992 9970f7fc 2020-12-03 stsp prev = TAILQ_PREV(view, tog_view_list_head,
994 e78dc838 2020-12-04 stsp else if (view->parent)
995 669b5ffa 2018-10-07 stsp prev = view->parent;
997 e78dc838 2020-12-04 stsp if (view->parent) {
998 9970f7fc 2020-12-03 stsp view->parent->child = NULL;
999 e78dc838 2020-12-04 stsp view->parent->focus_child = 0;
1001 9970f7fc 2020-12-03 stsp TAILQ_REMOVE(&views, view, entry);
1003 9970f7fc 2020-12-03 stsp err = view_close(view);
1004 9970f7fc 2020-12-03 stsp if (err || (view == main_view && new_view == NULL))
1005 e5a0f69f 2018-08-18 stsp goto done;
1007 e78dc838 2020-12-04 stsp view = NULL;
1008 e78dc838 2020-12-04 stsp TAILQ_FOREACH(v, &views, entry) {
1009 e78dc838 2020-12-04 stsp if (v->focussed)
1012 e78dc838 2020-12-04 stsp if (view == NULL && new_view == NULL) {
1013 e78dc838 2020-12-04 stsp /* No view has focus. Try to pick one. */
1015 e78dc838 2020-12-04 stsp view = prev;
1016 e78dc838 2020-12-04 stsp else if (!TAILQ_EMPTY(&views)) {
1017 e78dc838 2020-12-04 stsp view = TAILQ_LAST(&views,
1018 e78dc838 2020-12-04 stsp tog_view_list_head);
1020 e78dc838 2020-12-04 stsp if (view) {
1021 e78dc838 2020-12-04 stsp if (view->focus_child) {
1022 e78dc838 2020-12-04 stsp view->child->focussed = 1;
1023 e78dc838 2020-12-04 stsp view = view->child;
1025 e78dc838 2020-12-04 stsp view->focussed = 1;
1029 bcbd79e2 2018-08-19 stsp if (new_view) {
1030 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
1031 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
1032 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
1033 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
1035 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
1036 86c66b02 2018-10-18 stsp err = view_close(v);
1038 86c66b02 2018-10-18 stsp goto done;
1041 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
1042 fed7eaa8 2018-10-24 stsp view = new_view;
1044 669b5ffa 2018-10-07 stsp if (view) {
1045 e78dc838 2020-12-04 stsp if (view_is_parent_view(view)) {
1046 e78dc838 2020-12-04 stsp if (view->child && view->child->focussed)
1047 e78dc838 2020-12-04 stsp view = view->child;
1049 e78dc838 2020-12-04 stsp if (view->parent && view->parent->focussed)
1050 e78dc838 2020-12-04 stsp view = view->parent;
1052 e78dc838 2020-12-04 stsp show_panel(view->panel);
1053 e78dc838 2020-12-04 stsp if (view->child && view_is_splitscreen(view->child))
1054 e78dc838 2020-12-04 stsp show_panel(view->child->panel);
1055 e78dc838 2020-12-04 stsp if (view->parent && view_is_splitscreen(view)) {
1056 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1058 1a76625f 2018-10-22 stsp goto done;
1060 669b5ffa 2018-10-07 stsp err = view->show(view);
1062 1a76625f 2018-10-22 stsp goto done;
1063 669b5ffa 2018-10-07 stsp if (view->child) {
1064 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1066 1a76625f 2018-10-22 stsp goto done;
1068 1a76625f 2018-10-22 stsp update_panels();
1069 1a76625f 2018-10-22 stsp doupdate();
1073 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1074 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1075 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1076 e5a0f69f 2018-08-18 stsp view_close(view);
1079 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1080 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1081 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1083 e5a0f69f 2018-08-18 stsp return err;
1086 4ed7e80c 2018-05-20 stsp __dead static void
1087 9f7d7167 2018-04-29 stsp usage_log(void)
1090 c70c5802 2018-08-01 stsp fprintf(stderr,
1091 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1092 9f7d7167 2018-04-29 stsp getprogname());
1096 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1097 80ddbec8 2018-04-29 stsp static const struct got_error *
1098 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1100 00dfcb92 2018-06-11 stsp char *vis = NULL;
1101 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1103 963b370f 2018-05-20 stsp *ws = NULL;
1104 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1105 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1106 00dfcb92 2018-06-11 stsp int vislen;
1107 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1108 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1110 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1111 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1113 00dfcb92 2018-06-11 stsp return err;
1114 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1115 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1116 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1117 a7f50699 2018-06-11 stsp goto done;
1121 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1122 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1123 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1124 a7f50699 2018-06-11 stsp goto done;
1127 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1128 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1130 00dfcb92 2018-06-11 stsp free(vis);
1131 963b370f 2018-05-20 stsp if (err) {
1132 963b370f 2018-05-20 stsp free(*ws);
1133 963b370f 2018-05-20 stsp *ws = NULL;
1134 963b370f 2018-05-20 stsp *wlen = 0;
1136 963b370f 2018-05-20 stsp return err;
1139 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
1140 963b370f 2018-05-20 stsp static const struct got_error *
1141 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1142 27a741e5 2019-09-11 stsp int col_tab_align)
1144 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1145 963b370f 2018-05-20 stsp int cols = 0;
1146 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1147 963b370f 2018-05-20 stsp size_t wlen;
1150 963b370f 2018-05-20 stsp *wlinep = NULL;
1151 b700b5d6 2018-07-10 stsp *widthp = 0;
1153 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
1155 963b370f 2018-05-20 stsp return err;
1158 27a741e5 2019-09-11 stsp while (i < wlen) {
1159 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
1161 27a741e5 2019-09-11 stsp if (width == 0) {
1166 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
1167 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1169 27a741e5 2019-09-11 stsp cols += width;
1171 27a741e5 2019-09-11 stsp } else if (width == -1) {
1172 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
1173 27a741e5 2019-09-11 stsp width = TABSIZE -
1174 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
1175 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1177 27a741e5 2019-09-11 stsp cols += width;
1181 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
1182 963b370f 2018-05-20 stsp goto done;
1185 963b370f 2018-05-20 stsp wline[i] = L'\0';
1186 b700b5d6 2018-07-10 stsp if (widthp)
1187 b700b5d6 2018-07-10 stsp *widthp = cols;
1190 963b370f 2018-05-20 stsp free(wline);
1192 963b370f 2018-05-20 stsp *wlinep = wline;
1193 963b370f 2018-05-20 stsp return err;
1196 8b473291 2019-02-21 stsp static const struct got_error*
1197 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1198 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1200 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1201 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1203 8b473291 2019-02-21 stsp const char *name;
1205 8b473291 2019-02-21 stsp *refs_str = NULL;
1207 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1208 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1209 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
1212 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1213 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1215 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1216 8b473291 2019-02-21 stsp name += 5;
1217 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1219 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1220 8b473291 2019-02-21 stsp name += 6;
1221 79cc719f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
1222 8b473291 2019-02-21 stsp name += 8;
1223 79cc719f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
1224 79cc719f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
1227 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
1230 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1231 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
1232 5d844a1e 2019-08-13 stsp if (err) {
1233 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
1234 48cae60d 2020-09-22 stsp free(ref_id);
1237 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1238 5d844a1e 2019-08-13 stsp err = NULL;
1239 5d844a1e 2019-08-13 stsp tag = NULL;
1242 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1243 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
1244 48cae60d 2020-09-22 stsp free(ref_id);
1246 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1247 52b5abe1 2019-08-13 stsp if (cmp != 0)
1249 8b473291 2019-02-21 stsp s = *refs_str;
1250 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1251 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1252 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1254 8b473291 2019-02-21 stsp *refs_str = NULL;
1260 8b473291 2019-02-21 stsp return err;
1263 963b370f 2018-05-20 stsp static const struct got_error *
1264 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1265 27a741e5 2019-09-11 stsp int col_tab_align)
1267 5813d178 2019-03-09 stsp char *smallerthan, *at;
1269 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1270 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1271 5813d178 2019-03-09 stsp author = smallerthan + 1;
1272 5813d178 2019-03-09 stsp at = strchr(author, '@');
1274 5813d178 2019-03-09 stsp *at = '\0';
1275 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1278 5813d178 2019-03-09 stsp static const struct got_error *
1279 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1280 8fdc79fe 2020-12-01 naddy struct got_object_id *id, const size_t date_display_cols,
1281 8fdc79fe 2020-12-01 naddy int author_display_cols)
1283 8fdc79fe 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
1284 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1285 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1286 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1287 5813d178 2019-03-09 stsp char *author = NULL;
1288 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1289 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1290 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1291 bb737323 2018-05-20 stsp int col, limit;
1292 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1293 ccb26ccd 2018-11-05 stsp struct tm tm;
1294 45d799e2 2018-12-23 stsp time_t committer_time;
1295 11b20872 2019-11-08 stsp struct tog_color *tc;
1297 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1298 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1299 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1300 6db9f7f6 2019-12-10 stsp if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1301 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1302 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1304 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1305 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1307 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1308 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_DATE);
1310 11b20872 2019-11-08 stsp wattr_on(view->window,
1311 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1312 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1314 11b20872 2019-11-08 stsp wattr_off(view->window,
1315 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1316 27a741e5 2019-09-11 stsp col = limit;
1317 b39d25c7 2018-07-10 stsp if (col > avail)
1318 b39d25c7 2018-07-10 stsp goto done;
1320 6570a66d 2019-11-08 stsp if (avail >= 120) {
1321 6570a66d 2019-11-08 stsp char *id_str;
1322 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1324 6570a66d 2019-11-08 stsp goto done;
1325 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
1327 11b20872 2019-11-08 stsp wattr_on(view->window,
1328 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1329 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1331 11b20872 2019-11-08 stsp wattr_off(view->window,
1332 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1333 6570a66d 2019-11-08 stsp free(id_str);
1335 6570a66d 2019-11-08 stsp if (col > avail)
1336 6570a66d 2019-11-08 stsp goto done;
1339 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1340 5813d178 2019-03-09 stsp if (author == NULL) {
1341 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1342 80ddbec8 2018-04-29 stsp goto done;
1344 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1346 bb737323 2018-05-20 stsp goto done;
1347 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_AUTHOR);
1349 11b20872 2019-11-08 stsp wattr_on(view->window,
1350 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1351 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1353 11b20872 2019-11-08 stsp wattr_off(view->window,
1354 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1355 bb737323 2018-05-20 stsp col += author_width;
1356 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1357 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1359 bb737323 2018-05-20 stsp author_width++;
1361 9c2eaf34 2018-05-20 stsp if (col > avail)
1362 9c2eaf34 2018-05-20 stsp goto done;
1364 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1366 6d9fbc00 2018-04-29 stsp goto done;
1367 bb737323 2018-05-20 stsp logmsg = logmsg0;
1368 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1370 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1371 bb737323 2018-05-20 stsp if (newline)
1372 bb737323 2018-05-20 stsp *newline = '\0';
1373 bb737323 2018-05-20 stsp limit = avail - col;
1374 dee2c213 2019-11-13 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1376 bb737323 2018-05-20 stsp goto done;
1377 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1378 bb737323 2018-05-20 stsp col += logmsg_width;
1379 27a741e5 2019-09-11 stsp while (col < avail) {
1380 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1384 80ddbec8 2018-04-29 stsp free(logmsg0);
1385 bb737323 2018-05-20 stsp free(wlogmsg);
1386 5813d178 2019-03-09 stsp free(author);
1387 bb737323 2018-05-20 stsp free(wauthor);
1388 80ddbec8 2018-04-29 stsp free(line);
1389 80ddbec8 2018-04-29 stsp return err;
1392 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1393 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1394 899d86c2 2018-05-10 stsp struct got_object_id *id)
1396 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1398 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1399 80ddbec8 2018-04-29 stsp if (entry == NULL)
1400 899d86c2 2018-05-10 stsp return NULL;
1402 899d86c2 2018-05-10 stsp entry->id = id;
1403 99db9666 2018-05-07 stsp entry->commit = commit;
1404 899d86c2 2018-05-10 stsp return entry;
1407 99db9666 2018-05-07 stsp static void
1408 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1410 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1412 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1413 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1414 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1415 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1416 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1417 99db9666 2018-05-07 stsp free(entry);
1420 99db9666 2018-05-07 stsp static void
1421 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1423 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1424 99db9666 2018-05-07 stsp pop_commit(commits);
1427 c4972b91 2018-05-07 stsp static const struct got_error *
1428 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1429 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1431 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1432 13add988 2019-10-15 stsp regmatch_t regmatch;
1433 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1435 13add988 2019-10-15 stsp *have_match = 0;
1437 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1439 13add988 2019-10-15 stsp return err;
1441 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1443 13add988 2019-10-15 stsp goto done;
1445 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1446 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1447 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1448 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1449 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1450 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1451 13add988 2019-10-15 stsp *have_match = 1;
1453 13add988 2019-10-15 stsp free(id_str);
1454 13add988 2019-10-15 stsp free(logmsg);
1455 13add988 2019-10-15 stsp return err;
1458 13add988 2019-10-15 stsp static const struct got_error *
1459 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1460 13add988 2019-10-15 stsp int minqueue, struct got_repository *repo, const char *path,
1461 13add988 2019-10-15 stsp int *searching, int *search_next_done, regex_t *regex)
1463 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1464 7c1452c1 2020-03-26 stsp int nqueued = 0;
1467 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1468 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1469 1a76625f 2018-10-22 stsp * while updating the display.
1471 13add988 2019-10-15 stsp while (nqueued < minqueue ||
1472 13add988 2019-10-15 stsp (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1473 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1474 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1475 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1476 1a76625f 2018-10-22 stsp int errcode;
1478 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1479 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1482 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1485 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1486 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1487 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1491 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1492 1a76625f 2018-10-22 stsp if (errcode) {
1493 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1494 13add988 2019-10-15 stsp "pthread_mutex_lock");
1498 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1499 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1500 ecb28ae0 2018-07-16 stsp nqueued++;
1501 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1503 13add988 2019-10-15 stsp if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1504 7c1452c1 2020-03-26 stsp int have_match;
1505 13add988 2019-10-15 stsp err = match_commit(&have_match, id, commit, regex);
1508 7c1452c1 2020-03-26 stsp if (have_match)
1509 8f4ed634 2020-03-26 stsp *search_next_done = TOG_SEARCH_HAVE_MORE;
1512 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1513 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1514 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1515 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1520 9ba79e04 2018-06-11 stsp return err;
1523 0553a4e3 2018-04-30 stsp static const struct got_error *
1524 8fdc79fe 2020-12-01 naddy draw_commits(struct tog_view *view)
1526 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1527 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1528 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1529 8fdc79fe 2020-12-01 naddy const int limit = view->nlines;
1530 60493ae3 2019-06-20 stsp int width;
1531 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1532 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1533 8b473291 2019-02-21 stsp char *refs_str = NULL;
1534 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1535 11b20872 2019-11-08 stsp struct tog_color *tc;
1536 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1538 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
1539 e0d42f60 2018-07-22 stsp ncommits = 0;
1540 e0d42f60 2018-07-22 stsp while (entry) {
1541 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected) {
1542 8fdc79fe 2020-12-01 naddy s->selected_entry = entry;
1545 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1546 e0d42f60 2018-07-22 stsp ncommits++;
1549 8fdc79fe 2020-12-01 naddy if (s->selected_entry &&
1550 8fdc79fe 2020-12-01 naddy !(view->searching && view->search_next_done == 0)) {
1551 8fdc79fe 2020-12-01 naddy err = got_object_id_str(&id_str, s->selected_entry->id);
1553 ecb28ae0 2018-07-16 stsp return err;
1554 8fdc79fe 2020-12-01 naddy err = build_refs_str(&refs_str, &s->refs,
1555 8fdc79fe 2020-12-01 naddy s->selected_entry->id, s->repo);
1557 8fdc79fe 2020-12-01 naddy goto done;
1560 8fdc79fe 2020-12-01 naddy if (s->thread_args.commits_needed == 0)
1561 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1563 8fdc79fe 2020-12-01 naddy if (s->thread_args.commits_needed > 0) {
1564 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1565 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
1566 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
1567 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
1568 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1569 8f4ed634 2020-03-26 stsp goto done;
1572 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
1574 f9686aa5 2020-03-27 stsp if (view->searching) {
1575 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
1576 f9686aa5 2020-03-27 stsp search_str = "no more matches";
1577 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1578 f9686aa5 2020-03-27 stsp search_str = "no matches found";
1579 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
1580 f9686aa5 2020-03-27 stsp search_str = "searching...";
1583 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1584 8fdc79fe 2020-12-01 naddy entry ? entry->idx + 1 : 0, s->commits.ncommits,
1585 f9686aa5 2020-03-27 stsp search_str ? search_str :
1586 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
1587 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1588 8f4ed634 2020-03-26 stsp goto done;
1592 8fdc79fe 2020-12-01 naddy if (s->in_repo_path && strcmp(s->in_repo_path, "/") != 0) {
1593 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1594 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1595 8fdc79fe 2020-12-01 naddy s->in_repo_path, ncommits_str) == -1) {
1596 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1597 1a76625f 2018-10-22 stsp header = NULL;
1598 1a76625f 2018-10-22 stsp goto done;
1600 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1601 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1602 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1603 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1604 1a76625f 2018-10-22 stsp header = NULL;
1605 1a76625f 2018-10-22 stsp goto done;
1607 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1609 1a76625f 2018-10-22 stsp goto done;
1611 2814baeb 2018-08-01 stsp werase(view->window);
1613 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1614 a3404814 2018-09-02 stsp wstandout(view->window);
1615 8fdc79fe 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
1617 11b20872 2019-11-08 stsp wattr_on(view->window,
1618 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1619 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1621 11b20872 2019-11-08 stsp wattr_off(view->window,
1622 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1623 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1624 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1627 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1628 a3404814 2018-09-02 stsp wstandend(view->window);
1629 ecb28ae0 2018-07-16 stsp free(wline);
1630 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1631 1a76625f 2018-10-22 stsp goto done;
1633 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1634 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
1635 5813d178 2019-03-09 stsp ncommits = 0;
1636 5813d178 2019-03-09 stsp while (entry) {
1637 5813d178 2019-03-09 stsp char *author;
1638 5813d178 2019-03-09 stsp wchar_t *wauthor;
1639 5813d178 2019-03-09 stsp int width;
1640 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1642 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1643 5813d178 2019-03-09 stsp if (author == NULL) {
1644 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1645 5813d178 2019-03-09 stsp goto done;
1647 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1648 27a741e5 2019-09-11 stsp date_display_cols);
1649 5813d178 2019-03-09 stsp if (author_cols < width)
1650 5813d178 2019-03-09 stsp author_cols = width;
1651 5813d178 2019-03-09 stsp free(wauthor);
1652 5813d178 2019-03-09 stsp free(author);
1653 7ca04879 2019-10-19 stsp ncommits++;
1654 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1657 8fdc79fe 2020-12-01 naddy entry = s->first_displayed_entry;
1658 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = s->first_displayed_entry;
1659 867c6645 2018-07-10 stsp ncommits = 0;
1660 899d86c2 2018-05-10 stsp while (entry) {
1661 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1663 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
1664 2814baeb 2018-08-01 stsp wstandout(view->window);
1665 8fdc79fe 2020-12-01 naddy err = draw_commit(view, entry->commit, entry->id,
1666 8fdc79fe 2020-12-01 naddy date_display_cols, author_cols);
1667 8fdc79fe 2020-12-01 naddy if (ncommits == s->selected)
1668 2814baeb 2018-08-01 stsp wstandend(view->window);
1670 60493ae3 2019-06-20 stsp goto done;
1671 0553a4e3 2018-04-30 stsp ncommits++;
1672 8fdc79fe 2020-12-01 naddy s->last_displayed_entry = entry;
1673 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1676 1a57306a 2018-09-02 stsp view_vborder(view);
1678 1a76625f 2018-10-22 stsp free(id_str);
1679 8b473291 2019-02-21 stsp free(refs_str);
1680 1a76625f 2018-10-22 stsp free(ncommits_str);
1681 1a76625f 2018-10-22 stsp free(header);
1682 80ddbec8 2018-04-29 stsp return err;
1685 07b55e75 2018-05-10 stsp static void
1686 3e135950 2020-12-01 naddy log_scroll_up(struct tog_log_view_state *s, int maxscroll)
1688 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1689 07b55e75 2018-05-10 stsp int nscrolled = 0;
1691 ffe38506 2020-12-01 naddy entry = TAILQ_FIRST(&s->commits.head);
1692 ffe38506 2020-12-01 naddy if (s->first_displayed_entry == entry)
1695 ffe38506 2020-12-01 naddy entry = s->first_displayed_entry;
1696 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1697 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1698 07b55e75 2018-05-10 stsp if (entry) {
1699 ffe38506 2020-12-01 naddy s->first_displayed_entry = entry;
1700 07b55e75 2018-05-10 stsp nscrolled++;
1705 aa075928 2018-05-10 stsp static const struct got_error *
1706 ffe38506 2020-12-01 naddy trigger_log_thread(struct tog_view *view, int wait)
1708 ffe38506 2020-12-01 naddy struct tog_log_thread_args *ta = &view->state.log.thread_args;
1709 5e224a3e 2019-02-22 stsp int errcode;
1711 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1713 ffe38506 2020-12-01 naddy while (ta->commits_needed > 0) {
1714 ffe38506 2020-12-01 naddy if (ta->log_complete)
1717 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1718 ffe38506 2020-12-01 naddy errcode = pthread_cond_signal(&ta->need_commits);
1719 7aafa0d1 2019-02-22 stsp if (errcode)
1720 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1721 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1724 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
1725 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
1727 7c1452c1 2020-03-26 stsp if (!wait)
1730 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1731 ffe38506 2020-12-01 naddy show_log_view(view);
1732 7c1452c1 2020-03-26 stsp update_panels();
1733 7c1452c1 2020-03-26 stsp doupdate();
1735 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
1736 ffe38506 2020-12-01 naddy errcode = pthread_cond_wait(&ta->commit_loaded, &tog_mutex);
1737 82954512 2020-02-03 stsp if (errcode)
1738 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1739 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1741 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1742 ffe38506 2020-12-01 naddy show_log_view(view);
1743 7c1452c1 2020-03-26 stsp update_panels();
1744 7c1452c1 2020-03-26 stsp doupdate();
1747 5e224a3e 2019-02-22 stsp return NULL;
1750 5e224a3e 2019-02-22 stsp static const struct got_error *
1751 ffe38506 2020-12-01 naddy log_scroll_down(struct tog_view *view, int maxscroll)
1753 ffe38506 2020-12-01 naddy struct tog_log_view_state *s = &view->state.log;
1754 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1755 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1756 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
1758 ffe38506 2020-12-01 naddy if (s->last_displayed_entry == NULL)
1759 5e224a3e 2019-02-22 stsp return NULL;
1761 ffe38506 2020-12-01 naddy ncommits_needed = (s->last_displayed_entry)->idx + 1 + maxscroll;
1762 ffe38506 2020-12-01 naddy if (s->commits.ncommits < ncommits_needed &&
1763 ffe38506 2020-12-01 naddy !s->thread_args.log_complete) {
1765 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
1767 ffe38506 2020-12-01 naddy s->thread_args.commits_needed += maxscroll;
1768 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
1770 5e224a3e 2019-02-22 stsp return err;
1774 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->last_displayed_entry, entry);
1775 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1778 ffe38506 2020-12-01 naddy s->last_displayed_entry = pentry;
1780 ffe38506 2020-12-01 naddy pentry = TAILQ_NEXT(s->first_displayed_entry, entry);
1781 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1783 ffe38506 2020-12-01 naddy s->first_displayed_entry = pentry;
1784 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1786 dd0a52c1 2018-05-20 stsp return err;
1789 cd0acaa7 2018-05-20 stsp static const struct got_error *
1790 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1791 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1792 78756c87 2020-11-24 stsp struct tog_view *log_view, struct got_repository *repo)
1794 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1795 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1796 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1798 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1799 15a94983 2018-12-23 stsp if (diff_view == NULL)
1800 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1802 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1803 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1804 78756c87 2020-11-24 stsp commit_id, NULL, NULL, 3, 0, 0, log_view, repo);
1805 e5a0f69f 2018-08-18 stsp if (err == NULL)
1806 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1807 cd0acaa7 2018-05-20 stsp return err;
1810 80ddbec8 2018-04-29 stsp static const struct got_error *
1811 42a2230c 2020-12-01 naddy tree_view_visit_subtree(struct tog_tree_view_state *s,
1812 42a2230c 2020-12-01 naddy struct got_tree_object *subtree)
1814 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1816 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1817 941e9f74 2019-05-21 stsp if (parent == NULL)
1818 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1820 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1821 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1822 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1823 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1824 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1825 941e9f74 2019-05-21 stsp s->tree = subtree;
1826 941e9f74 2019-05-21 stsp s->selected = 0;
1827 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1828 941e9f74 2019-05-21 stsp return NULL;
1831 941e9f74 2019-05-21 stsp static const struct got_error *
1832 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
1833 d91faf3b 2020-12-01 naddy struct got_object_id *commit_id, const char *path)
1835 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1836 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
1837 941e9f74 2019-05-21 stsp const char *p;
1838 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
1840 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1842 941e9f74 2019-05-21 stsp while (*p) {
1843 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
1844 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1845 56e0773d 2019-11-28 stsp char *te_name;
1847 33cbf02b 2020-01-12 stsp while (p[0] == '/')
1850 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1851 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1852 941e9f74 2019-05-21 stsp if (slash == NULL)
1853 33cbf02b 2020-01-12 stsp te_name = strdup(p);
1855 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
1856 56e0773d 2019-11-28 stsp if (te_name == NULL) {
1857 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
1860 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
1861 56e0773d 2019-11-28 stsp if (te == NULL) {
1862 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1863 56e0773d 2019-11-28 stsp free(te_name);
1866 56e0773d 2019-11-28 stsp free(te_name);
1867 9a1d5146 2020-11-27 naddy s->first_displayed_entry = s->selected_entry = te;
1869 9a1d5146 2020-11-27 naddy if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry)))
1870 9a1d5146 2020-11-27 naddy break; /* jump to this file's entry */
1872 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1873 941e9f74 2019-05-21 stsp if (slash)
1874 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1876 941e9f74 2019-05-21 stsp subpath = strdup(path);
1877 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1878 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1882 d91faf3b 2020-12-01 naddy err = got_object_id_by_path(&tree_id, s->repo, commit_id,
1887 d91faf3b 2020-12-01 naddy err = got_object_open_as_tree(&tree, s->repo, tree_id);
1888 941e9f74 2019-05-21 stsp free(tree_id);
1892 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, tree);
1893 941e9f74 2019-05-21 stsp if (err) {
1894 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1897 941e9f74 2019-05-21 stsp if (slash == NULL)
1899 941e9f74 2019-05-21 stsp free(subpath);
1900 941e9f74 2019-05-21 stsp subpath = NULL;
1901 941e9f74 2019-05-21 stsp p = slash;
1904 941e9f74 2019-05-21 stsp free(subpath);
1905 1a76625f 2018-10-22 stsp return err;
1908 61266923 2020-01-14 stsp static const struct got_error *
1909 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1910 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
1911 78756c87 2020-11-24 stsp struct got_repository *repo)
1913 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
1914 55cccc34 2020-02-20 stsp struct got_tree_object *tree;
1915 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
1916 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
1918 55cccc34 2020-02-20 stsp err = got_object_open_as_tree(&tree, repo,
1919 55cccc34 2020-02-20 stsp got_object_commit_get_tree_id(entry->commit));
1921 55cccc34 2020-02-20 stsp return err;
1923 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1924 55cccc34 2020-02-20 stsp if (tree_view == NULL)
1925 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
1927 78756c87 2020-11-24 stsp err = open_tree_view(tree_view, tree, entry->id, repo);
1928 55cccc34 2020-02-20 stsp if (err) {
1929 55cccc34 2020-02-20 stsp got_object_tree_close(tree);
1930 55cccc34 2020-02-20 stsp return err;
1932 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
1934 55cccc34 2020-02-20 stsp *new_view = tree_view;
1936 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
1937 55cccc34 2020-02-20 stsp return NULL;
1939 d91faf3b 2020-12-01 naddy return tree_view_walk_path(s, entry->id, path);
1942 55cccc34 2020-02-20 stsp static const struct got_error *
1943 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
1945 61266923 2020-01-14 stsp sigset_t sigset;
1946 61266923 2020-01-14 stsp int errcode;
1948 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
1949 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
1951 61266923 2020-01-14 stsp /* tog handles SIGWINCH and SIGCONT */
1952 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
1953 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1954 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
1955 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1957 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
1958 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
1959 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1961 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1962 61266923 2020-01-14 stsp if (errcode)
1963 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
1965 61266923 2020-01-14 stsp return NULL;
1968 1a76625f 2018-10-22 stsp static void *
1969 1a76625f 2018-10-22 stsp log_thread(void *arg)
1971 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1972 1a76625f 2018-10-22 stsp int errcode = 0;
1973 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1974 1a76625f 2018-10-22 stsp int done = 0;
1976 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
1978 61266923 2020-01-14 stsp return (void *)err;
1980 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1981 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1982 13add988 2019-10-15 stsp a->in_repo_path, a->searching, a->search_next_done,
1983 13add988 2019-10-15 stsp a->regex);
1984 1a76625f 2018-10-22 stsp if (err) {
1985 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1986 1a76625f 2018-10-22 stsp return (void *)err;
1987 1a76625f 2018-10-22 stsp err = NULL;
1989 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1990 1a76625f 2018-10-22 stsp a->commits_needed--;
1992 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1993 3abe8080 2019-04-10 stsp if (errcode) {
1994 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1995 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1997 3abe8080 2019-04-10 stsp } else if (*a->quit)
1999 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
2000 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
2001 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
2002 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
2005 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
2006 7c1452c1 2020-03-26 stsp if (errcode) {
2007 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2008 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
2009 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
2014 1a76625f 2018-10-22 stsp a->commits_needed = 0;
2016 7c1452c1 2020-03-26 stsp if (a->commits_needed == 0) {
2017 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
2018 7c1452c1 2020-03-26 stsp &tog_mutex);
2019 7c1452c1 2020-03-26 stsp if (errcode)
2020 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
2021 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
2025 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2026 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2027 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2028 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2030 3abe8080 2019-04-10 stsp a->log_complete = 1;
2031 1a76625f 2018-10-22 stsp return (void *)err;
2034 1a76625f 2018-10-22 stsp static const struct got_error *
2035 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2037 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2038 1a76625f 2018-10-22 stsp int errcode;
2040 1a76625f 2018-10-22 stsp if (s->thread) {
2041 1a76625f 2018-10-22 stsp s->quit = 1;
2042 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2043 1a76625f 2018-10-22 stsp if (errcode)
2044 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2045 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2046 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2047 1a76625f 2018-10-22 stsp if (errcode)
2048 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2049 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2050 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
2051 1a76625f 2018-10-22 stsp if (errcode)
2052 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2053 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2054 1a76625f 2018-10-22 stsp if (errcode)
2055 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2056 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2057 1a76625f 2018-10-22 stsp s->thread = NULL;
2060 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2061 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
2062 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2065 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2066 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2067 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2070 9343a5fb 2018-06-23 stsp return err;
2073 9343a5fb 2018-06-23 stsp static const struct got_error *
2074 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2076 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2077 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2078 276b94a1 2020-11-13 naddy int errcode;
2080 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2082 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2083 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2084 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2086 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.commit_loaded);
2087 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2088 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2090 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2091 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2092 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2093 1a76625f 2018-10-22 stsp free(s->start_id);
2094 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2095 78756c87 2020-11-24 stsp got_ref_list_free(&s->refs);
2096 1a76625f 2018-10-22 stsp return err;
2099 1a76625f 2018-10-22 stsp static const struct got_error *
2100 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2102 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2104 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2105 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2106 60493ae3 2019-06-20 stsp return NULL;
2109 60493ae3 2019-06-20 stsp static const struct got_error *
2110 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2112 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2113 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2114 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2116 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2117 f9686aa5 2020-03-27 stsp show_log_view(view);
2118 f9686aa5 2020-03-27 stsp update_panels();
2119 f9686aa5 2020-03-27 stsp doupdate();
2121 96e2b566 2019-07-08 stsp if (s->search_entry) {
2122 13add988 2019-10-15 stsp int errcode, ch;
2123 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2124 13add988 2019-10-15 stsp if (errcode)
2125 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2126 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2127 13add988 2019-10-15 stsp ch = wgetch(view->window);
2128 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2129 13add988 2019-10-15 stsp if (errcode)
2130 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2131 13add988 2019-10-15 stsp "pthread_mutex_lock");
2132 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2133 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2134 678cbce5 2019-07-28 stsp return NULL;
2136 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2137 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2139 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2140 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2141 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2142 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2143 8f4ed634 2020-03-26 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2145 8f4ed634 2020-03-26 stsp entry = TAILQ_PREV(s->matched_entry,
2146 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2148 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2149 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
2151 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2154 60493ae3 2019-06-20 stsp while (1) {
2155 13add988 2019-10-15 stsp int have_match = 0;
2157 60493ae3 2019-06-20 stsp if (entry == NULL) {
2158 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2159 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2160 f9967bca 2020-03-27 stsp view->search_next_done =
2161 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2162 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2163 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2164 f801134a 2019-06-25 stsp return NULL;
2167 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2168 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2169 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2171 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2172 ffe38506 2020-12-01 naddy return trigger_log_thread(view, 0);
2175 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2176 13add988 2019-10-15 stsp &view->regex);
2179 13add988 2019-10-15 stsp if (have_match) {
2180 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2181 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2185 96e2b566 2019-07-08 stsp s->search_entry = entry;
2186 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2187 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2189 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2192 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2193 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2194 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2195 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_DOWN);
2197 60493ae3 2019-06-20 stsp return err;
2200 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2201 e78dc838 2020-12-04 stsp err = input_log_view(NULL, view, KEY_UP);
2203 60493ae3 2019-06-20 stsp return err;
2208 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2210 60493ae3 2019-06-20 stsp return NULL;
2213 60493ae3 2019-06-20 stsp static const struct got_error *
2214 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2215 78756c87 2020-11-24 stsp struct got_repository *repo, const char *head_ref_name,
2216 78756c87 2020-11-24 stsp const char *in_repo_path, int log_branches)
2218 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2219 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2220 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2221 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2222 1a76625f 2018-10-22 stsp int errcode;
2224 78756c87 2020-11-24 stsp SIMPLEQ_INIT(&s->refs);
2226 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2227 f135c941 2020-02-20 stsp free(s->in_repo_path);
2228 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2229 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2230 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2233 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2234 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2235 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2237 78756c87 2020-11-24 stsp err = got_ref_list(&s->refs, repo, NULL, got_ref_cmp_by_name, NULL);
2239 78756c87 2020-11-24 stsp goto done;
2241 fb2756b9 2018-08-04 stsp s->repo = repo;
2242 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
2243 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2244 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2245 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2246 5036bf37 2018-09-24 stsp goto done;
2248 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2250 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
2251 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2252 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2253 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2255 11b20872 2019-11-08 stsp goto done;
2256 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2257 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2258 11b20872 2019-11-08 stsp if (err) {
2259 11b20872 2019-11-08 stsp free_colors(&s->colors);
2260 11b20872 2019-11-08 stsp goto done;
2262 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2263 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2264 11b20872 2019-11-08 stsp if (err) {
2265 11b20872 2019-11-08 stsp free_colors(&s->colors);
2266 11b20872 2019-11-08 stsp goto done;
2270 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2271 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2272 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2273 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2274 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2276 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2278 1a76625f 2018-10-22 stsp goto done;
2279 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2280 b672a97a 2020-01-27 stsp !s->log_branches);
2282 1a76625f 2018-10-22 stsp goto done;
2283 62d463ca 2020-10-20 naddy err = got_commit_graph_iter_start(thread_graph, s->start_id,
2284 62d463ca 2020-10-20 naddy s->repo, NULL, NULL);
2286 c5b78334 2020-01-12 stsp goto done;
2288 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2289 1a76625f 2018-10-22 stsp if (errcode) {
2290 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2291 1a76625f 2018-10-22 stsp goto done;
2293 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2294 7c1452c1 2020-03-26 stsp if (errcode) {
2295 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
2296 7c1452c1 2020-03-26 stsp goto done;
2299 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2300 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2301 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2302 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2303 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2304 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2305 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2306 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2307 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2308 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2309 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2310 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2311 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2314 1a76625f 2018-10-22 stsp close_log_view(view);
2315 ba4f502b 2018-08-04 stsp return err;
2318 e5a0f69f 2018-08-18 stsp static const struct got_error *
2319 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2321 f2f6d207 2020-11-24 stsp const struct got_error *err;
2322 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2324 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2325 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2326 2b380cc8 2018-10-24 stsp &s->thread_args);
2327 2b380cc8 2018-10-24 stsp if (errcode)
2328 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2329 f2f6d207 2020-11-24 stsp if (s->thread_args.commits_needed > 0) {
2330 ffe38506 2020-12-01 naddy err = trigger_log_thread(view, 1);
2332 f2f6d207 2020-11-24 stsp return err;
2336 8fdc79fe 2020-12-01 naddy return draw_commits(view);
2339 e5a0f69f 2018-08-18 stsp static const struct got_error *
2340 e78dc838 2020-12-04 stsp input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
2342 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2343 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2344 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
2345 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2346 6458efa5 2020-11-24 stsp struct tog_view *ref_view = NULL;
2347 669b5ffa 2018-10-07 stsp int begin_x = 0;
2348 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
2350 e5a0f69f 2018-08-18 stsp switch (ch) {
2352 1e37a5c2 2019-05-12 jcs s->quit = 1;
2355 1e37a5c2 2019-05-12 jcs case KEY_UP:
2358 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2360 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2361 1e37a5c2 2019-05-12 jcs s->selected--;
2363 3e135950 2020-12-01 naddy log_scroll_up(s, 1);
2365 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2366 a4292ac5 2019-05-12 jcs case CTRL('b'):
2367 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2369 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
2370 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
2371 1e37a5c2 2019-05-12 jcs s->selected = 0;
2374 3e135950 2020-12-01 naddy log_scroll_up(s, view->nlines - 1);
2377 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2380 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2382 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2383 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2384 1e37a5c2 2019-05-12 jcs s->selected++;
2387 ffe38506 2020-12-01 naddy err = log_scroll_down(view, 1);
2389 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2390 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2391 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2392 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2393 1e37a5c2 2019-05-12 jcs if (first == NULL)
2395 ffe38506 2020-12-01 naddy err = log_scroll_down(view, view->nlines - 1);
2398 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2399 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2400 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2401 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2402 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2403 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2405 1e37a5c2 2019-05-12 jcs err = NULL;
2408 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2409 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2410 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2411 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2412 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2413 0bf7f153 2020-12-02 naddy if (s->commits.ncommits < view->nlines - 1 &&
2414 0bf7f153 2020-12-02 naddy !s->thread_args.log_complete) {
2415 0bf7f153 2020-12-02 naddy s->thread_args.commits_needed += (view->nlines - 1) -
2416 0bf7f153 2020-12-02 naddy s->commits.ncommits;
2417 0bf7f153 2020-12-02 naddy err = trigger_log_thread(view, 1);
2420 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2423 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2425 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2426 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2427 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2428 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2429 78756c87 2020-11-24 stsp view, s->repo);
2432 e78dc838 2020-12-04 stsp view->focussed = 0;
2433 e78dc838 2020-12-04 stsp diff_view->focussed = 1;
2434 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2435 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2437 1e37a5c2 2019-05-12 jcs return err;
2438 72a9cb46 2020-12-03 stsp view_set_child(view, diff_view);
2439 e78dc838 2020-12-04 stsp view->focus_child = 1;
2441 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2444 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2446 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2447 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2448 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2449 78756c87 2020-11-24 stsp s->selected_entry, s->in_repo_path, s->repo);
2452 e78dc838 2020-12-04 stsp view->focussed = 0;
2453 e78dc838 2020-12-04 stsp tree_view->focussed = 1;
2454 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2455 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2457 1e37a5c2 2019-05-12 jcs return err;
2458 72a9cb46 2020-12-03 stsp view_set_child(view, tree_view);
2459 e78dc838 2020-12-04 stsp view->focus_child = 1;
2461 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2463 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2464 74cfe85e 2020-10-20 stsp if (got_path_cmp(s->in_repo_path, "/",
2465 74cfe85e 2020-10-20 stsp strlen(s->in_repo_path), 1) == 0)
2467 74cfe85e 2020-10-20 stsp err = got_path_dirname(&parent_path, s->in_repo_path);
2469 74cfe85e 2020-10-20 stsp return err;
2470 74cfe85e 2020-10-20 stsp err = stop_log_thread(s);
2471 74cfe85e 2020-10-20 stsp if (err) {
2472 74cfe85e 2020-10-20 stsp free(parent_path);
2473 74cfe85e 2020-10-20 stsp return err;
2475 74cfe85e 2020-10-20 stsp lv = view_open(view->nlines, view->ncols,
2476 74cfe85e 2020-10-20 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2477 74cfe85e 2020-10-20 stsp if (lv == NULL) {
2478 74cfe85e 2020-10-20 stsp free(parent_path);
2479 74cfe85e 2020-10-20 stsp return got_error_from_errno("view_open");
2481 78756c87 2020-11-24 stsp err = open_log_view(lv, s->start_id, s->repo, s->head_ref_name,
2482 78756c87 2020-11-24 stsp parent_path, s->log_branches);
2483 74cfe85e 2020-10-20 stsp free(parent_path);
2485 74cfe85e 2020-10-20 stsp return err;;
2486 e78dc838 2020-12-04 stsp view->focussed = 0;
2487 e78dc838 2020-12-04 stsp lv->focussed = 1;
2488 74cfe85e 2020-10-20 stsp if (view_is_parent_view(view))
2489 74cfe85e 2020-10-20 stsp *new_view = lv;
2491 74cfe85e 2020-10-20 stsp view_set_child(view->parent, lv);
2493 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2494 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2496 d01904d4 2019-06-25 stsp return err;
2497 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2498 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2499 d01904d4 2019-06-25 stsp if (lv == NULL)
2500 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2501 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&start_id, NULL,
2502 71a27632 2020-01-15 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2503 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2504 ef129c5e 2019-08-03 stsp if (err) {
2505 ef129c5e 2019-08-03 stsp view_close(lv);
2506 d01904d4 2019-06-25 stsp return err;
2508 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2509 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2510 e6b23735 2019-10-04 stsp free(start_id);
2511 e6b23735 2019-10-04 stsp view_close(lv);
2512 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2514 78756c87 2020-11-24 stsp err = open_log_view(lv, start_id, s->repo, s->head_ref_name,
2515 78756c87 2020-11-24 stsp in_repo_path, s->log_branches);
2516 ef129c5e 2019-08-03 stsp if (err) {
2517 ef129c5e 2019-08-03 stsp free(start_id);
2518 b672a97a 2020-01-27 stsp view_close(lv);
2519 b672a97a 2020-01-27 stsp return err;;
2521 9970f7fc 2020-12-03 stsp view->dying = 1;
2522 b672a97a 2020-01-27 stsp *new_view = lv;
2525 b672a97a 2020-01-27 stsp s->log_branches = !s->log_branches;
2526 b672a97a 2020-01-27 stsp err = stop_log_thread(s);
2528 b672a97a 2020-01-27 stsp return err;
2529 b672a97a 2020-01-27 stsp lv = view_open(view->nlines, view->ncols,
2530 b672a97a 2020-01-27 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2531 b672a97a 2020-01-27 stsp if (lv == NULL)
2532 b672a97a 2020-01-27 stsp return got_error_from_errno("view_open");
2533 78756c87 2020-11-24 stsp err = open_log_view(lv, s->start_id, s->repo,
2534 f135c941 2020-02-20 stsp s->head_ref_name, s->in_repo_path, s->log_branches);
2535 b672a97a 2020-01-27 stsp if (err) {
2536 ef129c5e 2019-08-03 stsp view_close(lv);
2537 d01904d4 2019-06-25 stsp return err;;
2539 9970f7fc 2020-12-03 stsp view->dying = 1;
2540 d01904d4 2019-06-25 stsp *new_view = lv;
2543 6458efa5 2020-11-24 stsp if (view_is_parent_view(view))
2544 6458efa5 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
2545 6458efa5 2020-11-24 stsp ref_view = view_open(view->nlines, view->ncols,
2546 6458efa5 2020-11-24 stsp view->begin_y, begin_x, TOG_VIEW_REF);
2547 6458efa5 2020-11-24 stsp if (ref_view == NULL)
2548 6458efa5 2020-11-24 stsp return got_error_from_errno("view_open");
2549 6458efa5 2020-11-24 stsp err = open_ref_view(ref_view, s->repo);
2550 6458efa5 2020-11-24 stsp if (err) {
2551 6458efa5 2020-11-24 stsp view_close(ref_view);
2552 6458efa5 2020-11-24 stsp return err;
2554 e78dc838 2020-12-04 stsp view->focussed = 0;
2555 e78dc838 2020-12-04 stsp ref_view->focussed = 1;
2556 6458efa5 2020-11-24 stsp if (view_is_parent_view(view)) {
2557 6458efa5 2020-11-24 stsp err = view_close_child(view);
2559 6458efa5 2020-11-24 stsp return err;
2560 72a9cb46 2020-12-03 stsp view_set_child(view, ref_view);
2561 e78dc838 2020-12-04 stsp view->focus_child = 1;
2563 6458efa5 2020-11-24 stsp *new_view = ref_view;
2569 80ddbec8 2018-04-29 stsp return err;
2572 4ed7e80c 2018-05-20 stsp static const struct got_error *
2573 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2575 c2db6724 2019-01-04 stsp const struct got_error *error;
2577 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2578 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2579 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2581 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2582 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2584 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2585 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2587 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2588 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2590 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2591 c2db6724 2019-01-04 stsp if (error != NULL)
2592 c2db6724 2019-01-04 stsp return error;
2594 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2595 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2597 c2db6724 2019-01-04 stsp return NULL;
2600 a915003a 2019-02-05 stsp static void
2601 a915003a 2019-02-05 stsp init_curses(void)
2603 a915003a 2019-02-05 stsp initscr();
2605 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2608 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2609 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2610 a915003a 2019-02-05 stsp curs_set(0);
2611 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2612 6d17833f 2019-11-08 stsp start_color();
2613 6d17833f 2019-11-08 stsp use_default_colors();
2615 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2616 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2617 61266923 2020-01-14 stsp signal(SIGCONT, tog_sigcont);
2620 c2db6724 2019-01-04 stsp static const struct got_error *
2621 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2622 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2624 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2626 f135c941 2020-02-20 stsp if (argc == 0) {
2627 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2628 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2629 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2630 f135c941 2020-02-20 stsp return NULL;
2633 f135c941 2020-02-20 stsp if (worktree) {
2634 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2637 bfd61697 2020-11-14 stsp err = got_worktree_resolve_path(&p, worktree, argv[0]);
2639 f135c941 2020-02-20 stsp return err;
2640 bfd61697 2020-11-14 stsp if (asprintf(in_repo_path, "%s%s%s", prefix,
2641 bfd61697 2020-11-14 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
2642 bfd61697 2020-11-14 stsp p) == -1) {
2643 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2644 bfd61697 2020-11-14 stsp *in_repo_path = NULL;
2648 8fa913ec 2020-11-14 stsp err = got_repo_map_path(in_repo_path, repo, argv[0]);
2650 f135c941 2020-02-20 stsp return err;
2653 f135c941 2020-02-20 stsp static const struct got_error *
2654 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2656 80ddbec8 2018-04-29 stsp const struct got_error *error;
2657 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2658 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2659 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2660 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2661 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2662 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2663 04cc582a 2018-08-01 stsp struct tog_view *view;
2665 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2666 80ddbec8 2018-04-29 stsp switch (ch) {
2668 b672a97a 2020-01-27 stsp log_branches = 1;
2671 80ddbec8 2018-04-29 stsp start_commit = optarg;
2674 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2675 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2676 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2680 17020d27 2019-03-07 stsp usage_log();
2681 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2685 80ddbec8 2018-04-29 stsp argc -= optind;
2686 80ddbec8 2018-04-29 stsp argv += optind;
2688 f135c941 2020-02-20 stsp if (argc > 1)
2689 f135c941 2020-02-20 stsp usage_log();
2691 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2692 6962eb72 2020-02-20 stsp if (cwd == NULL)
2693 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
2695 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2696 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2697 963f97a1 2019-03-18 stsp goto done;
2699 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2700 a1fbf39a 2019-08-11 stsp if (worktree)
2701 6962eb72 2020-02-20 stsp repo_path =
2702 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2704 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2706 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2707 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2708 963f97a1 2019-03-18 stsp goto done;
2711 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2712 80ddbec8 2018-04-29 stsp if (error != NULL)
2713 ecb28ae0 2018-07-16 stsp goto done;
2715 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2716 f135c941 2020-02-20 stsp repo, worktree);
2717 f135c941 2020-02-20 stsp if (error)
2718 f135c941 2020-02-20 stsp goto done;
2720 f135c941 2020-02-20 stsp init_curses();
2722 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2723 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2724 c02c541e 2019-03-29 stsp if (error)
2725 c02c541e 2019-03-29 stsp goto done;
2727 15a94983 2018-12-23 stsp if (start_commit == NULL)
2728 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, worktree ?
2729 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2730 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2732 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, start_commit,
2733 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2734 80ddbec8 2018-04-29 stsp if (error != NULL)
2735 8b473291 2019-02-21 stsp goto done;
2737 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2738 04cc582a 2018-08-01 stsp if (view == NULL) {
2739 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2740 04cc582a 2018-08-01 stsp goto done;
2742 2fc00ff4 2019-08-31 stsp if (worktree) {
2743 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2744 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2745 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2746 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2747 2fc00ff4 2019-08-31 stsp goto done;
2750 78756c87 2020-11-24 stsp error = open_log_view(view, start_id, repo, head_ref_name,
2751 f135c941 2020-02-20 stsp in_repo_path, log_branches);
2752 ba4f502b 2018-08-04 stsp if (error)
2753 ba4f502b 2018-08-04 stsp goto done;
2754 2fc00ff4 2019-08-31 stsp if (worktree) {
2755 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2756 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2757 2fc00ff4 2019-08-31 stsp worktree = NULL;
2759 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2761 f135c941 2020-02-20 stsp free(in_repo_path);
2762 ecb28ae0 2018-07-16 stsp free(repo_path);
2763 ecb28ae0 2018-07-16 stsp free(cwd);
2764 899d86c2 2018-05-10 stsp free(start_id);
2765 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2767 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2768 ec142235 2019-03-07 stsp if (worktree)
2769 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2770 80ddbec8 2018-04-29 stsp return error;
2773 4ed7e80c 2018-05-20 stsp __dead static void
2774 9f7d7167 2018-04-29 stsp usage_diff(void)
2777 3dbaef42 2020-11-24 stsp fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
2778 3dbaef42 2020-11-24 stsp "[-w] object1 object2\n", getprogname());
2782 b304db33 2018-05-20 stsp static char *
2783 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2785 b304db33 2018-05-20 stsp char *line;
2786 b304db33 2018-05-20 stsp size_t linelen;
2787 b304db33 2018-05-20 stsp size_t lineno;
2788 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2790 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2792 b304db33 2018-05-20 stsp *len = linelen;
2793 b304db33 2018-05-20 stsp return line;
2796 6d17833f 2019-11-08 stsp static int
2797 41605754 2020-11-12 stsp match_line(const char *line, regex_t *regex, size_t nmatch,
2798 41605754 2020-11-12 stsp regmatch_t *regmatch)
2800 41605754 2020-11-12 stsp return regexec(regex, line, nmatch, regmatch, 0) == 0;
2803 f26dddb7 2019-11-08 stsp struct tog_color *
2804 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
2806 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
2808 6d17833f 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
2809 41605754 2020-11-12 stsp if (match_line(line, &tc->regex, 0, NULL))
2810 6d17833f 2019-11-08 stsp return tc;
2813 6d17833f 2019-11-08 stsp return NULL;
2816 4ed7e80c 2018-05-20 stsp static const struct got_error *
2817 41605754 2020-11-12 stsp add_matched_line(int *wtotal, const char *line, int wlimit, int col_tab_align,
2818 41605754 2020-11-12 stsp WINDOW *window, regmatch_t *regmatch)
2820 41605754 2020-11-12 stsp const struct got_error *err = NULL;
2821 41605754 2020-11-12 stsp wchar_t *wline;
2822 41605754 2020-11-12 stsp int width;
2825 41605754 2020-11-12 stsp *wtotal = 0;
2827 41605754 2020-11-12 stsp s = strndup(line, regmatch->rm_so);
2828 41605754 2020-11-12 stsp if (s == NULL)
2829 41605754 2020-11-12 stsp return got_error_from_errno("strndup");
2831 41605754 2020-11-12 stsp err = format_line(&wline, &width, s, wlimit, col_tab_align);
2832 41605754 2020-11-12 stsp if (err) {
2834 41605754 2020-11-12 stsp return err;
2836 41605754 2020-11-12 stsp waddwstr(window, wline);
2837 41605754 2020-11-12 stsp free(wline);
2839 41605754 2020-11-12 stsp wlimit -= width;
2840 41605754 2020-11-12 stsp *wtotal += width;
2842 41605754 2020-11-12 stsp if (wlimit > 0) {
2843 41605754 2020-11-12 stsp s = strndup(line + regmatch->rm_so,
2844 41605754 2020-11-12 stsp regmatch->rm_eo - regmatch->rm_so);
2845 41605754 2020-11-12 stsp if (s == NULL) {
2846 41605754 2020-11-12 stsp err = got_error_from_errno("strndup");
2848 41605754 2020-11-12 stsp return err;
2850 41605754 2020-11-12 stsp err = format_line(&wline, &width, s, wlimit, col_tab_align);
2851 41605754 2020-11-12 stsp if (err) {
2853 41605754 2020-11-12 stsp return err;
2855 41605754 2020-11-12 stsp wattr_on(window, A_STANDOUT, NULL);
2856 41605754 2020-11-12 stsp waddwstr(window, wline);
2857 41605754 2020-11-12 stsp wattr_off(window, A_STANDOUT, NULL);
2858 41605754 2020-11-12 stsp free(wline);
2860 41605754 2020-11-12 stsp wlimit -= width;
2861 41605754 2020-11-12 stsp *wtotal += width;
2864 41605754 2020-11-12 stsp if (wlimit > 0 && strlen(line) > regmatch->rm_eo) {
2865 41605754 2020-11-12 stsp err = format_line(&wline, &width,
2866 41605754 2020-11-12 stsp line + regmatch->rm_eo, wlimit, col_tab_align);
2868 41605754 2020-11-12 stsp return err;
2869 41605754 2020-11-12 stsp waddwstr(window, wline);
2870 41605754 2020-11-12 stsp free(wline);
2871 41605754 2020-11-12 stsp *wtotal += width;
2874 41605754 2020-11-12 stsp return NULL;
2877 41605754 2020-11-12 stsp static const struct got_error *
2878 89f1a395 2020-12-01 naddy draw_file(struct tog_view *view, const char *header)
2880 89f1a395 2020-12-01 naddy struct tog_diff_view_state *s = &view->state.diff;
2881 89f1a395 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
2882 61e69b96 2018-05-20 stsp const struct got_error *err;
2883 fe621944 2020-11-10 stsp int nprinted = 0;
2884 b304db33 2018-05-20 stsp char *line;
2885 f26dddb7 2019-11-08 stsp struct tog_color *tc;
2886 b304db33 2018-05-20 stsp size_t len;
2887 61e69b96 2018-05-20 stsp wchar_t *wline;
2888 e0b650dd 2018-05-20 stsp int width;
2889 89f1a395 2020-12-01 naddy int max_lines = view->nlines;
2890 89f1a395 2020-12-01 naddy int nlines = s->nlines;
2891 fe621944 2020-11-10 stsp off_t line_offset;
2893 89f1a395 2020-12-01 naddy line_offset = s->line_offsets[s->first_displayed_line - 1];
2894 89f1a395 2020-12-01 naddy if (fseeko(s->f, line_offset, SEEK_SET) == -1)
2895 fe621944 2020-11-10 stsp return got_error_from_errno("fseek");
2897 f7d12f7e 2018-08-01 stsp werase(view->window);
2899 a3404814 2018-09-02 stsp if (header) {
2900 135a2da0 2020-11-11 stsp if (asprintf(&line, "[%d/%d] %s",
2901 89f1a395 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, nlines,
2902 135a2da0 2020-11-11 stsp header) == -1)
2903 135a2da0 2020-11-11 stsp return got_error_from_errno("asprintf");
2904 135a2da0 2020-11-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2905 135a2da0 2020-11-11 stsp free(line);
2907 a3404814 2018-09-02 stsp return err;
2909 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2910 a3404814 2018-09-02 stsp wstandout(view->window);
2911 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2912 e54cc94a 2020-11-11 stsp free(wline);
2913 e54cc94a 2020-11-11 stsp wline = NULL;
2914 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2915 a3404814 2018-09-02 stsp wstandend(view->window);
2916 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2917 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2919 a3404814 2018-09-02 stsp if (max_lines <= 1)
2920 a3404814 2018-09-02 stsp return NULL;
2921 a3404814 2018-09-02 stsp max_lines--;
2924 89f1a395 2020-12-01 naddy s->eof = 0;
2925 fe621944 2020-11-10 stsp while (max_lines > 0 && nprinted < max_lines) {
2926 89f1a395 2020-12-01 naddy line = parse_next_line(s->f, &len);
2927 26ed57b2 2018-05-19 stsp if (line == NULL) {
2928 89f1a395 2020-12-01 naddy s->eof = 1;
2932 89f1a395 2020-12-01 naddy tc = match_color(&s->colors, line);
2934 f26dddb7 2019-11-08 stsp wattr_on(view->window,
2935 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2936 89f1a395 2020-12-01 naddy if (s->first_displayed_line + nprinted == s->matched_line &&
2937 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
2938 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols, 0,
2939 41605754 2020-11-12 stsp view->window, regmatch);
2940 41605754 2020-11-12 stsp if (err) {
2941 41605754 2020-11-12 stsp free(line);
2942 41605754 2020-11-12 stsp return err;
2945 41605754 2020-11-12 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2946 41605754 2020-11-12 stsp if (err) {
2947 41605754 2020-11-12 stsp free(line);
2948 41605754 2020-11-12 stsp return err;
2950 41605754 2020-11-12 stsp waddwstr(view->window, wline);
2951 41605754 2020-11-12 stsp free(wline);
2952 41605754 2020-11-12 stsp wline = NULL;
2955 6d17833f 2019-11-08 stsp wattr_off(view->window,
2956 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2957 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2958 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2959 fe621944 2020-11-10 stsp nprinted++;
2960 26ed57b2 2018-05-19 stsp free(line);
2962 fe621944 2020-11-10 stsp if (nprinted >= 1)
2963 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line +
2964 89f1a395 2020-12-01 naddy (nprinted - 1);
2966 89f1a395 2020-12-01 naddy s->last_displayed_line = s->first_displayed_line;
2968 1a57306a 2018-09-02 stsp view_vborder(view);
2970 89f1a395 2020-12-01 naddy if (s->eof) {
2971 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2972 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2973 c3e9aa98 2019-05-13 jcs nprinted++;
2976 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2978 c3e9aa98 2019-05-13 jcs return err;
2981 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2982 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2983 e54cc94a 2020-11-11 stsp free(wline);
2984 e54cc94a 2020-11-11 stsp wline = NULL;
2985 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2988 26ed57b2 2018-05-19 stsp return NULL;
2991 abd2672a 2018-12-23 stsp static char *
2992 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2994 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2995 09867e48 2019-08-13 stsp char *p, *s;
2997 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2998 09867e48 2019-08-13 stsp if (tm == NULL)
2999 09867e48 2019-08-13 stsp return NULL;
3000 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
3001 09867e48 2019-08-13 stsp if (s == NULL)
3002 09867e48 2019-08-13 stsp return NULL;
3003 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
3005 abd2672a 2018-12-23 stsp *p = '\0';
3009 4ed7e80c 2018-05-20 stsp static const struct got_error *
3010 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
3011 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
3013 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
3014 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3015 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3016 0208f208 2020-05-05 stsp struct got_object_qid *qid;
3018 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3019 0208f208 2020-05-05 stsp if (qid != NULL) {
3020 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3021 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3024 0208f208 2020-05-05 stsp return err;
3026 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3027 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3031 0208f208 2020-05-05 stsp if (tree_id1) {
3032 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3034 0208f208 2020-05-05 stsp goto done;
3037 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3038 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3040 0208f208 2020-05-05 stsp goto done;
3042 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3043 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3045 0208f208 2020-05-05 stsp if (tree1)
3046 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3047 0208f208 2020-05-05 stsp if (tree2)
3048 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3049 0208f208 2020-05-05 stsp return err;
3052 0208f208 2020-05-05 stsp static const struct got_error *
3053 fe621944 2020-11-10 stsp add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
3057 fe621944 2020-11-10 stsp p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
3058 fe621944 2020-11-10 stsp if (p == NULL)
3059 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
3060 fe621944 2020-11-10 stsp *line_offsets = p;
3061 fe621944 2020-11-10 stsp (*line_offsets)[*nlines] = off;
3062 fe621944 2020-11-10 stsp (*nlines)++;
3063 fe621944 2020-11-10 stsp return NULL;
3066 fe621944 2020-11-10 stsp static const struct got_error *
3067 fe621944 2020-11-10 stsp write_commit_info(off_t **line_offsets, size_t *nlines,
3068 fe621944 2020-11-10 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3069 fe621944 2020-11-10 stsp struct got_repository *repo, FILE *outfile)
3071 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
3072 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
3073 15a94983 2018-12-23 stsp struct got_commit_object *commit;
3074 fe621944 2020-11-10 stsp char *id_str = NULL, *logmsg = NULL, *s = NULL, *line;
3075 45d799e2 2018-12-23 stsp time_t committer_time;
3076 45d799e2 2018-12-23 stsp const char *author, *committer;
3077 8b473291 2019-02-21 stsp char *refs_str = NULL;
3078 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3079 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3080 fe621944 2020-11-10 stsp off_t outoff = 0;
3083 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3085 8b473291 2019-02-21 stsp if (refs) {
3086 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
3088 8b473291 2019-02-21 stsp return err;
3091 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3093 abd2672a 2018-12-23 stsp return err;
3095 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
3096 15a94983 2018-12-23 stsp if (err) {
3097 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
3098 15a94983 2018-12-23 stsp goto done;
3101 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, 0);
3103 fe621944 2020-11-10 stsp goto done;
3105 fe621944 2020-11-10 stsp n = fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3106 fe621944 2020-11-10 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3107 fe621944 2020-11-10 stsp if (n < 0) {
3108 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3109 abd2672a 2018-12-23 stsp goto done;
3111 fe621944 2020-11-10 stsp outoff += n;
3112 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3114 fe621944 2020-11-10 stsp goto done;
3116 fe621944 2020-11-10 stsp n = fprintf(outfile, "from: %s\n",
3117 fe621944 2020-11-10 stsp got_object_commit_get_author(commit));
3118 fe621944 2020-11-10 stsp if (n < 0) {
3119 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3120 abd2672a 2018-12-23 stsp goto done;
3122 fe621944 2020-11-10 stsp outoff += n;
3123 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3125 fe621944 2020-11-10 stsp goto done;
3127 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3128 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
3129 fe621944 2020-11-10 stsp if (datestr) {
3130 fe621944 2020-11-10 stsp n = fprintf(outfile, "date: %s UTC\n", datestr);
3131 fe621944 2020-11-10 stsp if (n < 0) {
3132 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3133 fe621944 2020-11-10 stsp goto done;
3135 fe621944 2020-11-10 stsp outoff += n;
3136 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3138 fe621944 2020-11-10 stsp goto done;
3140 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3141 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3142 fe621944 2020-11-10 stsp if (strcmp(author, committer) != 0) {
3143 fe621944 2020-11-10 stsp n = fprintf(outfile, "via: %s\n", committer);
3144 fe621944 2020-11-10 stsp if (n < 0) {
3145 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3146 fe621944 2020-11-10 stsp goto done;
3148 fe621944 2020-11-10 stsp outoff += n;
3149 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3151 fe621944 2020-11-10 stsp goto done;
3153 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
3155 5943eee2 2019-08-13 stsp goto done;
3156 fe621944 2020-11-10 stsp s = logmsg;
3157 fe621944 2020-11-10 stsp while ((line = strsep(&s, "\n")) != NULL) {
3158 fe621944 2020-11-10 stsp n = fprintf(outfile, "%s\n", line);
3159 fe621944 2020-11-10 stsp if (n < 0) {
3160 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3161 fe621944 2020-11-10 stsp goto done;
3163 fe621944 2020-11-10 stsp outoff += n;
3164 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3166 fe621944 2020-11-10 stsp goto done;
3169 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3171 0208f208 2020-05-05 stsp goto done;
3172 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3173 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3174 fe621944 2020-11-10 stsp n = fprintf(outfile, "%c %s\n", cp->status, pe->path);
3175 fe621944 2020-11-10 stsp if (n < 0) {
3176 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3177 fe621944 2020-11-10 stsp goto done;
3179 fe621944 2020-11-10 stsp outoff += n;
3180 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3182 fe621944 2020-11-10 stsp goto done;
3183 0208f208 2020-05-05 stsp free((char *)pe->path);
3184 0208f208 2020-05-05 stsp free(pe->data);
3187 0208f208 2020-05-05 stsp fputc('\n', outfile);
3189 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3191 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3192 abd2672a 2018-12-23 stsp free(id_str);
3193 5943eee2 2019-08-13 stsp free(logmsg);
3194 8b473291 2019-02-21 stsp free(refs_str);
3195 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3196 7510f233 2020-08-09 stsp if (err) {
3197 ae6a6978 2020-08-09 stsp free(*line_offsets);
3198 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3199 ae6a6978 2020-08-09 stsp *nlines = 0;
3201 fe621944 2020-11-10 stsp return err;
3204 abd2672a 2018-12-23 stsp static const struct got_error *
3205 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
3207 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
3208 48ae06ee 2018-10-18 stsp FILE *f = NULL;
3209 15a94983 2018-12-23 stsp int obj_type;
3211 fe621944 2020-11-10 stsp free(s->line_offsets);
3212 fe621944 2020-11-10 stsp s->line_offsets = malloc(sizeof(off_t));
3213 fe621944 2020-11-10 stsp if (s->line_offsets == NULL)
3214 fe621944 2020-11-10 stsp return got_error_from_errno("malloc");
3215 fe621944 2020-11-10 stsp s->nlines = 0;
3217 511a516b 2018-05-19 stsp f = got_opentemp();
3218 48ae06ee 2018-10-18 stsp if (f == NULL) {
3219 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3220 48ae06ee 2018-10-18 stsp goto done;
3222 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
3223 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3224 fb43ecf1 2019-02-11 stsp goto done;
3228 15a94983 2018-12-23 stsp if (s->id1)
3229 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3231 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3233 15a94983 2018-12-23 stsp goto done;
3235 15a94983 2018-12-23 stsp switch (obj_type) {
3236 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3237 fe621944 2020-11-10 stsp err = got_diff_objects_as_blobs(&s->line_offsets, &s->nlines,
3238 3dbaef42 2020-11-24 stsp s->id1, s->id2, s->label1, s->label2, s->diff_context,
3239 3dbaef42 2020-11-24 stsp s->ignore_whitespace, s->force_text_diff, s->repo, s->f);
3241 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3242 fe621944 2020-11-10 stsp err = got_diff_objects_as_trees(&s->line_offsets, &s->nlines,
3243 3dbaef42 2020-11-24 stsp s->id1, s->id2, "", "", s->diff_context,
3244 3dbaef42 2020-11-24 stsp s->ignore_whitespace, s->force_text_diff, s->repo, s->f);
3246 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3247 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3248 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3249 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3251 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3253 3ffacbe1 2020-02-02 tracey goto done;
3254 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3255 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3256 fe621944 2020-11-10 stsp err = write_commit_info(&s->line_offsets, &s->nlines,
3257 78756c87 2020-11-24 stsp s->id2, &s->refs, s->repo, s->f);
3258 f44b1f58 2020-02-02 tracey if (err)
3259 f44b1f58 2020-02-02 tracey goto done;
3260 f44b1f58 2020-02-02 tracey } else {
3261 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3262 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3263 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
3264 fe621944 2020-11-10 stsp err = write_commit_info(
3265 fe621944 2020-11-10 stsp &s->line_offsets, &s->nlines,
3266 78756c87 2020-11-24 stsp s->id2, &s->refs, s->repo, s->f);
3267 f44b1f58 2020-02-02 tracey if (err)
3268 f44b1f58 2020-02-02 tracey goto done;
3273 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3275 fe621944 2020-11-10 stsp err = got_diff_objects_as_commits(&s->line_offsets, &s->nlines,
3276 3dbaef42 2020-11-24 stsp s->id1, s->id2, s->diff_context, s->ignore_whitespace,
3277 3dbaef42 2020-11-24 stsp s->force_text_diff, s->repo, s->f);
3281 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3284 f44b1f58 2020-02-02 tracey if (err)
3285 f44b1f58 2020-02-02 tracey goto done;
3287 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3288 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3289 48ae06ee 2018-10-18 stsp return err;
3292 f5215bb9 2019-02-22 stsp static void
3293 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3295 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3296 f5215bb9 2019-02-22 stsp update_panels();
3297 f5215bb9 2019-02-22 stsp doupdate();
3300 f44b1f58 2020-02-02 tracey static const struct got_error *
3301 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3303 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3305 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3306 f44b1f58 2020-02-02 tracey return NULL;
3309 f44b1f58 2020-02-02 tracey static const struct got_error *
3310 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3312 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3313 f44b1f58 2020-02-02 tracey int lineno;
3315 f44b1f58 2020-02-02 tracey if (!view->searching) {
3316 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3317 f44b1f58 2020-02-02 tracey return NULL;
3320 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3321 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3322 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3324 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3325 f44b1f58 2020-02-02 tracey } else {
3326 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3327 f44b1f58 2020-02-02 tracey lineno = 1;
3329 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3332 f44b1f58 2020-02-02 tracey while (1) {
3333 f44b1f58 2020-02-02 tracey char *line = NULL;
3334 f44b1f58 2020-02-02 tracey off_t offset;
3335 f44b1f58 2020-02-02 tracey size_t len;
3337 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3338 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3339 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3340 f44b1f58 2020-02-02 tracey free(line);
3344 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3345 f44b1f58 2020-02-02 tracey lineno = 1;
3347 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3350 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3351 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3352 f44b1f58 2020-02-02 tracey free(line);
3353 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3355 f44b1f58 2020-02-02 tracey free(line);
3356 f44b1f58 2020-02-02 tracey line = parse_next_line(s->f, &len);
3357 41605754 2020-11-12 stsp if (line &&
3358 41605754 2020-11-12 stsp match_line(line, &view->regex, 1, &view->regmatch)) {
3359 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3360 f44b1f58 2020-02-02 tracey s->matched_line = lineno;
3361 f44b1f58 2020-02-02 tracey free(line);
3364 f44b1f58 2020-02-02 tracey free(line);
3365 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3366 f44b1f58 2020-02-02 tracey lineno++;
3368 f44b1f58 2020-02-02 tracey lineno--;
3371 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3372 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3373 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3376 f44b1f58 2020-02-02 tracey return NULL;
3379 48ae06ee 2018-10-18 stsp static const struct got_error *
3380 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3381 3dbaef42 2020-11-24 stsp struct got_object_id *id2, const char *label1, const char *label2,
3382 3dbaef42 2020-11-24 stsp int diff_context, int ignore_whitespace, int force_text_diff,
3383 78756c87 2020-11-24 stsp struct tog_view *log_view, struct got_repository *repo)
3385 48ae06ee 2018-10-18 stsp const struct got_error *err;
3386 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3388 78756c87 2020-11-24 stsp SIMPLEQ_INIT(&s->refs);
3390 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3391 15a94983 2018-12-23 stsp int type1, type2;
3392 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3394 15a94983 2018-12-23 stsp return err;
3395 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3397 15a94983 2018-12-23 stsp return err;
3399 15a94983 2018-12-23 stsp if (type1 != type2)
3400 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3402 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3403 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3404 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3405 f44b1f58 2020-02-02 tracey s->repo = repo;
3406 f44b1f58 2020-02-02 tracey s->id1 = id1;
3407 f44b1f58 2020-02-02 tracey s->id2 = id2;
3408 3dbaef42 2020-11-24 stsp s->label1 = label1;
3409 3dbaef42 2020-11-24 stsp s->label2 = label2;
3411 15a94983 2018-12-23 stsp if (id1) {
3412 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3413 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3414 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3416 5465d566 2020-02-01 tracey s->id1 = NULL;
3418 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3419 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3420 5465d566 2020-02-01 tracey free(s->id1);
3421 5465d566 2020-02-01 tracey s->id1 = NULL;
3422 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3424 5465d566 2020-02-01 tracey s->f = NULL;
3425 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3426 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3427 3dbaef42 2020-11-24 stsp s->diff_context = diff_context;
3428 3dbaef42 2020-11-24 stsp s->ignore_whitespace = ignore_whitespace;
3429 64453f7e 2020-11-21 stsp s->force_text_diff = force_text_diff;
3430 5465d566 2020-02-01 tracey s->log_view = log_view;
3431 5465d566 2020-02-01 tracey s->repo = repo;
3433 f44b1f58 2020-02-02 tracey SIMPLEQ_INIT(&s->colors);
3434 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3435 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3436 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3437 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3439 6d17833f 2019-11-08 stsp return err;
3440 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
3441 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
3442 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
3443 6d17833f 2019-11-08 stsp if (err) {
3444 5465d566 2020-02-01 tracey free_colors(&s->colors);
3445 6d17833f 2019-11-08 stsp return err;
3447 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3448 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3449 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3450 6d17833f 2019-11-08 stsp if (err) {
3451 5465d566 2020-02-01 tracey free_colors(&s->colors);
3452 6d17833f 2019-11-08 stsp return err;
3455 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3456 528c17dd 2020-07-31 stsp "^(commit [0-9a-f]|(blob|file) [-+] |[MDmA] [^ ])",
3457 0208f208 2020-05-05 stsp TOG_COLOR_DIFF_META,
3458 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3459 6d17833f 2019-11-08 stsp if (err) {
3460 5465d566 2020-02-01 tracey free_colors(&s->colors);
3461 6d17833f 2019-11-08 stsp return err;
3464 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3465 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3466 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3467 11b20872 2019-11-08 stsp if (err) {
3468 5465d566 2020-02-01 tracey free_colors(&s->colors);
3469 11b20872 2019-11-08 stsp return err;
3472 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3473 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3474 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3475 11b20872 2019-11-08 stsp if (err) {
3476 5465d566 2020-02-01 tracey free_colors(&s->colors);
3477 11b20872 2019-11-08 stsp return err;
3481 78756c87 2020-11-24 stsp err = got_ref_list(&s->refs, repo, NULL, got_ref_cmp_by_name, NULL);
3482 78756c87 2020-11-24 stsp if (err) {
3483 78756c87 2020-11-24 stsp free(s->id1);
3484 78756c87 2020-11-24 stsp s->id1 = NULL;
3485 78756c87 2020-11-24 stsp free(s->id2);
3486 78756c87 2020-11-24 stsp s->id2 = NULL;
3487 78756c87 2020-11-24 stsp free_colors(&s->colors);
3488 78756c87 2020-11-24 stsp return err;
3491 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3492 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3493 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3495 fe621944 2020-11-10 stsp s->line_offsets = NULL;
3496 fe621944 2020-11-10 stsp s->nlines = 0;
3497 5465d566 2020-02-01 tracey err = create_diff(s);
3498 48ae06ee 2018-10-18 stsp if (err) {
3499 5465d566 2020-02-01 tracey free(s->id1);
3500 5465d566 2020-02-01 tracey s->id1 = NULL;
3501 5465d566 2020-02-01 tracey free(s->id2);
3502 5465d566 2020-02-01 tracey s->id2 = NULL;
3503 78756c87 2020-11-24 stsp free_colors(&s->colors);
3504 78756c87 2020-11-24 stsp got_ref_list_free(&s->refs);
3505 48ae06ee 2018-10-18 stsp return err;
3508 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3509 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3510 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3511 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3512 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3514 5dc9f4bc 2018-08-04 stsp return NULL;
3517 e5a0f69f 2018-08-18 stsp static const struct got_error *
3518 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
3520 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3521 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3523 5465d566 2020-02-01 tracey free(s->id1);
3524 5465d566 2020-02-01 tracey s->id1 = NULL;
3525 5465d566 2020-02-01 tracey free(s->id2);
3526 5465d566 2020-02-01 tracey s->id2 = NULL;
3527 5465d566 2020-02-01 tracey if (s->f && fclose(s->f) == EOF)
3528 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3529 5465d566 2020-02-01 tracey free_colors(&s->colors);
3530 f44b1f58 2020-02-02 tracey free(s->line_offsets);
3531 fe621944 2020-11-10 stsp s->line_offsets = NULL;
3532 fe621944 2020-11-10 stsp s->nlines = 0;
3533 78756c87 2020-11-24 stsp got_ref_list_free(&s->refs);
3534 e5a0f69f 2018-08-18 stsp return err;
3537 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3538 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3540 a3404814 2018-09-02 stsp const struct got_error *err;
3541 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3542 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3543 3dbaef42 2020-11-24 stsp const char *label1, *label2;
3545 a3404814 2018-09-02 stsp if (s->id1) {
3546 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3548 a3404814 2018-09-02 stsp return err;
3549 3dbaef42 2020-11-24 stsp label1 = s->label1 ? : id_str1;
3551 3dbaef42 2020-11-24 stsp label1 = "/dev/null";
3553 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3555 a3404814 2018-09-02 stsp return err;
3556 3dbaef42 2020-11-24 stsp label2 = s->label2 ? : id_str2;
3558 3dbaef42 2020-11-24 stsp if (asprintf(&header, "diff %s %s", label1, label2) == -1) {
3559 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3560 a3404814 2018-09-02 stsp free(id_str1);
3561 a3404814 2018-09-02 stsp free(id_str2);
3562 a3404814 2018-09-02 stsp return err;
3564 a3404814 2018-09-02 stsp free(id_str1);
3565 a3404814 2018-09-02 stsp free(id_str2);
3567 89f1a395 2020-12-01 naddy return draw_file(view, header);
3570 15a087fe 2019-02-21 stsp static const struct got_error *
3571 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3572 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3574 d7a04538 2019-02-21 stsp const struct got_error *err;
3575 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3576 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3577 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3579 15a087fe 2019-02-21 stsp free(s->id2);
3580 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3581 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3582 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3584 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3586 d7a04538 2019-02-21 stsp return err;
3587 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3588 15a087fe 2019-02-21 stsp free(s->id1);
3589 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
3590 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3591 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3592 15a087fe 2019-02-21 stsp return NULL;
3595 0cf4efb1 2018-09-29 stsp static const struct got_error *
3596 e78dc838 2020-12-04 stsp input_diff_view(struct tog_view **new_view, struct tog_view *view, int ch)
3598 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3599 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3600 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3601 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
3604 e5a0f69f 2018-08-18 stsp switch (ch) {
3607 3dbaef42 2020-11-24 stsp if (ch == 'a')
3608 3dbaef42 2020-11-24 stsp s->force_text_diff = !s->force_text_diff;
3609 3dbaef42 2020-11-24 stsp if (ch == 'w')
3610 3dbaef42 2020-11-24 stsp s->ignore_whitespace = !s->ignore_whitespace;
3611 64453f7e 2020-11-21 stsp wclear(view->window);
3612 64453f7e 2020-11-21 stsp s->first_displayed_line = 1;
3613 64453f7e 2020-11-21 stsp s->last_displayed_line = view->nlines;
3614 64453f7e 2020-11-21 stsp diff_view_indicate_progress(view);
3615 64453f7e 2020-11-21 stsp err = create_diff(s);
3618 1e37a5c2 2019-05-12 jcs case KEY_UP:
3619 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
3620 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3622 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3623 a60a9dc4 2019-05-13 jcs case CTRL('b'):
3624 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
3627 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
3628 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3629 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3632 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3633 1e37a5c2 2019-05-12 jcs if (!s->eof)
3634 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3636 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3637 a60a9dc4 2019-05-13 jcs case CTRL('f'):
3639 00ba99a7 2019-05-12 jcs if (s->eof)
3642 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
3643 1e37a5c2 2019-05-12 jcs char *line;
3644 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
3645 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3646 1e37a5c2 2019-05-12 jcs if (line == NULL)
3651 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
3652 1e37a5c2 2019-05-12 jcs s->diff_context--;
3653 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3654 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3655 27829c9e 2020-11-21 stsp if (s->first_displayed_line + view->nlines - 1 >
3656 27829c9e 2020-11-21 stsp s->nlines) {
3657 27829c9e 2020-11-21 stsp s->first_displayed_line = 1;
3658 27829c9e 2020-11-21 stsp s->last_displayed_line = view->nlines;
3663 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3664 1e37a5c2 2019-05-12 jcs s->diff_context++;
3665 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3666 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3671 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3673 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3674 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
3675 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
3676 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3679 e78dc838 2020-12-04 stsp err = input_log_view(NULL, s->log_view, KEY_UP);
3683 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3687 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3688 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3690 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3691 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3695 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3697 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3699 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3700 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
3701 ffe38506 2020-12-01 naddy err = trigger_log_thread(s->log_view, 1);
3705 e78dc838 2020-12-04 stsp err = input_log_view(NULL, s->log_view, KEY_DOWN);
3709 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
3710 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3713 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3717 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3718 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3720 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3721 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3727 bcbd79e2 2018-08-19 stsp return err;
3730 4ed7e80c 2018-05-20 stsp static const struct got_error *
3731 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
3733 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
3734 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
3735 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
3736 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3737 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
3738 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
3739 3dbaef42 2020-11-24 stsp char *label1 = NULL, *label2 = NULL;
3740 3dbaef42 2020-11-24 stsp int diff_context = 3, ignore_whitespace = 0;
3741 64453f7e 2020-11-21 stsp int ch, force_text_diff = 0;
3742 3dbaef42 2020-11-24 stsp const char *errstr;
3743 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
3745 3dbaef42 2020-11-24 stsp while ((ch = getopt(argc, argv, "aC:r:w")) != -1) {
3746 26ed57b2 2018-05-19 stsp switch (ch) {
3748 64453f7e 2020-11-21 stsp force_text_diff = 1;
3751 3dbaef42 2020-11-24 stsp diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3753 3dbaef42 2020-11-24 stsp if (errstr != NULL)
3754 3dbaef42 2020-11-24 stsp err(1, "-C option %s", errstr);
3756 09b5bff8 2020-02-23 naddy case 'r':
3757 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
3758 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
3759 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
3761 3dbaef42 2020-11-24 stsp got_path_strip_trailing_slashes(repo_path);
3764 3dbaef42 2020-11-24 stsp ignore_whitespace = 1;
3767 17020d27 2019-03-07 stsp usage_diff();
3768 26ed57b2 2018-05-19 stsp /* NOTREACHED */
3772 26ed57b2 2018-05-19 stsp argc -= optind;
3773 26ed57b2 2018-05-19 stsp argv += optind;
3775 26ed57b2 2018-05-19 stsp if (argc == 0) {
3776 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
3777 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
3778 15a94983 2018-12-23 stsp id_str1 = argv[0];
3779 15a94983 2018-12-23 stsp id_str2 = argv[1];
3781 26ed57b2 2018-05-19 stsp usage_diff();
3783 a273ac94 2020-02-23 naddy cwd = getcwd(NULL, 0);
3784 a273ac94 2020-02-23 naddy if (cwd == NULL)
3785 a273ac94 2020-02-23 naddy return got_error_from_errno("getcwd");
3787 a273ac94 2020-02-23 naddy error = got_worktree_open(&worktree, cwd);
3788 a273ac94 2020-02-23 naddy if (error && error->code != GOT_ERR_NOT_WORKTREE)
3789 a273ac94 2020-02-23 naddy goto done;
3791 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3792 a273ac94 2020-02-23 naddy if (worktree)
3793 a273ac94 2020-02-23 naddy repo_path =
3794 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
3796 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
3798 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3799 a273ac94 2020-02-23 naddy error = got_error_from_errno("strdup");
3800 a273ac94 2020-02-23 naddy goto done;
3803 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3804 eb6600df 2019-01-04 stsp if (error)
3805 eb6600df 2019-01-04 stsp goto done;
3807 a273ac94 2020-02-23 naddy init_curses();
3809 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3810 26ed57b2 2018-05-19 stsp if (error)
3811 26ed57b2 2018-05-19 stsp goto done;
3813 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id1, &label1, id_str1,
3814 3dbaef42 2020-11-24 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3815 26ed57b2 2018-05-19 stsp if (error)
3816 26ed57b2 2018-05-19 stsp goto done;
3818 3dbaef42 2020-11-24 stsp error = got_repo_match_object_id(&id2, &label2, id_str2,
3819 3dbaef42 2020-11-24 stsp GOT_OBJ_TYPE_ANY, 1, repo);
3820 26ed57b2 2018-05-19 stsp if (error)
3821 26ed57b2 2018-05-19 stsp goto done;
3823 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3824 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3825 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3826 ea5e7bb5 2018-08-01 stsp goto done;
3828 3dbaef42 2020-11-24 stsp error = open_diff_view(view, id1, id2, label1, label2, diff_context,
3829 78756c87 2020-11-24 stsp ignore_whitespace, force_text_diff, NULL, repo);
3830 5dc9f4bc 2018-08-04 stsp if (error)
3831 5dc9f4bc 2018-08-04 stsp goto done;
3832 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3834 3dbaef42 2020-11-24 stsp free(label1);
3835 3dbaef42 2020-11-24 stsp free(label2);
3836 c02c541e 2019-03-29 stsp free(repo_path);
3837 a273ac94 2020-02-23 naddy free(cwd);
3839 921be706 2019-06-28 stsp got_repo_close(repo);
3840 a273ac94 2020-02-23 naddy if (worktree)
3841 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
3842 26ed57b2 2018-05-19 stsp return error;
3845 4ed7e80c 2018-05-20 stsp __dead static void
3846 9f7d7167 2018-04-29 stsp usage_blame(void)
3849 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3850 9f7d7167 2018-04-29 stsp getprogname());
3854 84451b3e 2018-07-10 stsp struct tog_blame_line {
3855 84451b3e 2018-07-10 stsp int annotated;
3856 84451b3e 2018-07-10 stsp struct got_object_id *id;
3859 4ed7e80c 2018-05-20 stsp static const struct got_error *
3860 4f7c3e5e 2020-12-01 naddy draw_blame(struct tog_view *view)
3862 4f7c3e5e 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
3863 4f7c3e5e 2020-12-01 naddy struct tog_blame *blame = &s->blame;
3864 4f7c3e5e 2020-12-01 naddy regmatch_t *regmatch = &view->regmatch;
3865 84451b3e 2018-07-10 stsp const struct got_error *err;
3866 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3867 84451b3e 2018-07-10 stsp char *line;
3868 84451b3e 2018-07-10 stsp size_t len;
3869 84451b3e 2018-07-10 stsp wchar_t *wline;
3870 27a741e5 2019-09-11 stsp int width;
3871 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3872 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3873 ab089a2a 2018-07-12 stsp char *id_str;
3874 11b20872 2019-11-08 stsp struct tog_color *tc;
3876 4f7c3e5e 2020-12-01 naddy err = got_object_id_str(&id_str, s->blamed_commit->id);
3878 ab089a2a 2018-07-12 stsp return err;
3880 4f7c3e5e 2020-12-01 naddy rewind(blame->f);
3881 f7d12f7e 2018-08-01 stsp werase(view->window);
3883 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3884 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3885 ab089a2a 2018-07-12 stsp free(id_str);
3886 ab089a2a 2018-07-12 stsp return err;
3889 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3890 ab089a2a 2018-07-12 stsp free(line);
3891 2550e4c3 2018-07-13 stsp line = NULL;
3893 1cae65b4 2019-09-22 stsp return err;
3894 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3895 a3404814 2018-09-02 stsp wstandout(view->window);
3896 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
3898 11b20872 2019-11-08 stsp wattr_on(view->window,
3899 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3900 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3902 11b20872 2019-11-08 stsp wattr_off(view->window,
3903 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3904 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3905 a3404814 2018-09-02 stsp wstandend(view->window);
3906 2550e4c3 2018-07-13 stsp free(wline);
3907 2550e4c3 2018-07-13 stsp wline = NULL;
3908 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3909 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3911 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3912 4f7c3e5e 2020-12-01 naddy s->first_displayed_line - 1 + s->selected_line, blame->nlines,
3913 4f7c3e5e 2020-12-01 naddy s->blame_complete ? "" : "annotating... ", s->path) == -1) {
3914 ab089a2a 2018-07-12 stsp free(id_str);
3915 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3917 ab089a2a 2018-07-12 stsp free(id_str);
3918 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3919 3f60a8ef 2018-07-10 stsp free(line);
3920 2550e4c3 2018-07-13 stsp line = NULL;
3922 3f60a8ef 2018-07-10 stsp return err;
3923 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3924 2550e4c3 2018-07-13 stsp free(wline);
3925 2550e4c3 2018-07-13 stsp wline = NULL;
3926 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3927 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3929 4f7c3e5e 2020-12-01 naddy s->eof = 0;
3930 4f7c3e5e 2020-12-01 naddy while (nprinted < view->nlines - 2) {
3931 4f7c3e5e 2020-12-01 naddy line = parse_next_line(blame->f, &len);
3932 84451b3e 2018-07-10 stsp if (line == NULL) {
3933 4f7c3e5e 2020-12-01 naddy s->eof = 1;
3936 4f7c3e5e 2020-12-01 naddy if (++lineno < s->first_displayed_line) {
3937 84451b3e 2018-07-10 stsp free(line);
3941 4f7c3e5e 2020-12-01 naddy if (view->focussed && nprinted == s->selected_line - 1)
3942 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3944 4f7c3e5e 2020-12-01 naddy if (blame->nlines > 0) {
3945 4f7c3e5e 2020-12-01 naddy blame_line = &blame->lines[lineno - 1];
3946 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3947 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3948 27a741e5 2019-09-11 stsp !(view->focussed &&
3949 4f7c3e5e 2020-12-01 naddy nprinted == s->selected_line - 1)) {
3950 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3951 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3952 8d0fe45a 2019-08-12 stsp char *id_str;
3953 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3954 8d0fe45a 2019-08-12 stsp if (err) {
3955 8d0fe45a 2019-08-12 stsp free(line);
3956 8d0fe45a 2019-08-12 stsp return err;
3958 4f7c3e5e 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
3960 11b20872 2019-11-08 stsp wattr_on(view->window,
3961 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3962 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3964 11b20872 2019-11-08 stsp wattr_off(view->window,
3965 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3966 8d0fe45a 2019-08-12 stsp free(id_str);
3967 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3969 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3970 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3973 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3974 ee41ec32 2018-07-10 stsp prev_id = NULL;
3977 4f7c3e5e 2020-12-01 naddy if (view->focussed && nprinted == s->selected_line - 1)
3978 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3979 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3981 41605754 2020-11-12 stsp if (view->ncols <= 9) {
3982 41605754 2020-11-12 stsp width = 9;
3983 41605754 2020-11-12 stsp wline = wcsdup(L"");
3984 41605754 2020-11-12 stsp if (wline == NULL) {
3985 41605754 2020-11-12 stsp err = got_error_from_errno("wcsdup");
3986 41605754 2020-11-12 stsp free(line);
3987 41605754 2020-11-12 stsp return err;
3989 4f7c3e5e 2020-12-01 naddy } else if (s->first_displayed_line + nprinted ==
3990 4f7c3e5e 2020-12-01 naddy s->matched_line &&
3991 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
3992 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols - 9, 9,
3993 41605754 2020-11-12 stsp view->window, regmatch);
3994 41605754 2020-11-12 stsp if (err) {
3995 41605754 2020-11-12 stsp free(line);
3996 41605754 2020-11-12 stsp return err;
3998 41605754 2020-11-12 stsp width += 9;
4000 41605754 2020-11-12 stsp err = format_line(&wline, &width, line,
4001 41605754 2020-11-12 stsp view->ncols - 9, 9);
4002 41605754 2020-11-12 stsp waddwstr(view->window, wline);
4003 41605754 2020-11-12 stsp free(wline);
4004 41605754 2020-11-12 stsp wline = NULL;
4005 41605754 2020-11-12 stsp width += 9;
4008 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
4009 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
4010 84451b3e 2018-07-10 stsp if (++nprinted == 1)
4011 4f7c3e5e 2020-12-01 naddy s->first_displayed_line = lineno;
4012 84451b3e 2018-07-10 stsp free(line);
4014 4f7c3e5e 2020-12-01 naddy s->last_displayed_line = lineno;
4016 1a57306a 2018-09-02 stsp view_vborder(view);
4018 84451b3e 2018-07-10 stsp return NULL;
4021 84451b3e 2018-07-10 stsp static const struct got_error *
4022 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4024 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
4025 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
4026 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
4027 1a76625f 2018-10-22 stsp int errcode;
4029 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
4030 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
4031 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
4033 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4034 1a76625f 2018-10-22 stsp if (errcode)
4035 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
4037 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
4038 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
4039 d68a0a7d 2018-07-10 stsp goto done;
4042 d68a0a7d 2018-07-10 stsp if (lineno == -1)
4043 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
4045 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
4046 d68a0a7d 2018-07-10 stsp if (line->annotated)
4047 d68a0a7d 2018-07-10 stsp goto done;
4049 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
4050 84451b3e 2018-07-10 stsp if (line->id == NULL) {
4051 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4052 84451b3e 2018-07-10 stsp goto done;
4054 84451b3e 2018-07-10 stsp line->annotated = 1;
4056 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4057 1a76625f 2018-10-22 stsp if (errcode)
4058 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4059 84451b3e 2018-07-10 stsp return err;
4062 84451b3e 2018-07-10 stsp static void *
4063 84451b3e 2018-07-10 stsp blame_thread(void *arg)
4065 18430de3 2018-07-10 stsp const struct got_error *err;
4066 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
4067 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
4068 1a76625f 2018-10-22 stsp int errcode;
4070 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
4072 61266923 2020-01-14 stsp return (void *)err;
4074 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
4075 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
4076 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
4077 fc06ba56 2019-08-22 stsp err = NULL;
4079 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4080 1a76625f 2018-10-22 stsp if (errcode)
4081 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
4082 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4084 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
4085 c9beca56 2018-07-22 stsp ta->repo = NULL;
4086 c9beca56 2018-07-22 stsp *ta->complete = 1;
4088 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4089 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
4090 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4092 18430de3 2018-07-10 stsp return (void *)err;
4095 245d91c1 2018-07-12 stsp static struct got_object_id *
4096 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
4097 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
4099 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
4101 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
4102 8d0fe45a 2019-08-12 stsp return NULL;
4104 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
4105 245d91c1 2018-07-12 stsp if (!line->annotated)
4106 245d91c1 2018-07-12 stsp return NULL;
4108 245d91c1 2018-07-12 stsp return line->id;
4111 b880a918 2018-07-10 stsp static const struct got_error *
4112 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
4114 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
4117 245d91c1 2018-07-12 stsp if (blame->thread) {
4118 1a76625f 2018-10-22 stsp int errcode;
4119 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4120 1a76625f 2018-10-22 stsp if (errcode)
4121 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4122 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
4123 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
4124 1a76625f 2018-10-22 stsp if (errcode)
4125 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
4126 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4127 1a76625f 2018-10-22 stsp if (errcode)
4128 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4129 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4130 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
4131 245d91c1 2018-07-12 stsp err = NULL;
4132 245d91c1 2018-07-12 stsp blame->thread = NULL;
4134 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
4135 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
4136 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
4138 245d91c1 2018-07-12 stsp if (blame->f) {
4139 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
4140 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4141 245d91c1 2018-07-12 stsp blame->f = NULL;
4143 57670559 2018-12-23 stsp if (blame->lines) {
4144 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
4145 57670559 2018-12-23 stsp free(blame->lines[i].id);
4146 57670559 2018-12-23 stsp free(blame->lines);
4147 57670559 2018-12-23 stsp blame->lines = NULL;
4149 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
4150 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
4152 245d91c1 2018-07-12 stsp return err;
4155 245d91c1 2018-07-12 stsp static const struct got_error *
4156 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
4158 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
4159 fc06ba56 2019-08-22 stsp int *done = arg;
4160 fc06ba56 2019-08-22 stsp int errcode;
4162 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4163 fc06ba56 2019-08-22 stsp if (errcode)
4164 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4165 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
4167 fc06ba56 2019-08-22 stsp if (*done)
4168 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
4170 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4171 fc06ba56 2019-08-22 stsp if (errcode)
4172 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4173 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
4175 fc06ba56 2019-08-22 stsp return err;
4178 fc06ba56 2019-08-22 stsp static const struct got_error *
4179 a5388363 2020-12-01 naddy run_blame(struct tog_view *view)
4181 a5388363 2020-12-01 naddy struct tog_blame_view_state *s = &view->state.blame;
4182 a5388363 2020-12-01 naddy struct tog_blame *blame = &s->blame;
4183 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
4184 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
4185 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
4186 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
4187 15a94983 2018-12-23 stsp int obj_type;
4189 a5388363 2020-12-01 naddy err = got_object_id_by_path(&obj_id, s->repo, s->blamed_commit->id,
4190 a5388363 2020-12-01 naddy s->path);
4192 15a94983 2018-12-23 stsp return err;
4194 a5388363 2020-12-01 naddy err = got_object_get_type(&obj_type, s->repo, obj_id);
4196 84451b3e 2018-07-10 stsp goto done;
4198 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4199 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
4200 84451b3e 2018-07-10 stsp goto done;
4203 a5388363 2020-12-01 naddy err = got_object_open_as_blob(&blob, s->repo, obj_id, 8192);
4205 a70480e0 2018-06-23 stsp goto done;
4206 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
4207 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
4208 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
4209 84451b3e 2018-07-10 stsp goto done;
4211 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4212 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
4213 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
4214 84451b3e 2018-07-10 stsp goto done;
4216 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4217 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4218 b02560ec 2019-08-19 stsp blame->nlines--;
4220 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4221 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
4222 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4223 84451b3e 2018-07-10 stsp goto done;
4226 a5388363 2020-12-01 naddy err = got_repo_open(&thread_repo, got_repo_get_path(s->repo), NULL);
4228 bd24772e 2018-07-11 stsp goto done;
4230 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
4231 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
4232 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
4233 a5388363 2020-12-01 naddy blame->cb_args.commit_id = got_object_id_dup(s->blamed_commit->id);
4234 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
4235 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4236 245d91c1 2018-07-12 stsp goto done;
4238 a5388363 2020-12-01 naddy blame->cb_args.quit = &s->done;
4240 a5388363 2020-12-01 naddy blame->thread_args.path = s->path;
4241 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
4242 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
4243 a5388363 2020-12-01 naddy blame->thread_args.complete = &s->blame_complete;
4244 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
4245 a5388363 2020-12-01 naddy blame->thread_args.cancel_arg = &s->done;
4246 a5388363 2020-12-01 naddy s->blame_complete = 0;
4250 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
4251 27d434c2 2018-09-15 stsp free(obj_id);
4253 245d91c1 2018-07-12 stsp stop_blame(blame);
4254 245d91c1 2018-07-12 stsp return err;
4257 245d91c1 2018-07-12 stsp static const struct got_error *
4258 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
4259 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4261 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
4262 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4264 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
4266 c4843652 2019-08-12 stsp s->path = strdup(path);
4267 c4843652 2019-08-12 stsp if (s->path == NULL)
4268 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4270 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4271 c4843652 2019-08-12 stsp if (err) {
4272 c4843652 2019-08-12 stsp free(s->path);
4273 7cbe629d 2018-08-04 stsp return err;
4276 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4277 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4278 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4279 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4280 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4281 fb2756b9 2018-08-04 stsp s->repo = repo;
4282 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4283 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4285 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4286 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4287 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4288 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4290 11b20872 2019-11-08 stsp return err;
4293 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4294 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4295 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4296 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4297 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4299 a5388363 2020-12-01 naddy return run_blame(view);
4302 e5a0f69f 2018-08-18 stsp static const struct got_error *
4303 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4305 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4306 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4308 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4309 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4311 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4312 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4313 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4314 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4315 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4318 e5a0f69f 2018-08-18 stsp free(s->path);
4319 11b20872 2019-11-08 stsp free_colors(&s->colors);
4321 e5a0f69f 2018-08-18 stsp return err;
4324 7cbe629d 2018-08-04 stsp static const struct got_error *
4325 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4327 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4329 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4330 6c4c42e0 2019-06-24 stsp return NULL;
4333 6c4c42e0 2019-06-24 stsp static const struct got_error *
4334 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4336 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4337 6c4c42e0 2019-06-24 stsp int lineno;
4339 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4340 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4341 6c4c42e0 2019-06-24 stsp return NULL;
4344 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4345 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4346 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4348 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4350 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4351 6c4c42e0 2019-06-24 stsp lineno = 1;
4353 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4356 6c4c42e0 2019-06-24 stsp while (1) {
4357 6c4c42e0 2019-06-24 stsp char *line = NULL;
4358 6c4c42e0 2019-06-24 stsp off_t offset;
4359 6c4c42e0 2019-06-24 stsp size_t len;
4361 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4362 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4363 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4364 6c4c42e0 2019-06-24 stsp free(line);
4368 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4369 6c4c42e0 2019-06-24 stsp lineno = 1;
4371 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4374 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4375 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4376 6c4c42e0 2019-06-24 stsp free(line);
4377 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4379 6c4c42e0 2019-06-24 stsp free(line);
4380 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
4381 41605754 2020-11-12 stsp if (line &&
4382 41605754 2020-11-12 stsp match_line(line, &view->regex, 1, &view->regmatch)) {
4383 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4384 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
4385 6c4c42e0 2019-06-24 stsp free(line);
4388 6c4c42e0 2019-06-24 stsp free(line);
4389 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4395 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4396 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4397 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4400 6c4c42e0 2019-06-24 stsp return NULL;
4403 6c4c42e0 2019-06-24 stsp static const struct got_error *
4404 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4406 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4407 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4408 2b380cc8 2018-10-24 stsp int errcode;
4410 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
4411 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4412 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4413 2b380cc8 2018-10-24 stsp if (errcode)
4414 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4416 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4419 51fe7530 2019-08-19 stsp if (s->blame_complete)
4420 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4422 4f7c3e5e 2020-12-01 naddy err = draw_blame(view);
4424 669b5ffa 2018-10-07 stsp view_vborder(view);
4425 e5a0f69f 2018-08-18 stsp return err;
4428 e5a0f69f 2018-08-18 stsp static const struct got_error *
4429 e78dc838 2020-12-04 stsp input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
4431 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4432 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4433 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4434 669b5ffa 2018-10-07 stsp int begin_x = 0;
4436 e5a0f69f 2018-08-18 stsp switch (ch) {
4438 1e37a5c2 2019-05-12 jcs s->done = 1;
4441 1e37a5c2 2019-05-12 jcs case KEY_UP:
4442 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4443 1e37a5c2 2019-05-12 jcs s->selected_line--;
4444 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4445 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4446 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4448 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4449 ea025d1d 2020-02-22 naddy case CTRL('b'):
4450 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4451 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
4454 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
4455 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
4456 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
4458 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4461 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4462 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4463 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4464 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4465 1e37a5c2 2019-05-12 jcs s->selected_line++;
4466 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
4467 1e37a5c2 2019-05-12 jcs s->blame.nlines)
4468 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4471 1e37a5c2 2019-05-12 jcs case 'p': {
4472 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4473 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4474 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4475 1e37a5c2 2019-05-12 jcs if (id == NULL)
4477 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
4478 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
4479 15a94983 2018-12-23 stsp struct got_object_qid *pid;
4480 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
4481 1e37a5c2 2019-05-12 jcs int obj_type;
4482 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
4483 1e37a5c2 2019-05-12 jcs s->repo, id);
4486 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
4487 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
4488 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
4489 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4492 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
4493 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
4494 1e37a5c2 2019-05-12 jcs pid->id, s->path);
4495 e5a0f69f 2018-08-18 stsp if (err) {
4496 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
4497 1e37a5c2 2019-05-12 jcs err = NULL;
4498 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4501 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
4503 1e37a5c2 2019-05-12 jcs free(blob_id);
4504 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
4505 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
4506 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4509 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4511 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4513 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
4514 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
4516 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4521 1e37a5c2 2019-05-12 jcs s->done = 1;
4522 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4523 1e37a5c2 2019-05-12 jcs s->done = 0;
4524 1e37a5c2 2019-05-12 jcs if (thread_err)
4526 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4527 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
4528 a5388363 2020-12-01 naddy err = run_blame(view);
4533 1e37a5c2 2019-05-12 jcs case 'B': {
4534 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
4535 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
4536 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
4538 1e37a5c2 2019-05-12 jcs s->done = 1;
4539 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4540 1e37a5c2 2019-05-12 jcs s->done = 0;
4541 1e37a5c2 2019-05-12 jcs if (thread_err)
4543 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4544 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
4545 1e37a5c2 2019-05-12 jcs s->blamed_commit =
4546 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
4547 a5388363 2020-12-01 naddy err = run_blame(view);
4552 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4553 1e37a5c2 2019-05-12 jcs case '\r': {
4554 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4555 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
4556 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
4557 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4558 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4559 1e37a5c2 2019-05-12 jcs if (id == NULL)
4561 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
4564 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
4565 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
4566 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4567 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4568 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4569 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
4570 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4571 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
4574 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
4575 78756c87 2020-11-24 stsp id, NULL, NULL, 3, 0, 0, NULL, s->repo);
4576 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4578 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4581 e78dc838 2020-12-04 stsp view->focussed = 0;
4582 e78dc838 2020-12-04 stsp diff_view->focussed = 1;
4583 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4584 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4587 72a9cb46 2020-12-03 stsp view_set_child(view, diff_view);
4588 e78dc838 2020-12-04 stsp view->focus_child = 1;
4590 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
4595 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4596 ea025d1d 2020-02-22 naddy case CTRL('f'):
4598 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4599 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
4600 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
4603 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4604 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
4605 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4606 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4609 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
4610 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
4611 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
4612 1e37a5c2 2019-05-12 jcs view->nlines - 2;
4614 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
4615 1e37a5c2 2019-05-12 jcs s->blame.nlines -
4616 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
4618 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4619 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
4620 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4621 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4627 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
4630 a70480e0 2018-06-23 stsp static const struct got_error *
4631 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
4633 a70480e0 2018-06-23 stsp const struct got_error *error;
4634 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
4635 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
4636 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4637 0587e10c 2020-07-23 stsp char *link_target = NULL;
4638 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4639 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
4641 e1cd8fed 2018-08-01 stsp struct tog_view *view;
4643 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4644 a70480e0 2018-06-23 stsp switch (ch) {
4646 a70480e0 2018-06-23 stsp commit_id_str = optarg;
4649 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4650 69069811 2018-08-02 stsp if (repo_path == NULL)
4651 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4655 17020d27 2019-03-07 stsp usage_blame();
4656 a70480e0 2018-06-23 stsp /* NOTREACHED */
4660 a70480e0 2018-06-23 stsp argc -= optind;
4661 a70480e0 2018-06-23 stsp argv += optind;
4663 f135c941 2020-02-20 stsp if (argc != 1)
4664 a70480e0 2018-06-23 stsp usage_blame();
4666 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
4667 6962eb72 2020-02-20 stsp if (cwd == NULL)
4668 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
4670 f135c941 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
4671 f135c941 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4672 f135c941 2020-02-20 stsp goto done;
4674 69069811 2018-08-02 stsp if (repo_path == NULL) {
4675 f135c941 2020-02-20 stsp if (worktree)
4676 eb41ed75 2019-02-05 stsp repo_path =
4677 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4679 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
4681 f135c941 2020-02-20 stsp if (repo_path == NULL) {
4682 f135c941 2020-02-20 stsp error = got_error_from_errno("strdup");
4683 f135c941 2020-02-20 stsp goto done;
4686 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4687 c02c541e 2019-03-29 stsp if (error != NULL)
4688 8e94dd5b 2019-01-04 stsp goto done;
4690 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4691 f135c941 2020-02-20 stsp worktree);
4692 c02c541e 2019-03-29 stsp if (error)
4693 92205607 2019-01-04 stsp goto done;
4695 f135c941 2020-02-20 stsp init_curses();
4697 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4698 eb41ed75 2019-02-05 stsp if (error)
4699 69069811 2018-08-02 stsp goto done;
4701 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
4702 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
4703 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4704 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4705 a70480e0 2018-06-23 stsp if (error != NULL)
4706 66b4983c 2018-06-23 stsp goto done;
4707 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4708 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
4710 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4711 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4713 a19e88aa 2018-06-23 stsp if (error != NULL)
4714 8b473291 2019-02-21 stsp goto done;
4716 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4717 e1cd8fed 2018-08-01 stsp if (view == NULL) {
4718 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4719 e1cd8fed 2018-08-01 stsp goto done;
4722 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4723 0587e10c 2020-07-23 stsp commit_id, repo);
4724 7cbe629d 2018-08-04 stsp if (error)
4725 7cbe629d 2018-08-04 stsp goto done;
4727 0587e10c 2020-07-23 stsp error = open_blame_view(view, link_target ? link_target : in_repo_path,
4728 78756c87 2020-11-24 stsp commit_id, repo);
4729 0587e10c 2020-07-23 stsp if (error)
4730 0587e10c 2020-07-23 stsp goto done;
4731 12314ad4 2019-08-31 stsp if (worktree) {
4732 12314ad4 2019-08-31 stsp /* Release work tree lock. */
4733 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
4734 12314ad4 2019-08-31 stsp worktree = NULL;
4736 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4738 69069811 2018-08-02 stsp free(repo_path);
4739 f135c941 2020-02-20 stsp free(in_repo_path);
4740 0587e10c 2020-07-23 stsp free(link_target);
4741 69069811 2018-08-02 stsp free(cwd);
4742 a70480e0 2018-06-23 stsp free(commit_id);
4743 eb41ed75 2019-02-05 stsp if (worktree)
4744 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
4746 a70480e0 2018-06-23 stsp got_repo_close(repo);
4747 a70480e0 2018-06-23 stsp return error;
4750 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4751 d86d3b18 2020-12-01 naddy draw_tree_entries(struct tog_view *view, const char *parent_path)
4753 d86d3b18 2020-12-01 naddy struct tog_tree_view_state *s = &view->state.tree;
4754 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4755 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
4756 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
4757 f26dddb7 2019-11-08 stsp struct tog_color *tc;
4758 56e0773d 2019-11-28 stsp int width, n, i, nentries;
4759 d86d3b18 2020-12-01 naddy int limit = view->nlines;
4761 d86d3b18 2020-12-01 naddy s->ndisplayed = 0;
4763 f7d12f7e 2018-08-01 stsp werase(view->window);
4765 ffd1d5e5 2018-06-23 stsp if (limit == 0)
4766 ffd1d5e5 2018-06-23 stsp return NULL;
4768 d86d3b18 2020-12-01 naddy err = format_line(&wline, &width, s->tree_label, view->ncols, 0);
4770 ffd1d5e5 2018-06-23 stsp return err;
4771 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4772 a3404814 2018-09-02 stsp wstandout(view->window);
4773 d86d3b18 2020-12-01 naddy tc = get_color(&s->colors, TOG_COLOR_COMMIT);
4775 11b20872 2019-11-08 stsp wattr_on(view->window,
4776 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4777 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4779 11b20872 2019-11-08 stsp wattr_off(view->window,
4780 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4781 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4782 a3404814 2018-09-02 stsp wstandend(view->window);
4783 2550e4c3 2018-07-13 stsp free(wline);
4784 2550e4c3 2018-07-13 stsp wline = NULL;
4785 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4786 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4787 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4788 ffd1d5e5 2018-06-23 stsp return NULL;
4789 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
4791 ce52c690 2018-06-23 stsp return err;
4792 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4793 2550e4c3 2018-07-13 stsp free(wline);
4794 2550e4c3 2018-07-13 stsp wline = NULL;
4795 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4796 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4797 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4798 ffd1d5e5 2018-06-23 stsp return NULL;
4799 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4800 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
4801 a1eca9bb 2018-06-23 stsp return NULL;
4803 d86d3b18 2020-12-01 naddy if (s->first_displayed_entry == NULL) {
4804 d86d3b18 2020-12-01 naddy te = got_object_tree_get_first_entry(s->tree);
4805 d86d3b18 2020-12-01 naddy if (s->selected == 0) {
4806 0cf4efb1 2018-09-29 stsp if (view->focussed)
4807 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4808 d86d3b18 2020-12-01 naddy s->selected_entry = NULL;
4810 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4811 d86d3b18 2020-12-01 naddy if (s->selected == 0 && view->focussed)
4812 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4813 d86d3b18 2020-12-01 naddy s->ndisplayed++;
4814 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4815 ffd1d5e5 2018-06-23 stsp return NULL;
4819 d86d3b18 2020-12-01 naddy te = s->first_displayed_entry;
4822 d86d3b18 2020-12-01 naddy nentries = got_object_tree_get_nentries(s->tree);
4823 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4824 0d6c6ee3 2020-05-20 stsp char *line = NULL, *id_str = NULL, *link_target = NULL;
4825 848d6979 2019-08-12 stsp const char *modestr = "";
4826 56e0773d 2019-11-28 stsp mode_t mode;
4828 d86d3b18 2020-12-01 naddy te = got_object_tree_get_entry(s->tree, i);
4829 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
4831 d86d3b18 2020-12-01 naddy if (s->show_ids) {
4832 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4833 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4835 638f9024 2019-05-13 stsp return got_error_from_errno(
4836 230a42bd 2019-05-11 jcs "got_object_id_str");
4838 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4839 63c5ca5d 2019-08-24 stsp modestr = "$";
4840 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4843 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target,
4844 d86d3b18 2020-12-01 naddy te, s->repo);
4845 0d6c6ee3 2020-05-20 stsp if (err) {
4846 0d6c6ee3 2020-05-20 stsp free(id_str);
4847 0d6c6ee3 2020-05-20 stsp return err;
4849 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4850 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4851 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4853 848d6979 2019-08-12 stsp modestr = "@";
4855 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4856 848d6979 2019-08-12 stsp modestr = "/";
4857 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4858 848d6979 2019-08-12 stsp modestr = "*";
4859 0d6c6ee3 2020-05-20 stsp if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
4860 0d6c6ee3 2020-05-20 stsp got_tree_entry_get_name(te), modestr,
4861 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "",
4862 0d6c6ee3 2020-05-20 stsp link_target ? link_target : "") == -1) {
4863 1d13200f 2018-07-12 stsp free(id_str);
4864 0d6c6ee3 2020-05-20 stsp free(link_target);
4865 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4867 1d13200f 2018-07-12 stsp free(id_str);
4868 0d6c6ee3 2020-05-20 stsp free(link_target);
4869 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4870 ffd1d5e5 2018-06-23 stsp if (err) {
4871 ffd1d5e5 2018-06-23 stsp free(line);
4874 d86d3b18 2020-12-01 naddy if (n == s->selected) {
4875 0cf4efb1 2018-09-29 stsp if (view->focussed)
4876 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4877 d86d3b18 2020-12-01 naddy s->selected_entry = te;
4879 d86d3b18 2020-12-01 naddy tc = match_color(&s->colors, line);
4881 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
4882 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4883 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4885 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
4886 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4887 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4888 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4889 d86d3b18 2020-12-01 naddy if (n == s->selected && view->focussed)
4890 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4891 ffd1d5e5 2018-06-23 stsp free(line);
4892 2550e4c3 2018-07-13 stsp free(wline);
4893 2550e4c3 2018-07-13 stsp wline = NULL;
4895 d86d3b18 2020-12-01 naddy s->ndisplayed++;
4896 d86d3b18 2020-12-01 naddy s->last_displayed_entry = te;
4897 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4901 ffd1d5e5 2018-06-23 stsp return err;
4904 ffd1d5e5 2018-06-23 stsp static void
4905 3e135950 2020-12-01 naddy tree_scroll_up(struct tog_tree_view_state *s, int maxscroll)
4907 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4908 694d3271 2020-12-01 naddy int isroot = s->tree == s->root;
4909 fa86c4bf 2020-11-29 stsp int i = 0;
4911 694d3271 2020-12-01 naddy if (s->first_displayed_entry == NULL)
4914 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, s->first_displayed_entry);
4915 fa86c4bf 2020-11-29 stsp while (i++ < maxscroll) {
4916 fa86c4bf 2020-11-29 stsp if (te == NULL) {
4917 fa86c4bf 2020-11-29 stsp if (!isroot)
4918 694d3271 2020-12-01 naddy s->first_displayed_entry = NULL;
4921 694d3271 2020-12-01 naddy s->first_displayed_entry = te;
4922 694d3271 2020-12-01 naddy te = got_tree_entry_get_prev(s->tree, te);
4926 fa86c4bf 2020-11-29 stsp static void
4927 3e135950 2020-12-01 naddy tree_scroll_down(struct tog_tree_view_state *s, int maxscroll)
4929 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4930 ffd1d5e5 2018-06-23 stsp int n = 0;
4932 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
4933 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree,
4934 694d3271 2020-12-01 naddy s->first_displayed_entry);
4936 694d3271 2020-12-01 naddy next = got_object_tree_get_first_entry(s->tree);
4938 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
4939 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4940 694d3271 2020-12-01 naddy last = got_tree_entry_get_next(s->tree, last);
4941 768394f3 2019-01-24 stsp if (last) {
4942 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
4943 694d3271 2020-12-01 naddy next = got_tree_entry_get_next(s->tree, next);
4948 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4949 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4950 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4952 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4953 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4954 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4956 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4957 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
4958 56e0773d 2019-11-28 stsp + 1 /* slash */;
4960 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
4962 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4963 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4964 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4966 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4967 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4968 d9765a41 2018-06-23 stsp while (pt) {
4969 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
4970 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
4971 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4972 cb2ebc8a 2018-06-23 stsp goto done;
4974 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4975 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4976 cb2ebc8a 2018-06-23 stsp goto done;
4978 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4981 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4982 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4983 ce52c690 2018-06-23 stsp goto done;
4987 ce52c690 2018-06-23 stsp if (err) {
4988 ce52c690 2018-06-23 stsp free(*path);
4989 ce52c690 2018-06-23 stsp *path = NULL;
4991 ce52c690 2018-06-23 stsp return err;
4994 ce52c690 2018-06-23 stsp static const struct got_error *
4995 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4996 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4997 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4999 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
5000 ce52c690 2018-06-23 stsp char *path;
5001 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
5003 a0de39f3 2019-08-09 stsp *new_view = NULL;
5005 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
5007 ce52c690 2018-06-23 stsp return err;
5009 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
5010 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
5011 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
5012 83ce39e3 2019-08-12 stsp goto done;
5015 78756c87 2020-11-24 stsp err = open_blame_view(blame_view, path, commit_id, repo);
5016 e5a0f69f 2018-08-18 stsp if (err) {
5017 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
5018 fc06ba56 2019-08-22 stsp err = NULL;
5019 e5a0f69f 2018-08-18 stsp view_close(blame_view);
5021 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
5023 83ce39e3 2019-08-12 stsp free(path);
5024 69efd4c4 2018-07-18 stsp return err;
5027 69efd4c4 2018-07-18 stsp static const struct got_error *
5028 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
5029 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
5030 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5032 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
5033 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
5034 69efd4c4 2018-07-18 stsp char *path;
5036 a0de39f3 2019-08-09 stsp *new_view = NULL;
5038 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
5039 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
5040 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
5042 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
5044 69efd4c4 2018-07-18 stsp return err;
5046 78756c87 2020-11-24 stsp err = open_log_view(log_view, commit_id, repo, NULL, path, 0);
5048 e5a0f69f 2018-08-18 stsp view_close(log_view);
5050 e5a0f69f 2018-08-18 stsp *new_view = log_view;
5051 cb2ebc8a 2018-06-23 stsp free(path);
5052 cb2ebc8a 2018-06-23 stsp return err;
5055 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5056 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
5057 78756c87 2020-11-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5059 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
5060 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
5061 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5063 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
5065 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
5066 ffd1d5e5 2018-06-23 stsp if (err != NULL)
5067 ffd1d5e5 2018-06-23 stsp goto done;
5069 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
5070 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5071 ffd1d5e5 2018-06-23 stsp goto done;
5074 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
5075 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
5076 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
5077 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
5078 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
5079 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5080 6484ec90 2018-09-29 stsp goto done;
5082 fb2756b9 2018-08-04 stsp s->repo = repo;
5084 bddb1296 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
5086 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5087 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
5088 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
5089 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
5091 c0b01bdb 2019-11-08 stsp goto done;
5092 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5093 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
5094 c0b01bdb 2019-11-08 stsp if (err) {
5095 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5096 c0b01bdb 2019-11-08 stsp goto done;
5098 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
5099 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
5100 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5101 c0b01bdb 2019-11-08 stsp if (err) {
5102 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5103 c0b01bdb 2019-11-08 stsp goto done;
5106 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
5107 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
5108 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5109 11b20872 2019-11-08 stsp if (err) {
5110 11b20872 2019-11-08 stsp free_colors(&s->colors);
5111 11b20872 2019-11-08 stsp goto done;
5114 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5115 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
5116 c0b01bdb 2019-11-08 stsp if (err) {
5117 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5118 c0b01bdb 2019-11-08 stsp goto done;
5122 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
5123 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
5124 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
5125 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
5126 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
5128 ad80ab7b 2018-08-04 stsp free(commit_id_str);
5129 6484ec90 2018-09-29 stsp if (err) {
5130 fb2756b9 2018-08-04 stsp free(s->tree_label);
5131 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5133 ad80ab7b 2018-08-04 stsp return err;
5136 e5a0f69f 2018-08-18 stsp static const struct got_error *
5137 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
5139 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5141 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5142 fb2756b9 2018-08-04 stsp free(s->tree_label);
5143 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5144 6484ec90 2018-09-29 stsp free(s->commit_id);
5145 6484ec90 2018-09-29 stsp s->commit_id = NULL;
5146 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
5147 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
5148 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
5149 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
5150 ad80ab7b 2018-08-04 stsp free(parent);
5153 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
5154 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
5155 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
5156 7c32bd05 2019-06-22 stsp return NULL;
5159 7c32bd05 2019-06-22 stsp static const struct got_error *
5160 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
5162 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5164 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
5165 7c32bd05 2019-06-22 stsp return NULL;
5168 7c32bd05 2019-06-22 stsp static int
5169 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5171 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
5173 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5177 7c32bd05 2019-06-22 stsp static const struct got_error *
5178 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
5180 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5181 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
5183 7c32bd05 2019-06-22 stsp if (!view->searching) {
5184 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5185 7c32bd05 2019-06-22 stsp return NULL;
5188 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5189 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5190 7c32bd05 2019-06-22 stsp if (s->selected_entry)
5191 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
5192 56e0773d 2019-11-28 stsp s->selected_entry);
5194 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5196 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
5197 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5199 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
5200 56e0773d 2019-11-28 stsp s->selected_entry);
5203 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5204 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5206 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5209 7c32bd05 2019-06-22 stsp while (1) {
5210 56e0773d 2019-11-28 stsp if (te == NULL) {
5211 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
5212 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5213 ac66afb8 2019-06-24 stsp return NULL;
5215 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5216 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5218 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5221 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
5222 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5223 56e0773d 2019-11-28 stsp s->matched_entry = te;
5227 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5228 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5230 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
5233 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5234 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
5235 7c32bd05 2019-06-22 stsp s->selected = 0;
5238 e5a0f69f 2018-08-18 stsp return NULL;
5241 ad80ab7b 2018-08-04 stsp static const struct got_error *
5242 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
5244 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
5245 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5246 e5a0f69f 2018-08-18 stsp char *parent_path;
5248 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5250 e5a0f69f 2018-08-18 stsp return err;
5252 d86d3b18 2020-12-01 naddy err = draw_tree_entries(view, parent_path);
5253 e5a0f69f 2018-08-18 stsp free(parent_path);
5255 669b5ffa 2018-10-07 stsp view_vborder(view);
5256 e5a0f69f 2018-08-18 stsp return err;
5259 e5a0f69f 2018-08-18 stsp static const struct got_error *
5260 e78dc838 2020-12-04 stsp input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
5262 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5263 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
5264 152c1c93 2020-11-29 stsp struct tog_view *log_view, *ref_view;
5265 fa86c4bf 2020-11-29 stsp int begin_x = 0;
5267 e5a0f69f 2018-08-18 stsp switch (ch) {
5269 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
5272 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
5274 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5275 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5276 78756c87 2020-11-24 stsp err = log_tree_entry(&log_view, begin_x, s->selected_entry,
5277 78756c87 2020-11-24 stsp &s->parents, s->commit_id, s->repo);
5278 e78dc838 2020-12-04 stsp view->focussed = 0;
5279 e78dc838 2020-12-04 stsp log_view->focussed = 1;
5280 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5281 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5283 1e37a5c2 2019-05-12 jcs return err;
5284 72a9cb46 2020-12-03 stsp view_set_child(view, log_view);
5285 e78dc838 2020-12-04 stsp view->focus_child = 1;
5287 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5290 152c1c93 2020-11-29 stsp if (view_is_parent_view(view))
5291 152c1c93 2020-11-29 stsp begin_x = view_split_begin_x(view->begin_x);
5292 152c1c93 2020-11-29 stsp ref_view = view_open(view->nlines, view->ncols,
5293 152c1c93 2020-11-29 stsp view->begin_y, begin_x, TOG_VIEW_REF);
5294 152c1c93 2020-11-29 stsp if (ref_view == NULL)
5295 152c1c93 2020-11-29 stsp return got_error_from_errno("view_open");
5296 152c1c93 2020-11-29 stsp err = open_ref_view(ref_view, s->repo);
5297 152c1c93 2020-11-29 stsp if (err) {
5298 152c1c93 2020-11-29 stsp view_close(ref_view);
5299 152c1c93 2020-11-29 stsp return err;
5301 e78dc838 2020-12-04 stsp view->focussed = 0;
5302 e78dc838 2020-12-04 stsp ref_view->focussed = 1;
5303 152c1c93 2020-11-29 stsp if (view_is_parent_view(view)) {
5304 152c1c93 2020-11-29 stsp err = view_close_child(view);
5306 152c1c93 2020-11-29 stsp return err;
5307 72a9cb46 2020-12-03 stsp view_set_child(view, ref_view);
5308 e78dc838 2020-12-04 stsp view->focus_child = 1;
5310 152c1c93 2020-11-29 stsp *new_view = ref_view;
5313 1e37a5c2 2019-05-12 jcs case KEY_UP:
5314 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5315 1e37a5c2 2019-05-12 jcs s->selected--;
5318 3e135950 2020-12-01 naddy tree_scroll_up(s, 1);
5320 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5321 ea025d1d 2020-02-22 naddy case CTRL('b'):
5322 fa86c4bf 2020-11-29 stsp if (s->tree == s->root) {
5323 fa86c4bf 2020-11-29 stsp if (got_object_tree_get_first_entry(s->tree) ==
5324 fa86c4bf 2020-11-29 stsp s->first_displayed_entry)
5325 fa86c4bf 2020-11-29 stsp s->selected = 0;
5327 fa86c4bf 2020-11-29 stsp if (s->first_displayed_entry == NULL)
5328 fa86c4bf 2020-11-29 stsp s->selected = 0;
5330 3e135950 2020-12-01 naddy tree_scroll_up(s, MAX(0, view->nlines - 3));
5333 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5334 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5335 1e37a5c2 2019-05-12 jcs s->selected++;
5338 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5340 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5342 3e135950 2020-12-01 naddy tree_scroll_down(s, 1);
5344 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5345 ea025d1d 2020-02-22 naddy case CTRL('f'):
5346 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5348 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5349 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5350 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5353 3e135950 2020-12-01 naddy tree_scroll_down(s, view->nlines - 3);
5355 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5357 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5358 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5359 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5360 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5361 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5363 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5364 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5366 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5367 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5368 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5369 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
5370 1e37a5c2 2019-05-12 jcs s->selected_entry =
5371 1e37a5c2 2019-05-12 jcs parent->selected_entry;
5372 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
5373 1e37a5c2 2019-05-12 jcs free(parent);
5374 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
5375 56e0773d 2019-11-28 stsp s->selected_entry))) {
5376 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
5377 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
5378 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
5381 42a2230c 2020-12-01 naddy err = tree_view_visit_subtree(s, subtree);
5382 941e9f74 2019-05-21 stsp if (err) {
5383 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
5386 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
5387 56e0773d 2019-11-28 stsp s->selected_entry))) {
5388 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
5389 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
5390 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
5392 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
5393 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
5394 78756c87 2020-11-24 stsp s->commit_id, s->repo);
5397 e78dc838 2020-12-04 stsp view->focussed = 0;
5398 e78dc838 2020-12-04 stsp blame_view->focussed = 1;
5399 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
5400 669b5ffa 2018-10-07 stsp err = view_close_child(view);
5402 669b5ffa 2018-10-07 stsp return err;
5403 72a9cb46 2020-12-03 stsp view_set_child(view, blame_view);
5404 e78dc838 2020-12-04 stsp view->focus_child = 1;
5406 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
5409 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5410 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
5411 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5417 ffd1d5e5 2018-06-23 stsp return err;
5420 ffd1d5e5 2018-06-23 stsp __dead static void
5421 ffd1d5e5 2018-06-23 stsp usage_tree(void)
5424 55cccc34 2020-02-20 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5425 ffd1d5e5 2018-06-23 stsp getprogname());
5429 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5430 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
5432 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
5433 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
5434 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
5435 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5436 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5437 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
5438 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
5439 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
5441 5221c383 2018-08-01 stsp struct tog_view *view;
5443 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5444 ffd1d5e5 2018-06-23 stsp switch (ch) {
5446 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
5449 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
5450 74283ab8 2020-02-07 stsp if (repo_path == NULL)
5451 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
5455 e99e2d15 2020-11-24 naddy usage_tree();
5456 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
5460 ffd1d5e5 2018-06-23 stsp argc -= optind;
5461 ffd1d5e5 2018-06-23 stsp argv += optind;
5463 55cccc34 2020-02-20 stsp if (argc > 1)
5464 e99e2d15 2020-11-24 naddy usage_tree();
5466 55cccc34 2020-02-20 stsp cwd = getcwd(NULL, 0);
5467 55cccc34 2020-02-20 stsp if (cwd == NULL)
5468 55cccc34 2020-02-20 stsp return got_error_from_errno("getcwd");
5470 55cccc34 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
5471 55cccc34 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5472 55cccc34 2020-02-20 stsp goto done;
5474 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
5475 55cccc34 2020-02-20 stsp if (worktree)
5476 52185f70 2019-02-05 stsp repo_path =
5477 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5479 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
5481 55cccc34 2020-02-20 stsp if (repo_path == NULL) {
5482 55cccc34 2020-02-20 stsp error = got_error_from_errno("strdup");
5483 55cccc34 2020-02-20 stsp goto done;
5486 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5487 c02c541e 2019-03-29 stsp if (error != NULL)
5488 52185f70 2019-02-05 stsp goto done;
5490 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5491 55cccc34 2020-02-20 stsp repo, worktree);
5492 55cccc34 2020-02-20 stsp if (error)
5493 55cccc34 2020-02-20 stsp goto done;
5495 55cccc34 2020-02-20 stsp init_curses();
5497 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5498 c02c541e 2019-03-29 stsp if (error)
5499 52185f70 2019-02-05 stsp goto done;
5501 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5502 71a27632 2020-01-15 stsp commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5503 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5504 55cccc34 2020-02-20 stsp if (error)
5505 ffd1d5e5 2018-06-23 stsp goto done;
5507 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5508 55cccc34 2020-02-20 stsp if (error)
5509 ffd1d5e5 2018-06-23 stsp goto done;
5511 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
5512 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
5513 55cccc34 2020-02-20 stsp if (error)
5514 8b473291 2019-02-21 stsp goto done;
5516 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5517 5221c383 2018-08-01 stsp if (view == NULL) {
5518 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5519 5221c383 2018-08-01 stsp goto done;
5521 78756c87 2020-11-24 stsp error = open_tree_view(view, tree, commit_id, repo);
5522 ad80ab7b 2018-08-04 stsp if (error)
5523 ad80ab7b 2018-08-04 stsp goto done;
5524 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
5525 55cccc34 2020-02-20 stsp error = tree_view_walk_path(&view->state.tree, commit_id,
5526 d91faf3b 2020-12-01 naddy in_repo_path);
5527 55cccc34 2020-02-20 stsp if (error)
5528 55cccc34 2020-02-20 stsp goto done;
5531 55cccc34 2020-02-20 stsp if (worktree) {
5532 55cccc34 2020-02-20 stsp /* Release work tree lock. */
5533 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
5534 55cccc34 2020-02-20 stsp worktree = NULL;
5536 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5538 52185f70 2019-02-05 stsp free(repo_path);
5539 e4a0e26d 2020-02-20 stsp free(cwd);
5540 ffd1d5e5 2018-06-23 stsp free(commit_id);
5541 ffd1d5e5 2018-06-23 stsp if (commit)
5542 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
5544 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
5546 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
5547 ffd1d5e5 2018-06-23 stsp return error;
5550 6458efa5 2020-11-24 stsp static const struct got_error *
5551 6458efa5 2020-11-24 stsp ref_view_load_refs(struct tog_ref_view_state *s)
5553 6458efa5 2020-11-24 stsp const struct got_error *err;
5554 6458efa5 2020-11-24 stsp struct got_reflist_entry *sre;
5555 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
5557 6458efa5 2020-11-24 stsp err = got_ref_list(&s->simplerefs, s->repo, NULL,
5558 6458efa5 2020-11-24 stsp got_ref_cmp_by_name, NULL);
5560 6458efa5 2020-11-24 stsp return err;
5562 6458efa5 2020-11-24 stsp s->nrefs = 0;
5563 6458efa5 2020-11-24 stsp SIMPLEQ_FOREACH(sre, &s->simplerefs, entry) {
5564 6458efa5 2020-11-24 stsp if (strncmp(got_ref_get_name(sre->ref), "refs/got/", 9) == 0)
5567 6458efa5 2020-11-24 stsp re = malloc(sizeof(*re));
5568 6458efa5 2020-11-24 stsp if (re == NULL)
5569 6458efa5 2020-11-24 stsp return got_error_from_errno("malloc");
5571 6458efa5 2020-11-24 stsp re->ref = sre->ref;
5572 6458efa5 2020-11-24 stsp re->idx = s->nrefs++;
5573 6458efa5 2020-11-24 stsp TAILQ_INSERT_TAIL(&s->refs, re, entry);
5576 6458efa5 2020-11-24 stsp return NULL;
5580 6458efa5 2020-11-24 stsp ref_view_free_refs(struct tog_ref_view_state *s)
5582 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
5584 6458efa5 2020-11-24 stsp while (!TAILQ_EMPTY(&s->refs)) {
5585 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
5586 6458efa5 2020-11-24 stsp TAILQ_REMOVE(&s->refs, re, entry);
5589 6458efa5 2020-11-24 stsp got_ref_list_free(&s->simplerefs);
5592 6458efa5 2020-11-24 stsp static const struct got_error *
5593 6458efa5 2020-11-24 stsp open_ref_view(struct tog_view *view, struct got_repository *repo)
5595 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
5596 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5598 6458efa5 2020-11-24 stsp s->selected_entry = 0;
5599 6458efa5 2020-11-24 stsp s->repo = repo;
5601 6458efa5 2020-11-24 stsp SIMPLEQ_INIT(&s->simplerefs);
5602 6458efa5 2020-11-24 stsp TAILQ_INIT(&s->refs);
5603 6458efa5 2020-11-24 stsp SIMPLEQ_INIT(&s->colors);
5605 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
5607 6458efa5 2020-11-24 stsp return err;
5609 34ba6917 2020-11-30 stsp s->first_displayed_entry = TAILQ_FIRST(&s->refs);
5611 6458efa5 2020-11-24 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5612 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/heads/",
5613 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_HEADS,
5614 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_HEADS"));
5616 6458efa5 2020-11-24 stsp goto done;
5618 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/tags/",
5619 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_TAGS,
5620 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_TAGS"));
5622 6458efa5 2020-11-24 stsp goto done;
5624 6458efa5 2020-11-24 stsp err = add_color(&s->colors, "^refs/remotes/",
5625 6458efa5 2020-11-24 stsp TOG_COLOR_REFS_REMOTES,
5626 6458efa5 2020-11-24 stsp get_color_value("TOG_COLOR_REFS_REMOTES"));
5628 6458efa5 2020-11-24 stsp goto done;
5631 6458efa5 2020-11-24 stsp view->show = show_ref_view;
5632 6458efa5 2020-11-24 stsp view->input = input_ref_view;
5633 6458efa5 2020-11-24 stsp view->close = close_ref_view;
5634 6458efa5 2020-11-24 stsp view->search_start = search_start_ref_view;
5635 6458efa5 2020-11-24 stsp view->search_next = search_next_ref_view;
5638 6458efa5 2020-11-24 stsp free_colors(&s->colors);
5639 6458efa5 2020-11-24 stsp return err;
5642 6458efa5 2020-11-24 stsp static const struct got_error *
5643 6458efa5 2020-11-24 stsp close_ref_view(struct tog_view *view)
5645 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5647 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
5648 6458efa5 2020-11-24 stsp free_colors(&s->colors);
5650 6458efa5 2020-11-24 stsp return NULL;
5653 6458efa5 2020-11-24 stsp static const struct got_error *
5654 c42c9805 2020-11-24 stsp resolve_reflist_entry(struct got_object_id **commit_id,
5655 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
5657 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
5658 c42c9805 2020-11-24 stsp struct got_object_id *obj_id;
5659 6458efa5 2020-11-24 stsp struct got_tag_object *tag = NULL;
5660 6458efa5 2020-11-24 stsp int obj_type;
5662 c42c9805 2020-11-24 stsp *commit_id = NULL;
5664 6458efa5 2020-11-24 stsp err = got_ref_resolve(&obj_id, repo, re->ref);
5666 6458efa5 2020-11-24 stsp return err;
5668 6458efa5 2020-11-24 stsp err = got_object_get_type(&obj_type, repo, obj_id);
5670 6458efa5 2020-11-24 stsp goto done;
5672 6458efa5 2020-11-24 stsp switch (obj_type) {
5673 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_COMMIT:
5674 c42c9805 2020-11-24 stsp *commit_id = obj_id;
5676 6458efa5 2020-11-24 stsp case GOT_OBJ_TYPE_TAG:
5677 6458efa5 2020-11-24 stsp err = got_object_open_as_tag(&tag, repo, obj_id);
5679 6458efa5 2020-11-24 stsp goto done;
5680 c42c9805 2020-11-24 stsp free(obj_id);
5681 c42c9805 2020-11-24 stsp err = got_object_get_type(&obj_type, repo,
5682 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
5684 6458efa5 2020-11-24 stsp goto done;
5685 c42c9805 2020-11-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT) {
5686 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
5687 c42c9805 2020-11-24 stsp goto done;
5689 c42c9805 2020-11-24 stsp *commit_id = got_object_id_dup(
5690 c42c9805 2020-11-24 stsp got_object_tag_get_object_id(tag));
5691 c42c9805 2020-11-24 stsp if (*commit_id == NULL) {
5692 c42c9805 2020-11-24 stsp err = got_error_from_errno("got_object_id_dup");
5693 c42c9805 2020-11-24 stsp goto done;
5697 c42c9805 2020-11-24 stsp err = got_error(GOT_ERR_OBJ_TYPE);
5703 c42c9805 2020-11-24 stsp got_object_tag_close(tag);
5704 c42c9805 2020-11-24 stsp if (err) {
5705 c42c9805 2020-11-24 stsp free(*commit_id);
5706 c42c9805 2020-11-24 stsp *commit_id = NULL;
5708 c42c9805 2020-11-24 stsp return err;
5711 c42c9805 2020-11-24 stsp static const struct got_error *
5712 c42c9805 2020-11-24 stsp log_ref_entry(struct tog_view **new_view, int begin_x,
5713 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
5715 c42c9805 2020-11-24 stsp struct tog_view *log_view;
5716 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
5717 c42c9805 2020-11-24 stsp struct got_object_id *commit_id = NULL;
5719 c42c9805 2020-11-24 stsp *new_view = NULL;
5721 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
5722 c42c9805 2020-11-24 stsp if (err) {
5723 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
5724 c42c9805 2020-11-24 stsp return err;
5726 c42c9805 2020-11-24 stsp return NULL;
5729 6458efa5 2020-11-24 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
5730 6458efa5 2020-11-24 stsp if (log_view == NULL) {
5731 6458efa5 2020-11-24 stsp err = got_error_from_errno("view_open");
5732 6458efa5 2020-11-24 stsp goto done;
5735 ee756517 2020-12-05 stsp err = open_log_view(log_view, commit_id, repo,
5736 ee756517 2020-12-05 stsp got_ref_get_name(re->ref), "", 0);
5739 6458efa5 2020-11-24 stsp view_close(log_view);
5741 6458efa5 2020-11-24 stsp *new_view = log_view;
5742 c42c9805 2020-11-24 stsp free(commit_id);
5743 6458efa5 2020-11-24 stsp return err;
5746 ce5b7c56 2019-07-09 stsp static void
5747 3e135950 2020-12-01 naddy ref_scroll_up(struct tog_ref_view_state *s, int maxscroll)
5749 34ba6917 2020-11-30 stsp struct tog_reflist_entry *re;
5750 34ba6917 2020-11-30 stsp int i = 0;
5752 694d3271 2020-12-01 naddy if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
5755 694d3271 2020-12-01 naddy re = TAILQ_PREV(s->first_displayed_entry, tog_reflist_head, entry);
5756 34ba6917 2020-11-30 stsp while (i++ < maxscroll) {
5757 34ba6917 2020-11-30 stsp if (re == NULL)
5759 694d3271 2020-12-01 naddy s->first_displayed_entry = re;
5760 34ba6917 2020-11-30 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
5764 34ba6917 2020-11-30 stsp static void
5765 3e135950 2020-12-01 naddy ref_scroll_down(struct tog_ref_view_state *s, int maxscroll)
5767 6458efa5 2020-11-24 stsp struct tog_reflist_entry *next, *last;
5768 6458efa5 2020-11-24 stsp int n = 0;
5770 694d3271 2020-12-01 naddy if (s->first_displayed_entry)
5771 694d3271 2020-12-01 naddy next = TAILQ_NEXT(s->first_displayed_entry, entry);
5773 694d3271 2020-12-01 naddy next = TAILQ_FIRST(&s->refs);
5775 694d3271 2020-12-01 naddy last = s->last_displayed_entry;
5776 6458efa5 2020-11-24 stsp while (next && last && n++ < maxscroll) {
5777 6458efa5 2020-11-24 stsp last = TAILQ_NEXT(last, entry);
5778 6458efa5 2020-11-24 stsp if (last) {
5779 694d3271 2020-12-01 naddy s->first_displayed_entry = next;
5780 6458efa5 2020-11-24 stsp next = TAILQ_NEXT(next, entry);
5785 6458efa5 2020-11-24 stsp static const struct got_error *
5786 6458efa5 2020-11-24 stsp search_start_ref_view(struct tog_view *view)
5788 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5790 6458efa5 2020-11-24 stsp s->matched_entry = NULL;
5791 6458efa5 2020-11-24 stsp return NULL;
5794 6458efa5 2020-11-24 stsp static int
5795 6458efa5 2020-11-24 stsp match_reflist_entry(struct tog_reflist_entry *re, regex_t *regex)
5797 6458efa5 2020-11-24 stsp regmatch_t regmatch;
5799 6458efa5 2020-11-24 stsp return regexec(regex, got_ref_get_name(re->ref), 1, ®match,
5803 6458efa5 2020-11-24 stsp static const struct got_error *
5804 6458efa5 2020-11-24 stsp search_next_ref_view(struct tog_view *view)
5806 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5807 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re = NULL;
5809 6458efa5 2020-11-24 stsp if (!view->searching) {
5810 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5811 6458efa5 2020-11-24 stsp return NULL;
5814 6458efa5 2020-11-24 stsp if (s->matched_entry) {
5815 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5816 6458efa5 2020-11-24 stsp if (s->selected_entry)
5817 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(s->selected_entry, entry);
5819 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
5820 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
5822 6458efa5 2020-11-24 stsp if (s->selected_entry == NULL)
5823 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
5825 6458efa5 2020-11-24 stsp re = TAILQ_PREV(s->selected_entry,
5826 6458efa5 2020-11-24 stsp tog_reflist_head, entry);
5829 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
5830 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
5832 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
5835 6458efa5 2020-11-24 stsp while (1) {
5836 6458efa5 2020-11-24 stsp if (re == NULL) {
5837 6458efa5 2020-11-24 stsp if (s->matched_entry == NULL) {
5838 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5839 6458efa5 2020-11-24 stsp return NULL;
5841 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
5842 6458efa5 2020-11-24 stsp re = TAILQ_FIRST(&s->refs);
5844 6458efa5 2020-11-24 stsp re = TAILQ_LAST(&s->refs, tog_reflist_head);
5847 6458efa5 2020-11-24 stsp if (match_reflist_entry(re, &view->regex)) {
5848 6458efa5 2020-11-24 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5849 6458efa5 2020-11-24 stsp s->matched_entry = re;
5853 6458efa5 2020-11-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
5854 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
5856 6458efa5 2020-11-24 stsp re = TAILQ_PREV(re, tog_reflist_head, entry);
5859 6458efa5 2020-11-24 stsp if (s->matched_entry) {
5860 6458efa5 2020-11-24 stsp s->first_displayed_entry = s->matched_entry;
5861 6458efa5 2020-11-24 stsp s->selected = 0;
5864 6458efa5 2020-11-24 stsp return NULL;
5867 6458efa5 2020-11-24 stsp static const struct got_error *
5868 6458efa5 2020-11-24 stsp show_ref_view(struct tog_view *view)
5870 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
5871 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
5872 6458efa5 2020-11-24 stsp struct tog_reflist_entry *re;
5873 6458efa5 2020-11-24 stsp char *line = NULL;
5874 6458efa5 2020-11-24 stsp wchar_t *wline;
5875 6458efa5 2020-11-24 stsp struct tog_color *tc;
5876 6458efa5 2020-11-24 stsp int width, n;
5877 6458efa5 2020-11-24 stsp int limit = view->nlines;
5879 6458efa5 2020-11-24 stsp werase(view->window);
5881 6458efa5 2020-11-24 stsp s->ndisplayed = 0;
5883 6458efa5 2020-11-24 stsp if (limit == 0)
5884 6458efa5 2020-11-24 stsp return NULL;
5886 34ba6917 2020-11-30 stsp re = s->first_displayed_entry;
5888 6458efa5 2020-11-24 stsp if (asprintf(&line, "references [%d/%d]", re->idx + s->selected + 1,
5889 6458efa5 2020-11-24 stsp s->nrefs) == -1)
5890 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
5892 6458efa5 2020-11-24 stsp err = format_line(&wline, &width, line, view->ncols, 0);
5893 6458efa5 2020-11-24 stsp if (err) {
5894 6458efa5 2020-11-24 stsp free(line);
5895 6458efa5 2020-11-24 stsp return err;
5897 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
5898 6458efa5 2020-11-24 stsp wstandout(view->window);
5899 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
5900 6458efa5 2020-11-24 stsp if (view_needs_focus_indication(view))
5901 6458efa5 2020-11-24 stsp wstandend(view->window);
5902 6458efa5 2020-11-24 stsp free(wline);
5903 6458efa5 2020-11-24 stsp wline = NULL;
5904 6458efa5 2020-11-24 stsp free(line);
5905 6458efa5 2020-11-24 stsp line = NULL;
5906 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
5907 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
5908 6458efa5 2020-11-24 stsp if (--limit <= 0)
5909 6458efa5 2020-11-24 stsp return NULL;
5912 6458efa5 2020-11-24 stsp while (re && limit > 0) {
5913 6458efa5 2020-11-24 stsp char *line = NULL;
5915 6458efa5 2020-11-24 stsp if (got_ref_is_symbolic(re->ref)) {
5916 6458efa5 2020-11-24 stsp if (asprintf(&line, "%s -> %s",
5917 6458efa5 2020-11-24 stsp got_ref_get_name(re->ref),
5918 6458efa5 2020-11-24 stsp got_ref_get_symref_target(re->ref)) == -1)
5919 6458efa5 2020-11-24 stsp return got_error_from_errno("asprintf");
5920 6458efa5 2020-11-24 stsp } else if (s->show_ids) {
5921 6458efa5 2020-11-24 stsp struct got_object_id *id;
5922 6458efa5 2020-11-24 stsp char *id_str;
5923 6458efa5 2020-11-24 stsp err = got_ref_resolve(&id, s->repo, re->ref);
5925 6458efa5 2020-11-24 stsp return err;
5926 6458efa5 2020-11-24 stsp err = got_object_id_str(&id_str, id);
5927 6458efa5 2020-11-24 stsp if (err) {
5929 6458efa5 2020-11-24 stsp return err;
5931 6458efa5 2020-11-24 stsp if (asprintf(&line, "%s: %s",
5932 6458efa5 2020-11-24 stsp got_ref_get_name(re->ref), id_str) == -1) {
5933 6458efa5 2020-11-24 stsp err = got_error_from_errno("asprintf");
5935 6458efa5 2020-11-24 stsp free(id_str);
5936 6458efa5 2020-11-24 stsp return err;
5939 6458efa5 2020-11-24 stsp free(id_str);
5941 6458efa5 2020-11-24 stsp line = strdup(got_ref_get_name(re->ref));
5942 6458efa5 2020-11-24 stsp if (line == NULL)
5943 6458efa5 2020-11-24 stsp return got_error_from_errno("strdup");
5946 6458efa5 2020-11-24 stsp err = format_line(&wline, &width, line, view->ncols, 0);
5947 6458efa5 2020-11-24 stsp if (err) {
5948 6458efa5 2020-11-24 stsp free(line);
5949 6458efa5 2020-11-24 stsp return err;
5951 6458efa5 2020-11-24 stsp if (n == s->selected) {
5952 6458efa5 2020-11-24 stsp if (view->focussed)
5953 6458efa5 2020-11-24 stsp wstandout(view->window);
5954 6458efa5 2020-11-24 stsp s->selected_entry = re;
5956 6458efa5 2020-11-24 stsp tc = match_color(&s->colors, got_ref_get_name(re->ref));
5958 6458efa5 2020-11-24 stsp wattr_on(view->window,
5959 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
5960 6458efa5 2020-11-24 stsp waddwstr(view->window, wline);
5962 6458efa5 2020-11-24 stsp wattr_off(view->window,
5963 6458efa5 2020-11-24 stsp COLOR_PAIR(tc->colorpair), NULL);
5964 6458efa5 2020-11-24 stsp if (width < view->ncols - 1)
5965 6458efa5 2020-11-24 stsp waddch(view->window, '\n');
5966 6458efa5 2020-11-24 stsp if (n == s->selected && view->focussed)
5967 6458efa5 2020-11-24 stsp wstandend(view->window);
5968 6458efa5 2020-11-24 stsp free(line);
5969 6458efa5 2020-11-24 stsp free(wline);
5970 6458efa5 2020-11-24 stsp wline = NULL;
5972 6458efa5 2020-11-24 stsp s->ndisplayed++;
5973 6458efa5 2020-11-24 stsp s->last_displayed_entry = re;
5976 6458efa5 2020-11-24 stsp re = TAILQ_NEXT(re, entry);
5979 6458efa5 2020-11-24 stsp view_vborder(view);
5980 6458efa5 2020-11-24 stsp return err;
5983 6458efa5 2020-11-24 stsp static const struct got_error *
5984 c42c9805 2020-11-24 stsp browse_ref_tree(struct tog_view **new_view, int begin_x,
5985 c42c9805 2020-11-24 stsp struct tog_reflist_entry *re, struct got_repository *repo)
5987 c42c9805 2020-11-24 stsp const struct got_error *err = NULL;
5988 c42c9805 2020-11-24 stsp struct got_object_id *commit_id = NULL, *tree_id = NULL;
5989 c42c9805 2020-11-24 stsp struct got_tree_object *tree = NULL;
5990 c42c9805 2020-11-24 stsp struct tog_view *tree_view;
5992 c42c9805 2020-11-24 stsp *new_view = NULL;
5994 c42c9805 2020-11-24 stsp err = resolve_reflist_entry(&commit_id, re, repo);
5995 c42c9805 2020-11-24 stsp if (err) {
5996 c42c9805 2020-11-24 stsp if (err->code != GOT_ERR_OBJ_TYPE)
5997 c42c9805 2020-11-24 stsp return err;
5999 c42c9805 2020-11-24 stsp return NULL;
6002 c42c9805 2020-11-24 stsp err = got_object_id_by_path(&tree_id, repo, commit_id, "/");
6004 c42c9805 2020-11-24 stsp goto done;
6006 c42c9805 2020-11-24 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
6008 c42c9805 2020-11-24 stsp goto done;
6010 c42c9805 2020-11-24 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
6011 c42c9805 2020-11-24 stsp if (tree_view == NULL) {
6012 c42c9805 2020-11-24 stsp err = got_error_from_errno("view_open");
6013 c42c9805 2020-11-24 stsp goto done;
6016 c42c9805 2020-11-24 stsp err = open_tree_view(tree_view, tree, commit_id, repo);
6018 c42c9805 2020-11-24 stsp goto done;
6020 c42c9805 2020-11-24 stsp *new_view = tree_view;
6022 c42c9805 2020-11-24 stsp free(commit_id);
6023 c42c9805 2020-11-24 stsp free(tree_id);
6024 c42c9805 2020-11-24 stsp if (err) {
6026 c42c9805 2020-11-24 stsp got_object_tree_close(tree);
6028 c42c9805 2020-11-24 stsp return err;
6030 c42c9805 2020-11-24 stsp static const struct got_error *
6031 e78dc838 2020-12-04 stsp input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
6033 6458efa5 2020-11-24 stsp const struct got_error *err = NULL;
6034 6458efa5 2020-11-24 stsp struct tog_ref_view_state *s = &view->state.ref;
6035 c42c9805 2020-11-24 stsp struct tog_view *log_view, *tree_view;
6036 34ba6917 2020-11-30 stsp int begin_x = 0;
6038 6458efa5 2020-11-24 stsp switch (ch) {
6040 6458efa5 2020-11-24 stsp s->show_ids = !s->show_ids;
6042 6458efa5 2020-11-24 stsp case KEY_ENTER:
6043 6458efa5 2020-11-24 stsp case '\r':
6044 6458efa5 2020-11-24 stsp if (!s->selected_entry)
6046 6458efa5 2020-11-24 stsp if (view_is_parent_view(view))
6047 6458efa5 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
6048 6458efa5 2020-11-24 stsp err = log_ref_entry(&log_view, begin_x, s->selected_entry,
6050 e78dc838 2020-12-04 stsp view->focussed = 0;
6051 e78dc838 2020-12-04 stsp log_view->focussed = 1;
6052 6458efa5 2020-11-24 stsp if (view_is_parent_view(view)) {
6053 6458efa5 2020-11-24 stsp err = view_close_child(view);
6055 6458efa5 2020-11-24 stsp return err;
6056 72a9cb46 2020-12-03 stsp view_set_child(view, log_view);
6057 e78dc838 2020-12-04 stsp view->focus_child = 1;
6059 6458efa5 2020-11-24 stsp *new_view = log_view;
6062 c42c9805 2020-11-24 stsp if (!s->selected_entry)
6064 c42c9805 2020-11-24 stsp if (view_is_parent_view(view))
6065 c42c9805 2020-11-24 stsp begin_x = view_split_begin_x(view->begin_x);
6066 c42c9805 2020-11-24 stsp err = browse_ref_tree(&tree_view, begin_x, s->selected_entry,
6068 c42c9805 2020-11-24 stsp if (err || tree_view == NULL)
6070 e78dc838 2020-12-04 stsp view->focussed = 0;
6071 e78dc838 2020-12-04 stsp tree_view->focussed = 1;
6072 c42c9805 2020-11-24 stsp if (view_is_parent_view(view)) {
6073 c42c9805 2020-11-24 stsp err = view_close_child(view);
6075 c42c9805 2020-11-24 stsp return err;
6076 72a9cb46 2020-12-03 stsp view_set_child(view, tree_view);
6077 e78dc838 2020-12-04 stsp view->focus_child = 1;
6079 c42c9805 2020-11-24 stsp *new_view = tree_view;
6082 6458efa5 2020-11-24 stsp case KEY_UP:
6083 6458efa5 2020-11-24 stsp if (s->selected > 0) {
6084 6458efa5 2020-11-24 stsp s->selected--;
6087 3e135950 2020-12-01 naddy ref_scroll_up(s, 1);
6089 6458efa5 2020-11-24 stsp case KEY_PPAGE:
6090 6458efa5 2020-11-24 stsp case CTRL('b'):
6091 34ba6917 2020-11-30 stsp if (s->first_displayed_entry == TAILQ_FIRST(&s->refs))
6092 34ba6917 2020-11-30 stsp s->selected = 0;
6093 3e135950 2020-12-01 naddy ref_scroll_up(s, MAX(0, view->nlines - 1));
6096 6458efa5 2020-11-24 stsp case KEY_DOWN:
6097 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1) {
6098 6458efa5 2020-11-24 stsp s->selected++;
6101 6458efa5 2020-11-24 stsp if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL)
6102 6458efa5 2020-11-24 stsp /* can't scroll any further */
6104 3e135950 2020-12-01 naddy ref_scroll_down(s, 1);
6106 6458efa5 2020-11-24 stsp case KEY_NPAGE:
6107 6458efa5 2020-11-24 stsp case CTRL('f'):
6108 6458efa5 2020-11-24 stsp if (TAILQ_NEXT(s->last_displayed_entry, entry) == NULL) {
6109 6458efa5 2020-11-24 stsp /* can't scroll any further; move cursor down */
6110 6458efa5 2020-11-24 stsp if (s->selected < s->ndisplayed - 1)
6111 6458efa5 2020-11-24 stsp s->selected = s->ndisplayed - 1;
6114 3e135950 2020-12-01 naddy ref_scroll_down(s, view->nlines - 1);
6116 6458efa5 2020-11-24 stsp case CTRL('l'):
6117 6458efa5 2020-11-24 stsp ref_view_free_refs(s);
6118 6458efa5 2020-11-24 stsp err = ref_view_load_refs(s);
6120 6458efa5 2020-11-24 stsp case KEY_RESIZE:
6121 6458efa5 2020-11-24 stsp if (s->selected > view->nlines)
6122 6458efa5 2020-11-24 stsp s->selected = s->ndisplayed - 1;
6128 6458efa5 2020-11-24 stsp return err;
6131 6458efa5 2020-11-24 stsp __dead static void
6132 6458efa5 2020-11-24 stsp usage_ref(void)
6135 6458efa5 2020-11-24 stsp fprintf(stderr, "usage: %s ref [-r repository-path]\n",
6136 6458efa5 2020-11-24 stsp getprogname());
6140 6458efa5 2020-11-24 stsp static const struct got_error *
6141 6458efa5 2020-11-24 stsp cmd_ref(int argc, char *argv[])
6143 6458efa5 2020-11-24 stsp const struct got_error *error;
6144 6458efa5 2020-11-24 stsp struct got_repository *repo = NULL;
6145 6458efa5 2020-11-24 stsp struct got_worktree *worktree = NULL;
6146 6458efa5 2020-11-24 stsp char *cwd = NULL, *repo_path = NULL;
6148 6458efa5 2020-11-24 stsp struct tog_view *view;
6150 6458efa5 2020-11-24 stsp while ((ch = getopt(argc, argv, "r:")) != -1) {
6151 6458efa5 2020-11-24 stsp switch (ch) {
6153 6458efa5 2020-11-24 stsp repo_path = realpath(optarg, NULL);
6154 6458efa5 2020-11-24 stsp if (repo_path == NULL)
6155 6458efa5 2020-11-24 stsp return got_error_from_errno2("realpath",
6159 e99e2d15 2020-11-24 naddy usage_ref();
6160 6458efa5 2020-11-24 stsp /* NOTREACHED */
6164 6458efa5 2020-11-24 stsp argc -= optind;
6165 6458efa5 2020-11-24 stsp argv += optind;
6167 6458efa5 2020-11-24 stsp if (argc > 1)
6168 e99e2d15 2020-11-24 naddy usage_ref();
6170 6458efa5 2020-11-24 stsp cwd = getcwd(NULL, 0);
6171 6458efa5 2020-11-24 stsp if (cwd == NULL)
6172 6458efa5 2020-11-24 stsp return got_error_from_errno("getcwd");
6174 6458efa5 2020-11-24 stsp error = got_worktree_open(&worktree, cwd);
6175 6458efa5 2020-11-24 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6176 6458efa5 2020-11-24 stsp goto done;
6178 6458efa5 2020-11-24 stsp if (repo_path == NULL) {
6179 6458efa5 2020-11-24 stsp if (worktree)
6180 6458efa5 2020-11-24 stsp repo_path =
6181 6458efa5 2020-11-24 stsp strdup(got_worktree_get_repo_path(worktree));
6183 6458efa5 2020-11-24 stsp repo_path = strdup(cwd);
6185 6458efa5 2020-11-24 stsp if (repo_path == NULL) {
6186 6458efa5 2020-11-24 stsp error = got_error_from_errno("strdup");
6187 6458efa5 2020-11-24 stsp goto done;
6190 6458efa5 2020-11-24 stsp error = got_repo_open(&repo, repo_path, NULL);
6191 6458efa5 2020-11-24 stsp if (error != NULL)
6192 6458efa5 2020-11-24 stsp goto done;
6194 6458efa5 2020-11-24 stsp init_curses();
6196 6458efa5 2020-11-24 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
6197 6458efa5 2020-11-24 stsp if (error)
6198 6458efa5 2020-11-24 stsp goto done;
6200 6458efa5 2020-11-24 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_REF);
6201 6458efa5 2020-11-24 stsp if (view == NULL) {
6202 6458efa5 2020-11-24 stsp error = got_error_from_errno("view_open");
6203 6458efa5 2020-11-24 stsp goto done;
6206 6458efa5 2020-11-24 stsp error = open_ref_view(view, repo);
6207 6458efa5 2020-11-24 stsp if (error)
6208 6458efa5 2020-11-24 stsp goto done;
6210 6458efa5 2020-11-24 stsp if (worktree) {
6211 6458efa5 2020-11-24 stsp /* Release work tree lock. */
6212 6458efa5 2020-11-24 stsp got_worktree_close(worktree);
6213 6458efa5 2020-11-24 stsp worktree = NULL;
6215 6458efa5 2020-11-24 stsp error = view_loop(view);
6217 6458efa5 2020-11-24 stsp free(repo_path);
6218 6458efa5 2020-11-24 stsp free(cwd);
6220 6458efa5 2020-11-24 stsp got_repo_close(repo);
6221 6458efa5 2020-11-24 stsp return error;
6224 6458efa5 2020-11-24 stsp static void
6225 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
6229 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
6230 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
6231 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
6232 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->name);
6234 6879ba42 2020-10-01 naddy fputc('\n', fp);
6237 4ed7e80c 2018-05-20 stsp __dead static void
6238 6879ba42 2020-10-01 naddy usage(int hflag, int status)
6240 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
6242 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
6243 6879ba42 2020-10-01 naddy getprogname());
6244 6879ba42 2020-10-01 naddy if (hflag) {
6245 6879ba42 2020-10-01 naddy fprintf(fp, "lazy usage: %s path\n", getprogname());
6246 6879ba42 2020-10-01 naddy list_commands(fp);
6248 6879ba42 2020-10-01 naddy exit(status);
6251 c2301be8 2018-04-30 stsp static char **
6252 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
6254 ee85c5e8 2020-02-29 stsp va_list ap;
6255 c2301be8 2018-04-30 stsp char **argv;
6258 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
6260 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
6261 c2301be8 2018-04-30 stsp if (argv == NULL)
6262 c2301be8 2018-04-30 stsp err(1, "calloc");
6263 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
6264 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
6265 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
6266 e10c916e 2019-09-15 hiltjo err(1, "strdup");
6269 ee85c5e8 2020-02-29 stsp va_end(ap);
6270 c2301be8 2018-04-30 stsp return argv;
6274 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
6275 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
6276 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
6277 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
6278 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
6280 ee85c5e8 2020-02-29 stsp static const struct got_error *
6281 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
6283 ee85c5e8 2020-02-29 stsp const struct got_error *error = NULL;
6284 ee85c5e8 2020-02-29 stsp struct tog_cmd *cmd = NULL;
6285 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
6286 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
6287 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
6288 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6289 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
6291 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
6292 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
6293 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
6295 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
6296 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
6297 ee85c5e8 2020-02-29 stsp goto done;
6299 ee85c5e8 2020-02-29 stsp if (worktree)
6300 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
6302 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
6303 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
6304 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
6305 ee85c5e8 2020-02-29 stsp goto done;
6308 ee85c5e8 2020-02-29 stsp error = got_repo_open(&repo, repo_path, NULL);
6309 ee85c5e8 2020-02-29 stsp if (error != NULL)
6310 ee85c5e8 2020-02-29 stsp goto done;
6312 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
6313 ee85c5e8 2020-02-29 stsp repo, worktree);
6314 ee85c5e8 2020-02-29 stsp if (error)
6315 ee85c5e8 2020-02-29 stsp goto done;
6317 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
6318 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
6319 ee85c5e8 2020-02-29 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
6320 ee85c5e8 2020-02-29 stsp if (error)
6321 ee85c5e8 2020-02-29 stsp goto done;
6323 ee85c5e8 2020-02-29 stsp if (worktree) {
6324 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
6325 ee85c5e8 2020-02-29 stsp worktree = NULL;
6328 ee85c5e8 2020-02-29 stsp error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
6329 ee85c5e8 2020-02-29 stsp if (error) {
6330 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
6331 ee85c5e8 2020-02-29 stsp goto done;
6332 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
6333 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
6334 6879ba42 2020-10-01 naddy usage(1, 1);
6335 ee85c5e8 2020-02-29 stsp /* not reached */
6338 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
6339 ee85c5e8 2020-02-29 stsp repo = NULL;
6341 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
6342 ee85c5e8 2020-02-29 stsp if (error)
6343 ee85c5e8 2020-02-29 stsp goto done;
6345 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
6347 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
6348 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
6351 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
6352 ee85c5e8 2020-02-29 stsp if (worktree)
6353 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
6355 ee85c5e8 2020-02-29 stsp free(commit_id_str);
6356 ee85c5e8 2020-02-29 stsp free(commit_id);
6357 ee85c5e8 2020-02-29 stsp free(cwd);
6358 ee85c5e8 2020-02-29 stsp free(repo_path);
6359 ee85c5e8 2020-02-29 stsp free(in_repo_path);
6360 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
6362 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
6363 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
6364 ee85c5e8 2020-02-29 stsp free(cmd_argv);
6366 ee85c5e8 2020-02-29 stsp return error;
6370 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
6372 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
6373 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
6374 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
6375 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
6376 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
6377 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
6378 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0}
6381 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
6383 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
6384 9f7d7167 2018-04-29 stsp switch (ch) {
6386 9f7d7167 2018-04-29 stsp hflag = 1;
6389 53ccebc2 2019-07-30 stsp Vflag = 1;
6392 6879ba42 2020-10-01 naddy usage(hflag, 1);
6393 9f7d7167 2018-04-29 stsp /* NOTREACHED */
6397 9f7d7167 2018-04-29 stsp argc -= optind;
6398 9f7d7167 2018-04-29 stsp argv += optind;
6399 9814e6a3 2020-09-27 naddy optind = 1;
6400 c2301be8 2018-04-30 stsp optreset = 1;
6402 53ccebc2 2019-07-30 stsp if (Vflag) {
6403 53ccebc2 2019-07-30 stsp got_version_print_str();
6404 6879ba42 2020-10-01 naddy return 0;
6407 4010e238 2020-12-04 stsp #ifndef PROFILE
6408 4010e238 2020-12-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
6409 4010e238 2020-12-04 stsp NULL) == -1)
6410 4010e238 2020-12-04 stsp err(1, "pledge");
6413 c2301be8 2018-04-30 stsp if (argc == 0) {
6414 f29d3e89 2018-06-23 stsp if (hflag)
6415 6879ba42 2020-10-01 naddy usage(hflag, 0);
6416 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
6417 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
6419 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
6423 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
6424 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
6425 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
6426 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
6427 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
6433 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
6434 ee85c5e8 2020-02-29 stsp if (argc != 1)
6435 6879ba42 2020-10-01 naddy usage(0, 1);
6436 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
6437 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
6439 ee85c5e8 2020-02-29 stsp if (hflag)
6440 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
6442 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
6446 b46c1e04 2020-09-20 naddy putchar('\n');
6447 a2f4a359 2020-02-28 stsp if (cmd_argv) {
6449 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
6450 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
6451 a2f4a359 2020-02-28 stsp free(cmd_argv);
6454 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
6455 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
