2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 9f7d7167 2018-04-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 9f7d7167 2018-04-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 9f7d7167 2018-04-29 stsp * copyright notice and this permission notice appear in all copies.
8 9f7d7167 2018-04-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 9f7d7167 2018-04-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 9f7d7167 2018-04-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 9f7d7167 2018-04-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 9f7d7167 2018-04-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 9f7d7167 2018-04-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 9f7d7167 2018-04-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 80ddbec8 2018-04-29 stsp #include <sys/queue.h>
18 ffd1d5e5 2018-06-23 stsp #include <sys/stat.h>
19 25791caa 2018-10-24 stsp #include <sys/ioctl.h>
21 0d6c6ee3 2020-05-20 stsp #include <ctype.h>
22 31120ada 2018-04-30 stsp #include <errno.h>
23 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
24 9f7d7167 2018-04-29 stsp #include <curses.h>
25 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
26 9f7d7167 2018-04-29 stsp #include <panel.h>
27 9f7d7167 2018-04-29 stsp #include <locale.h>
28 61266923 2020-01-14 stsp #include <signal.h>
29 9f7d7167 2018-04-29 stsp #include <stdlib.h>
30 ee85c5e8 2020-02-29 stsp #include <stdarg.h>
31 26ed57b2 2018-05-19 stsp #include <stdio.h>
32 9f7d7167 2018-04-29 stsp #include <getopt.h>
33 9f7d7167 2018-04-29 stsp #include <string.h>
34 9f7d7167 2018-04-29 stsp #include <err.h>
35 80ddbec8 2018-04-29 stsp #include <unistd.h>
36 26ed57b2 2018-05-19 stsp #include <util.h>
37 26ed57b2 2018-05-19 stsp #include <limits.h>
38 61e69b96 2018-05-20 stsp #include <wchar.h>
39 788c352e 2018-06-16 stsp #include <time.h>
40 84451b3e 2018-07-10 stsp #include <pthread.h>
41 5036bf37 2018-09-24 stsp #include <libgen.h>
42 60493ae3 2019-06-20 stsp #include <regex.h>
44 53ccebc2 2019-07-30 stsp #include "got_version.h"
45 9f7d7167 2018-04-29 stsp #include "got_error.h"
46 80ddbec8 2018-04-29 stsp #include "got_object.h"
47 80ddbec8 2018-04-29 stsp #include "got_reference.h"
48 80ddbec8 2018-04-29 stsp #include "got_repository.h"
49 80ddbec8 2018-04-29 stsp #include "got_diff.h"
50 511a516b 2018-05-19 stsp #include "got_opentemp.h"
51 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
52 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
53 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
54 a70480e0 2018-06-23 stsp #include "got_blame.h"
55 c2db6724 2019-01-04 stsp #include "got_privsep.h"
56 1dd54920 2019-05-11 stsp #include "got_path.h"
57 b7165be3 2019-02-05 stsp #include "got_worktree.h"
60 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
67 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
69 9f7d7167 2018-04-29 stsp #ifndef nitems
70 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
73 9f7d7167 2018-04-29 stsp struct tog_cmd {
74 c2301be8 2018-04-30 stsp const char *name;
75 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
76 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
79 6879ba42 2020-10-01 naddy __dead static void usage(int, int);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
82 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
83 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
85 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
86 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
87 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
88 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
90 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
91 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
92 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
93 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
94 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
97 d6b05b5b 2018-08-04 stsp enum tog_view_type {
98 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
99 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
100 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
101 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
104 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
106 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
107 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
108 ba4f502b 2018-08-04 stsp struct got_object_id *id;
109 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
112 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
113 ba4f502b 2018-08-04 stsp struct commit_queue {
114 ba4f502b 2018-08-04 stsp int ncommits;
115 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
118 f26dddb7 2019-11-08 stsp struct tog_color {
119 f26dddb7 2019-11-08 stsp SIMPLEQ_ENTRY(tog_color) entry;
120 6d17833f 2019-11-08 stsp regex_t regex;
121 6d17833f 2019-11-08 stsp short colorpair;
123 f26dddb7 2019-11-08 stsp SIMPLEQ_HEAD(tog_colors, tog_color);
125 11b20872 2019-11-08 stsp static const struct got_error *
126 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
127 11b20872 2019-11-08 stsp int idx, short color)
129 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
130 11b20872 2019-11-08 stsp struct tog_color *tc;
131 11b20872 2019-11-08 stsp int regerr = 0;
133 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
134 11b20872 2019-11-08 stsp return NULL;
136 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
138 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
139 11b20872 2019-11-08 stsp if (tc == NULL)
140 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
141 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
142 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
143 11b20872 2019-11-08 stsp if (regerr) {
144 11b20872 2019-11-08 stsp static char regerr_msg[512];
145 11b20872 2019-11-08 stsp static char err_msg[512];
146 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
147 11b20872 2019-11-08 stsp sizeof(regerr_msg));
148 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
149 11b20872 2019-11-08 stsp regerr_msg);
150 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
152 11b20872 2019-11-08 stsp return err;
154 11b20872 2019-11-08 stsp tc->colorpair = idx;
155 11b20872 2019-11-08 stsp SIMPLEQ_INSERT_HEAD(colors, tc, entry);
156 11b20872 2019-11-08 stsp return NULL;
159 11b20872 2019-11-08 stsp static void
160 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
162 11b20872 2019-11-08 stsp struct tog_color *tc;
164 11b20872 2019-11-08 stsp while (!SIMPLEQ_EMPTY(colors)) {
165 11b20872 2019-11-08 stsp tc = SIMPLEQ_FIRST(colors);
166 11b20872 2019-11-08 stsp SIMPLEQ_REMOVE_HEAD(colors, entry);
167 11b20872 2019-11-08 stsp regfree(&tc->regex);
172 11b20872 2019-11-08 stsp struct tog_color *
173 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
175 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
177 11b20872 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
178 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
182 11b20872 2019-11-08 stsp return NULL;
186 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
188 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
189 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
190 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
191 11b20872 2019-11-08 stsp return COLOR_CYAN;
192 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
193 11b20872 2019-11-08 stsp return COLOR_YELLOW;
194 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
195 11b20872 2019-11-08 stsp return COLOR_GREEN;
196 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
197 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
198 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
199 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
200 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
201 91b8c405 2020-01-25 stsp return COLOR_CYAN;
202 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
203 11b20872 2019-11-08 stsp return COLOR_GREEN;
204 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
205 11b20872 2019-11-08 stsp return COLOR_GREEN;
206 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
207 11b20872 2019-11-08 stsp return COLOR_CYAN;
208 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
209 11b20872 2019-11-08 stsp return COLOR_YELLOW;
215 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
217 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
219 11b20872 2019-11-08 stsp if (val == NULL)
220 11b20872 2019-11-08 stsp return default_color_value(envvar);
222 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
223 11b20872 2019-11-08 stsp return COLOR_BLACK;
224 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
225 11b20872 2019-11-08 stsp return COLOR_RED;
226 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
227 11b20872 2019-11-08 stsp return COLOR_GREEN;
228 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
229 11b20872 2019-11-08 stsp return COLOR_YELLOW;
230 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
231 11b20872 2019-11-08 stsp return COLOR_BLUE;
232 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
233 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
234 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
235 11b20872 2019-11-08 stsp return COLOR_CYAN;
236 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
237 11b20872 2019-11-08 stsp return COLOR_WHITE;
238 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
241 11b20872 2019-11-08 stsp return default_color_value(envvar);
245 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
246 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
248 15a087fe 2019-02-21 stsp int first_displayed_line;
249 15a087fe 2019-02-21 stsp int last_displayed_line;
251 15a087fe 2019-02-21 stsp int diff_context;
252 15a087fe 2019-02-21 stsp struct got_repository *repo;
253 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
254 bddb1296 2019-11-08 stsp struct tog_colors colors;
255 fe621944 2020-11-10 stsp size_t nlines;
256 f44b1f58 2020-02-02 tracey off_t *line_offsets;
257 f44b1f58 2020-02-02 tracey int matched_line;
258 f44b1f58 2020-02-02 tracey int selected_line;
260 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
261 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
264 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
266 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
267 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
268 7c1452c1 2020-03-26 stsp pthread_cond_t commit_loaded;
269 1a76625f 2018-10-22 stsp int commits_needed;
270 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
271 1a76625f 2018-10-22 stsp struct commit_queue *commits;
272 1a76625f 2018-10-22 stsp const char *in_repo_path;
273 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
274 1a76625f 2018-10-22 stsp struct got_repository *repo;
275 1a76625f 2018-10-22 stsp int log_complete;
276 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
277 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
278 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
279 13add988 2019-10-15 stsp int *searching;
280 13add988 2019-10-15 stsp int *search_next_done;
281 13add988 2019-10-15 stsp regex_t *regex;
284 1a76625f 2018-10-22 stsp struct tog_log_view_state {
285 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
286 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
287 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
288 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
289 b01e7d3b 2018-08-04 stsp int selected;
290 b01e7d3b 2018-08-04 stsp char *in_repo_path;
291 d01904d4 2019-06-25 stsp const char *head_ref_name;
292 b672a97a 2020-01-27 stsp int log_branches;
293 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
294 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
295 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
296 1a76625f 2018-10-22 stsp sig_atomic_t quit;
297 1a76625f 2018-10-22 stsp pthread_t thread;
298 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
299 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
300 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
301 11b20872 2019-11-08 stsp struct tog_colors colors;
304 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
305 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
306 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
307 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
308 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
309 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
310 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
311 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
312 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
313 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
314 11b20872 2019-11-08 stsp #define TOG_COLOR_DATE 11
316 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
317 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
318 e9424729 2018-08-04 stsp int nlines;
320 e9424729 2018-08-04 stsp struct tog_view *view;
321 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
325 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
326 e9424729 2018-08-04 stsp const char *path;
327 e9424729 2018-08-04 stsp struct got_repository *repo;
328 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
329 e9424729 2018-08-04 stsp int *complete;
330 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
331 fc06ba56 2019-08-22 stsp void *cancel_arg;
334 e9424729 2018-08-04 stsp struct tog_blame {
336 e9424729 2018-08-04 stsp size_t filesize;
337 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
338 6fcac457 2018-11-19 stsp int nlines;
339 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
340 e9424729 2018-08-04 stsp pthread_t thread;
341 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
342 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
343 e9424729 2018-08-04 stsp const char *path;
346 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
347 7cbe629d 2018-08-04 stsp int first_displayed_line;
348 7cbe629d 2018-08-04 stsp int last_displayed_line;
349 7cbe629d 2018-08-04 stsp int selected_line;
350 7cbe629d 2018-08-04 stsp int blame_complete;
353 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
354 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
355 e5a0f69f 2018-08-18 stsp char *path;
356 7cbe629d 2018-08-04 stsp struct got_repository *repo;
357 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
358 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
359 e9424729 2018-08-04 stsp struct tog_blame blame;
360 6c4c42e0 2019-06-24 stsp int matched_line;
361 11b20872 2019-11-08 stsp struct tog_colors colors;
364 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
365 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
366 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
367 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
368 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
369 ad80ab7b 2018-08-04 stsp int selected;
372 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
374 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
375 ad80ab7b 2018-08-04 stsp char *tree_label;
376 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
377 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
378 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
379 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
380 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
381 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
382 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
383 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
384 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
385 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
386 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
387 bddb1296 2019-11-08 stsp struct tog_colors colors;
391 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
393 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
394 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
395 669b5ffa 2018-10-07 stsp * there is enough screen estate.
397 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
398 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
400 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
401 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
402 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
404 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
405 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
407 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
409 cc3c9aac 2018-08-01 stsp struct tog_view {
410 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
411 26ed57b2 2018-05-19 stsp WINDOW *window;
412 26ed57b2 2018-05-19 stsp PANEL *panel;
413 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
414 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
415 1004088d 2018-09-29 stsp int focussed;
416 669b5ffa 2018-10-07 stsp struct tog_view *parent;
417 669b5ffa 2018-10-07 stsp struct tog_view *child;
418 669b5ffa 2018-10-07 stsp int child_focussed;
420 5dc9f4bc 2018-08-04 stsp /* type-specific state */
421 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
423 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
424 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
425 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
426 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
429 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
430 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
431 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
432 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
434 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
435 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
436 60493ae3 2019-06-20 stsp int searching;
437 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
438 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
439 60493ae3 2019-06-20 stsp int search_next_done;
440 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_HAVE_MORE 1
441 8f4ed634 2020-03-26 stsp #define TOG_SEARCH_NO_MORE 2
442 f9967bca 2020-03-27 stsp #define TOG_SEARCH_HAVE_NONE 3
443 1803e47f 2019-06-22 stsp regex_t regex;
444 41605754 2020-11-12 stsp regmatch_t regmatch;
447 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
448 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
449 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
450 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
451 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
452 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
453 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
454 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
455 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
457 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
458 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
459 f135c941 2020-02-20 stsp struct got_repository *, const char *, const char *, int);
460 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
461 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
462 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
463 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
464 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
465 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
467 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
468 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
469 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
470 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
471 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
472 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
473 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
474 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
476 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
477 55cccc34 2020-02-20 stsp struct got_tree_object *, struct got_object_id *, struct got_reflist_head *,
478 55cccc34 2020-02-20 stsp struct got_repository *);
479 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
480 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
481 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
482 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
483 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
484 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
486 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
487 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
488 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
490 25791caa 2018-10-24 stsp static void
491 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
493 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
496 83baff54 2019-08-12 stsp static void
497 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
499 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
502 61266923 2020-01-14 stsp static void
503 61266923 2020-01-14 stsp tog_sigcont(int signo)
505 61266923 2020-01-14 stsp tog_sigcont_received = 1;
508 e5a0f69f 2018-08-18 stsp static const struct got_error *
509 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
511 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
513 669b5ffa 2018-10-07 stsp if (view->child) {
514 669b5ffa 2018-10-07 stsp view_close(view->child);
515 669b5ffa 2018-10-07 stsp view->child = NULL;
517 e5a0f69f 2018-08-18 stsp if (view->close)
518 e5a0f69f 2018-08-18 stsp err = view->close(view);
519 ea5e7bb5 2018-08-01 stsp if (view->panel)
520 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
521 ea5e7bb5 2018-08-01 stsp if (view->window)
522 ea5e7bb5 2018-08-01 stsp delwin(view->window);
523 ea5e7bb5 2018-08-01 stsp free(view);
524 e5a0f69f 2018-08-18 stsp return err;
527 ea5e7bb5 2018-08-01 stsp static struct tog_view *
528 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
529 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
531 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
533 ea5e7bb5 2018-08-01 stsp if (view == NULL)
534 ea5e7bb5 2018-08-01 stsp return NULL;
536 d6b05b5b 2018-08-04 stsp view->type = type;
537 f7d12f7e 2018-08-01 stsp view->lines = LINES;
538 f7d12f7e 2018-08-01 stsp view->cols = COLS;
539 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
540 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
541 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
542 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
543 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
544 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
545 96a765a8 2018-08-04 stsp view_close(view);
546 ea5e7bb5 2018-08-01 stsp return NULL;
548 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
549 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
550 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
551 96a765a8 2018-08-04 stsp view_close(view);
552 ea5e7bb5 2018-08-01 stsp return NULL;
555 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
556 ea5e7bb5 2018-08-01 stsp return view;
560 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
562 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
564 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
567 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
569 5c60c32a 2018-10-18 stsp static const struct got_error *
570 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
572 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
574 5c60c32a 2018-10-18 stsp view->begin_y = 0;
575 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
576 5c60c32a 2018-10-18 stsp view->nlines = LINES;
577 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
578 5c60c32a 2018-10-18 stsp view->lines = LINES;
579 5c60c32a 2018-10-18 stsp view->cols = COLS;
580 5c60c32a 2018-10-18 stsp err = view_resize(view);
582 5c60c32a 2018-10-18 stsp return err;
584 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
585 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
587 5c60c32a 2018-10-18 stsp return NULL;
590 5c60c32a 2018-10-18 stsp static const struct got_error *
591 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
593 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
595 5c60c32a 2018-10-18 stsp view->begin_x = 0;
596 5c60c32a 2018-10-18 stsp view->begin_y = 0;
597 5c60c32a 2018-10-18 stsp view->nlines = LINES;
598 5c60c32a 2018-10-18 stsp view->ncols = COLS;
599 5c60c32a 2018-10-18 stsp view->lines = LINES;
600 5c60c32a 2018-10-18 stsp view->cols = COLS;
601 5c60c32a 2018-10-18 stsp err = view_resize(view);
603 5c60c32a 2018-10-18 stsp return err;
605 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
606 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
608 5c60c32a 2018-10-18 stsp return NULL;
612 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
614 5c60c32a 2018-10-18 stsp return view->parent == NULL;
617 4d8c2215 2018-08-19 stsp static const struct got_error *
618 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
620 f7d12f7e 2018-08-01 stsp int nlines, ncols;
622 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
623 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
625 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
627 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
628 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
630 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
632 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
633 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
634 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
635 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
636 25791caa 2018-10-24 stsp wclear(view->window);
638 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
639 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
640 0cf4efb1 2018-09-29 stsp view->lines = LINES;
641 0cf4efb1 2018-09-29 stsp view->cols = COLS;
643 6e3e5d9c 2018-10-18 stsp if (view->child) {
644 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
645 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
646 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
647 5c60c32a 2018-10-18 stsp if (view->child->focussed)
648 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
650 5c60c32a 2018-10-18 stsp show_panel(view->panel);
652 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
653 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
657 5c60c32a 2018-10-18 stsp return NULL;
660 669b5ffa 2018-10-07 stsp static const struct got_error *
661 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
663 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
665 669b5ffa 2018-10-07 stsp if (view->child == NULL)
666 669b5ffa 2018-10-07 stsp return NULL;
668 669b5ffa 2018-10-07 stsp err = view_close(view->child);
669 669b5ffa 2018-10-07 stsp view->child = NULL;
670 669b5ffa 2018-10-07 stsp return err;
673 669b5ffa 2018-10-07 stsp static const struct got_error *
674 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
676 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
678 669b5ffa 2018-10-07 stsp view->child = child;
679 669b5ffa 2018-10-07 stsp child->parent = view;
680 669b5ffa 2018-10-07 stsp return err;
684 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
686 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
689 34bc9ec9 2019-02-22 stsp static void
690 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
692 25791caa 2018-10-24 stsp int cols, lines;
693 25791caa 2018-10-24 stsp struct winsize size;
695 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
696 25791caa 2018-10-24 stsp cols = 80; /* Default */
697 25791caa 2018-10-24 stsp lines = 24;
699 25791caa 2018-10-24 stsp cols = size.ws_col;
700 25791caa 2018-10-24 stsp lines = size.ws_row;
702 25791caa 2018-10-24 stsp resize_term(lines, cols);
705 2b49a8ae 2019-06-22 stsp static const struct got_error *
706 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
708 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
709 2b49a8ae 2019-06-22 stsp char pattern[1024];
712 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
713 2b49a8ae 2019-06-22 stsp return NULL;
715 cb1159f8 2020-02-19 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
716 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
718 2b49a8ae 2019-06-22 stsp nocbreak();
720 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
723 2b49a8ae 2019-06-22 stsp if (ret == ERR)
724 2b49a8ae 2019-06-22 stsp return NULL;
726 2b49a8ae 2019-06-22 stsp if (view->searching) {
727 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
728 2b49a8ae 2019-06-22 stsp view->searching = 0;
731 41605754 2020-11-12 stsp if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) {
732 7c32bd05 2019-06-22 stsp err = view->search_start(view);
734 7c32bd05 2019-06-22 stsp regfree(&view->regex);
735 7c32bd05 2019-06-22 stsp return err;
737 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
738 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
739 2b49a8ae 2019-06-22 stsp view->search_next(view);
742 2b49a8ae 2019-06-22 stsp return NULL;
745 0cf4efb1 2018-09-29 stsp static const struct got_error *
746 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
747 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
748 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
750 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
751 669b5ffa 2018-10-07 stsp struct tog_view *v;
752 1a76625f 2018-10-22 stsp int ch, errcode;
754 e5a0f69f 2018-08-18 stsp *new = NULL;
755 e5a0f69f 2018-08-18 stsp *dead = NULL;
756 0cf4efb1 2018-09-29 stsp *focus = NULL;
758 f9967bca 2020-03-27 stsp /* Clear "no matches" indicator. */
759 f9967bca 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE ||
760 f9967bca 2020-03-27 stsp view->search_next_done == TOG_SEARCH_HAVE_NONE)
761 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
763 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
764 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
765 82954512 2020-02-03 stsp if (errcode)
766 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
767 82954512 2020-02-03 stsp "pthread_mutex_unlock");
768 82954512 2020-02-03 stsp pthread_yield();
769 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
770 82954512 2020-02-03 stsp if (errcode)
771 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
772 82954512 2020-02-03 stsp "pthread_mutex_lock");
773 60493ae3 2019-06-20 stsp view->search_next(view);
774 60493ae3 2019-06-20 stsp return NULL;
777 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
778 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
779 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
780 1a76625f 2018-10-22 stsp if (errcode)
781 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
782 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
783 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
784 1a76625f 2018-10-22 stsp if (errcode)
785 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
786 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
788 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
789 25791caa 2018-10-24 stsp tog_resizeterm();
790 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
791 61266923 2020-01-14 stsp tog_sigcont_received = 0;
792 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
793 25791caa 2018-10-24 stsp err = view_resize(v);
795 25791caa 2018-10-24 stsp return err;
796 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
798 25791caa 2018-10-24 stsp return err;
802 e5a0f69f 2018-08-18 stsp switch (ch) {
806 1e37a5c2 2019-05-12 jcs if (view->child) {
807 1e37a5c2 2019-05-12 jcs *focus = view->child;
808 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
809 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
810 1e37a5c2 2019-05-12 jcs *focus = view->parent;
811 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
815 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
816 1e37a5c2 2019-05-12 jcs *dead = view;
822 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
823 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
825 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
826 669b5ffa 2018-10-07 stsp *focus = view->child;
827 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
828 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
830 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
833 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
834 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
836 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
837 1e37a5c2 2019-05-12 jcs *focus = view;
838 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
839 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
841 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
845 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
846 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
849 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
852 60493ae3 2019-06-20 stsp if (view->search_start)
853 2b49a8ae 2019-06-22 stsp view_search_start(view);
855 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
859 8f4ed634 2020-03-26 stsp if (view->search_next) {
860 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
861 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
862 60493ae3 2019-06-20 stsp view->search_next_done = 0;
863 60493ae3 2019-06-20 stsp view->search_next(view);
865 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
868 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
872 e5a0f69f 2018-08-18 stsp return err;
876 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
878 0cf4efb1 2018-09-29 stsp PANEL *panel;
879 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
881 669b5ffa 2018-10-07 stsp if (view->parent)
882 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
884 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
885 0cf4efb1 2018-09-29 stsp if (panel == NULL)
888 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
889 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
890 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
894 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
896 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
897 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
899 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
901 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
904 669b5ffa 2018-10-07 stsp return view->focussed;
907 bcbd79e2 2018-08-19 stsp static const struct got_error *
908 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
910 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
911 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
912 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
913 fd823528 2018-10-22 stsp int fast_refresh = 10;
914 1a76625f 2018-10-22 stsp int done = 0, errcode;
916 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
917 1a76625f 2018-10-22 stsp if (errcode)
918 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
920 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
921 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
923 a81bf10d 2018-09-29 stsp main_view = view;
924 1004088d 2018-09-29 stsp view->focussed = 1;
925 878940b7 2018-09-29 stsp err = view->show(view);
927 0cf4efb1 2018-09-29 stsp return err;
928 0cf4efb1 2018-09-29 stsp update_panels();
929 0cf4efb1 2018-09-29 stsp doupdate();
930 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
931 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
932 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
933 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
935 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
936 e4197bf9 2018-08-18 stsp view, &views);
939 e5a0f69f 2018-08-18 stsp if (dead_view) {
940 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
942 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
943 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
944 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
945 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
946 669b5ffa 2018-10-07 stsp prev = view->parent;
948 669b5ffa 2018-10-07 stsp if (dead_view->parent)
949 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
951 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
953 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
954 d01904d4 2019-06-25 stsp if (err || (dead_view == main_view && new_view == NULL))
957 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
958 0cf4efb1 2018-09-29 stsp if (focus_view)
959 0cf4efb1 2018-09-29 stsp view = focus_view;
960 669b5ffa 2018-10-07 stsp else if (prev)
961 669b5ffa 2018-10-07 stsp view = prev;
962 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
963 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
964 0cf4efb1 2018-09-29 stsp tog_view_list_head);
966 0cf4efb1 2018-09-29 stsp view = NULL;
967 669b5ffa 2018-10-07 stsp if (view) {
968 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
969 669b5ffa 2018-10-07 stsp focus_view = view->child;
971 669b5ffa 2018-10-07 stsp focus_view = view;
975 bcbd79e2 2018-08-19 stsp if (new_view) {
976 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
977 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
978 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
979 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
981 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
982 86c66b02 2018-10-18 stsp err = view_close(v);
987 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
988 fed7eaa8 2018-10-24 stsp view = new_view;
989 878940b7 2018-09-29 stsp if (focus_view == NULL)
990 878940b7 2018-09-29 stsp focus_view = new_view;
992 0cf4efb1 2018-09-29 stsp if (focus_view) {
993 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
995 0cf4efb1 2018-09-29 stsp view->focussed = 0;
996 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
997 0cf4efb1 2018-09-29 stsp view = focus_view;
998 878940b7 2018-09-29 stsp if (new_view)
999 878940b7 2018-09-29 stsp show_panel(new_view->panel);
1000 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
1001 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
1003 669b5ffa 2018-10-07 stsp if (view) {
1004 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
1005 758194b5 2018-10-24 stsp view->focussed = 1;
1006 758194b5 2018-10-24 stsp show_panel(view->panel);
1007 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
1008 758194b5 2018-10-24 stsp show_panel(view->child->panel);
1009 1a76625f 2018-10-22 stsp focus_view = view;
1011 669b5ffa 2018-10-07 stsp if (view->parent) {
1012 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1014 1a76625f 2018-10-22 stsp goto done;
1016 669b5ffa 2018-10-07 stsp err = view->show(view);
1018 1a76625f 2018-10-22 stsp goto done;
1019 669b5ffa 2018-10-07 stsp if (view->child) {
1020 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1022 1a76625f 2018-10-22 stsp goto done;
1024 1a76625f 2018-10-22 stsp update_panels();
1025 1a76625f 2018-10-22 stsp doupdate();
1029 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1030 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1031 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1032 e5a0f69f 2018-08-18 stsp view_close(view);
1035 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1036 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1037 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1039 e5a0f69f 2018-08-18 stsp return err;
1042 4ed7e80c 2018-05-20 stsp __dead static void
1043 9f7d7167 2018-04-29 stsp usage_log(void)
1046 c70c5802 2018-08-01 stsp fprintf(stderr,
1047 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1048 9f7d7167 2018-04-29 stsp getprogname());
1052 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1053 80ddbec8 2018-04-29 stsp static const struct got_error *
1054 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1056 00dfcb92 2018-06-11 stsp char *vis = NULL;
1057 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1059 963b370f 2018-05-20 stsp *ws = NULL;
1060 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1061 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1062 00dfcb92 2018-06-11 stsp int vislen;
1063 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1064 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1066 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1067 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1069 00dfcb92 2018-06-11 stsp return err;
1070 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1071 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1072 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1073 a7f50699 2018-06-11 stsp goto done;
1077 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1078 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1079 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1080 a7f50699 2018-06-11 stsp goto done;
1083 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1084 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1086 00dfcb92 2018-06-11 stsp free(vis);
1087 963b370f 2018-05-20 stsp if (err) {
1088 963b370f 2018-05-20 stsp free(*ws);
1089 963b370f 2018-05-20 stsp *ws = NULL;
1090 963b370f 2018-05-20 stsp *wlen = 0;
1092 963b370f 2018-05-20 stsp return err;
1095 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
1096 963b370f 2018-05-20 stsp static const struct got_error *
1097 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1098 27a741e5 2019-09-11 stsp int col_tab_align)
1100 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1101 963b370f 2018-05-20 stsp int cols = 0;
1102 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1103 963b370f 2018-05-20 stsp size_t wlen;
1106 963b370f 2018-05-20 stsp *wlinep = NULL;
1107 b700b5d6 2018-07-10 stsp *widthp = 0;
1109 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
1111 963b370f 2018-05-20 stsp return err;
1114 27a741e5 2019-09-11 stsp while (i < wlen) {
1115 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
1117 27a741e5 2019-09-11 stsp if (width == 0) {
1122 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
1123 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1125 27a741e5 2019-09-11 stsp cols += width;
1127 27a741e5 2019-09-11 stsp } else if (width == -1) {
1128 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
1129 27a741e5 2019-09-11 stsp width = TABSIZE -
1130 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
1131 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1133 27a741e5 2019-09-11 stsp cols += width;
1137 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
1138 963b370f 2018-05-20 stsp goto done;
1141 963b370f 2018-05-20 stsp wline[i] = L'\0';
1142 b700b5d6 2018-07-10 stsp if (widthp)
1143 b700b5d6 2018-07-10 stsp *widthp = cols;
1146 963b370f 2018-05-20 stsp free(wline);
1148 963b370f 2018-05-20 stsp *wlinep = wline;
1149 963b370f 2018-05-20 stsp return err;
1152 8b473291 2019-02-21 stsp static const struct got_error*
1153 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1154 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1156 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1157 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1159 8b473291 2019-02-21 stsp const char *name;
1161 8b473291 2019-02-21 stsp *refs_str = NULL;
1163 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1164 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1165 48cae60d 2020-09-22 stsp struct got_object_id *ref_id;
1168 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1169 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1171 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1172 8b473291 2019-02-21 stsp name += 5;
1173 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1175 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1176 8b473291 2019-02-21 stsp name += 6;
1177 79cc719f 2020-04-24 stsp if (strncmp(name, "remotes/", 8) == 0) {
1178 8b473291 2019-02-21 stsp name += 8;
1179 79cc719f 2020-04-24 stsp s = strstr(name, "/" GOT_REF_HEAD);
1180 79cc719f 2020-04-24 stsp if (s != NULL && s[strlen(s)] == '\0')
1183 48cae60d 2020-09-22 stsp err = got_ref_resolve(&ref_id, repo, re->ref);
1186 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1187 48cae60d 2020-09-22 stsp err = got_object_open_as_tag(&tag, repo, ref_id);
1188 5d844a1e 2019-08-13 stsp if (err) {
1189 48cae60d 2020-09-22 stsp if (err->code != GOT_ERR_OBJ_TYPE) {
1190 48cae60d 2020-09-22 stsp free(ref_id);
1193 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1194 5d844a1e 2019-08-13 stsp err = NULL;
1195 5d844a1e 2019-08-13 stsp tag = NULL;
1198 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1199 48cae60d 2020-09-22 stsp got_object_tag_get_object_id(tag) : ref_id, id);
1200 48cae60d 2020-09-22 stsp free(ref_id);
1202 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1203 52b5abe1 2019-08-13 stsp if (cmp != 0)
1205 8b473291 2019-02-21 stsp s = *refs_str;
1206 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1207 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1208 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1210 8b473291 2019-02-21 stsp *refs_str = NULL;
1216 8b473291 2019-02-21 stsp return err;
1219 963b370f 2018-05-20 stsp static const struct got_error *
1220 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1221 27a741e5 2019-09-11 stsp int col_tab_align)
1223 5813d178 2019-03-09 stsp char *smallerthan, *at;
1225 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1226 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1227 5813d178 2019-03-09 stsp author = smallerthan + 1;
1228 5813d178 2019-03-09 stsp at = strchr(author, '@');
1230 5813d178 2019-03-09 stsp *at = '\0';
1231 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1234 5813d178 2019-03-09 stsp static const struct got_error *
1235 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1236 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1237 11b20872 2019-11-08 stsp const size_t date_display_cols, int author_display_cols,
1238 11b20872 2019-11-08 stsp struct tog_colors *colors)
1240 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1241 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1242 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1243 5813d178 2019-03-09 stsp char *author = NULL;
1244 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1245 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1246 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1247 bb737323 2018-05-20 stsp int col, limit;
1248 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1249 ccb26ccd 2018-11-05 stsp struct tm tm;
1250 45d799e2 2018-12-23 stsp time_t committer_time;
1251 11b20872 2019-11-08 stsp struct tog_color *tc;
1253 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1254 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1255 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1256 6db9f7f6 2019-12-10 stsp if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1257 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1258 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1260 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1261 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1263 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1264 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_DATE);
1266 11b20872 2019-11-08 stsp wattr_on(view->window,
1267 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1268 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1270 11b20872 2019-11-08 stsp wattr_off(view->window,
1271 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1272 27a741e5 2019-09-11 stsp col = limit;
1273 b39d25c7 2018-07-10 stsp if (col > avail)
1274 b39d25c7 2018-07-10 stsp goto done;
1276 6570a66d 2019-11-08 stsp if (avail >= 120) {
1277 6570a66d 2019-11-08 stsp char *id_str;
1278 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1280 6570a66d 2019-11-08 stsp goto done;
1281 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1283 11b20872 2019-11-08 stsp wattr_on(view->window,
1284 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1285 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1287 11b20872 2019-11-08 stsp wattr_off(view->window,
1288 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1289 6570a66d 2019-11-08 stsp free(id_str);
1291 6570a66d 2019-11-08 stsp if (col > avail)
1292 6570a66d 2019-11-08 stsp goto done;
1295 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1296 5813d178 2019-03-09 stsp if (author == NULL) {
1297 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1298 80ddbec8 2018-04-29 stsp goto done;
1300 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1302 bb737323 2018-05-20 stsp goto done;
1303 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_AUTHOR);
1305 11b20872 2019-11-08 stsp wattr_on(view->window,
1306 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1307 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1309 11b20872 2019-11-08 stsp wattr_off(view->window,
1310 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1311 bb737323 2018-05-20 stsp col += author_width;
1312 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1313 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1315 bb737323 2018-05-20 stsp author_width++;
1317 9c2eaf34 2018-05-20 stsp if (col > avail)
1318 9c2eaf34 2018-05-20 stsp goto done;
1320 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1322 6d9fbc00 2018-04-29 stsp goto done;
1323 bb737323 2018-05-20 stsp logmsg = logmsg0;
1324 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1326 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1327 bb737323 2018-05-20 stsp if (newline)
1328 bb737323 2018-05-20 stsp *newline = '\0';
1329 bb737323 2018-05-20 stsp limit = avail - col;
1330 dee2c213 2019-11-13 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1332 bb737323 2018-05-20 stsp goto done;
1333 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1334 bb737323 2018-05-20 stsp col += logmsg_width;
1335 27a741e5 2019-09-11 stsp while (col < avail) {
1336 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1340 80ddbec8 2018-04-29 stsp free(logmsg0);
1341 bb737323 2018-05-20 stsp free(wlogmsg);
1342 5813d178 2019-03-09 stsp free(author);
1343 bb737323 2018-05-20 stsp free(wauthor);
1344 80ddbec8 2018-04-29 stsp free(line);
1345 80ddbec8 2018-04-29 stsp return err;
1348 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1349 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1350 899d86c2 2018-05-10 stsp struct got_object_id *id)
1352 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1354 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1355 80ddbec8 2018-04-29 stsp if (entry == NULL)
1356 899d86c2 2018-05-10 stsp return NULL;
1358 899d86c2 2018-05-10 stsp entry->id = id;
1359 99db9666 2018-05-07 stsp entry->commit = commit;
1360 899d86c2 2018-05-10 stsp return entry;
1363 99db9666 2018-05-07 stsp static void
1364 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1366 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1368 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1369 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1370 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1371 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1372 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1373 99db9666 2018-05-07 stsp free(entry);
1376 99db9666 2018-05-07 stsp static void
1377 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1379 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1380 99db9666 2018-05-07 stsp pop_commit(commits);
1383 c4972b91 2018-05-07 stsp static const struct got_error *
1384 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1385 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1387 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1388 13add988 2019-10-15 stsp regmatch_t regmatch;
1389 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1391 13add988 2019-10-15 stsp *have_match = 0;
1393 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1395 13add988 2019-10-15 stsp return err;
1397 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1399 13add988 2019-10-15 stsp goto done;
1401 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1402 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1403 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1404 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1405 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1406 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1407 13add988 2019-10-15 stsp *have_match = 1;
1409 13add988 2019-10-15 stsp free(id_str);
1410 13add988 2019-10-15 stsp free(logmsg);
1411 13add988 2019-10-15 stsp return err;
1414 13add988 2019-10-15 stsp static const struct got_error *
1415 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1416 13add988 2019-10-15 stsp int minqueue, struct got_repository *repo, const char *path,
1417 13add988 2019-10-15 stsp int *searching, int *search_next_done, regex_t *regex)
1419 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1420 7c1452c1 2020-03-26 stsp int nqueued = 0;
1423 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1424 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1425 1a76625f 2018-10-22 stsp * while updating the display.
1427 13add988 2019-10-15 stsp while (nqueued < minqueue ||
1428 13add988 2019-10-15 stsp (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1429 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1430 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1431 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1432 1a76625f 2018-10-22 stsp int errcode;
1434 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1435 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1438 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1441 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1442 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1443 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1447 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1448 1a76625f 2018-10-22 stsp if (errcode) {
1449 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1450 13add988 2019-10-15 stsp "pthread_mutex_lock");
1454 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1455 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1456 ecb28ae0 2018-07-16 stsp nqueued++;
1457 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1459 13add988 2019-10-15 stsp if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1460 7c1452c1 2020-03-26 stsp int have_match;
1461 13add988 2019-10-15 stsp err = match_commit(&have_match, id, commit, regex);
1464 7c1452c1 2020-03-26 stsp if (have_match)
1465 8f4ed634 2020-03-26 stsp *search_next_done = TOG_SEARCH_HAVE_MORE;
1468 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1469 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1470 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1471 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1476 9ba79e04 2018-06-11 stsp return err;
1479 0553a4e3 2018-04-30 stsp static const struct got_error *
1480 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1481 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1482 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1483 11b20872 2019-11-08 stsp struct got_reflist_head *refs, const char *path, int commits_needed,
1484 11b20872 2019-11-08 stsp struct tog_colors *colors)
1486 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1487 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1488 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1489 60493ae3 2019-06-20 stsp int width;
1490 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1491 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1492 8b473291 2019-02-21 stsp char *refs_str = NULL;
1493 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1494 11b20872 2019-11-08 stsp struct tog_color *tc;
1495 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1497 e0d42f60 2018-07-22 stsp entry = first;
1498 e0d42f60 2018-07-22 stsp ncommits = 0;
1499 e0d42f60 2018-07-22 stsp while (entry) {
1500 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1501 e0d42f60 2018-07-22 stsp *selected = entry;
1504 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1505 e0d42f60 2018-07-22 stsp ncommits++;
1508 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1509 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1511 ecb28ae0 2018-07-16 stsp return err;
1512 8b473291 2019-02-21 stsp if (refs) {
1513 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, (*selected)->id,
1516 8b473291 2019-02-21 stsp goto done;
1520 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1521 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1523 8f4ed634 2020-03-26 stsp if (commits_needed > 0) {
1524 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1525 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1526 d2ad595c 2020-04-09 stsp (view->searching && !view->search_next_done) ?
1527 d2ad595c 2020-04-09 stsp "searching..." : "loading...") == -1) {
1528 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1529 8f4ed634 2020-03-26 stsp goto done;
1532 f9686aa5 2020-03-27 stsp const char *search_str = NULL;
1534 f9686aa5 2020-03-27 stsp if (view->searching) {
1535 f9686aa5 2020-03-27 stsp if (view->search_next_done == TOG_SEARCH_NO_MORE)
1536 f9686aa5 2020-03-27 stsp search_str = "no more matches";
1537 f9686aa5 2020-03-27 stsp else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1538 f9686aa5 2020-03-27 stsp search_str = "no matches found";
1539 f9686aa5 2020-03-27 stsp else if (!view->search_next_done)
1540 f9686aa5 2020-03-27 stsp search_str = "searching...";
1543 8f4ed634 2020-03-26 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1544 8f4ed634 2020-03-26 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1545 f9686aa5 2020-03-27 stsp search_str ? search_str :
1546 f9686aa5 2020-03-27 stsp (refs_str ? refs_str : "")) == -1) {
1547 8f4ed634 2020-03-26 stsp err = got_error_from_errno("asprintf");
1548 8f4ed634 2020-03-26 stsp goto done;
1552 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1553 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1554 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1555 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1556 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1557 1a76625f 2018-10-22 stsp header = NULL;
1558 1a76625f 2018-10-22 stsp goto done;
1560 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1561 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1562 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1563 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1564 1a76625f 2018-10-22 stsp header = NULL;
1565 1a76625f 2018-10-22 stsp goto done;
1567 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1569 1a76625f 2018-10-22 stsp goto done;
1571 2814baeb 2018-08-01 stsp werase(view->window);
1573 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1574 a3404814 2018-09-02 stsp wstandout(view->window);
1575 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1577 11b20872 2019-11-08 stsp wattr_on(view->window,
1578 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1579 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1581 11b20872 2019-11-08 stsp wattr_off(view->window,
1582 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1583 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1584 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1587 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1588 a3404814 2018-09-02 stsp wstandend(view->window);
1589 ecb28ae0 2018-07-16 stsp free(wline);
1590 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1591 1a76625f 2018-10-22 stsp goto done;
1593 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1594 899d86c2 2018-05-10 stsp entry = first;
1595 5813d178 2019-03-09 stsp ncommits = 0;
1596 5813d178 2019-03-09 stsp while (entry) {
1597 5813d178 2019-03-09 stsp char *author;
1598 5813d178 2019-03-09 stsp wchar_t *wauthor;
1599 5813d178 2019-03-09 stsp int width;
1600 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1602 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1603 5813d178 2019-03-09 stsp if (author == NULL) {
1604 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1605 5813d178 2019-03-09 stsp goto done;
1607 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1608 27a741e5 2019-09-11 stsp date_display_cols);
1609 5813d178 2019-03-09 stsp if (author_cols < width)
1610 5813d178 2019-03-09 stsp author_cols = width;
1611 5813d178 2019-03-09 stsp free(wauthor);
1612 5813d178 2019-03-09 stsp free(author);
1613 7ca04879 2019-10-19 stsp ncommits++;
1614 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1617 5813d178 2019-03-09 stsp entry = first;
1618 899d86c2 2018-05-10 stsp *last = first;
1619 867c6645 2018-07-10 stsp ncommits = 0;
1620 899d86c2 2018-05-10 stsp while (entry) {
1621 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1623 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1624 2814baeb 2018-08-01 stsp wstandout(view->window);
1625 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1626 11b20872 2019-11-08 stsp date_display_cols, author_cols, colors);
1627 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1628 2814baeb 2018-08-01 stsp wstandend(view->window);
1630 60493ae3 2019-06-20 stsp goto done;
1631 0553a4e3 2018-04-30 stsp ncommits++;
1632 899d86c2 2018-05-10 stsp *last = entry;
1633 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1636 1a57306a 2018-09-02 stsp view_vborder(view);
1638 1a76625f 2018-10-22 stsp free(id_str);
1639 8b473291 2019-02-21 stsp free(refs_str);
1640 1a76625f 2018-10-22 stsp free(ncommits_str);
1641 1a76625f 2018-10-22 stsp free(header);
1642 80ddbec8 2018-04-29 stsp return err;
1645 07b55e75 2018-05-10 stsp static void
1646 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1647 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1648 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1650 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1651 07b55e75 2018-05-10 stsp int nscrolled = 0;
1653 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1654 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1657 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1658 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1659 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1660 07b55e75 2018-05-10 stsp if (entry) {
1661 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1662 07b55e75 2018-05-10 stsp nscrolled++;
1667 aa075928 2018-05-10 stsp static const struct got_error *
1668 7c1452c1 2020-03-26 stsp trigger_log_thread(struct tog_view *log_view, int wait,
1669 7c1452c1 2020-03-26 stsp int *commits_needed, int *log_complete,
1670 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1672 5e224a3e 2019-02-22 stsp int errcode;
1674 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1676 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1677 5e224a3e 2019-02-22 stsp if (*log_complete)
1680 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1681 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1682 7aafa0d1 2019-02-22 stsp if (errcode)
1683 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1684 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1687 7c1452c1 2020-03-26 stsp * The mutex will be released while the view loop waits
1688 7c1452c1 2020-03-26 stsp * in wgetch(), at which time the log thread will run.
1690 7c1452c1 2020-03-26 stsp if (!wait)
1693 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1694 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1695 7c1452c1 2020-03-26 stsp update_panels();
1696 7c1452c1 2020-03-26 stsp doupdate();
1698 7c1452c1 2020-03-26 stsp /* Wait right here while next commit is being loaded. */
1699 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(commit_loaded, &tog_mutex);
1700 82954512 2020-02-03 stsp if (errcode)
1701 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1702 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
1704 7c1452c1 2020-03-26 stsp /* Display progress update in log view. */
1705 7c1452c1 2020-03-26 stsp show_log_view(log_view);
1706 7c1452c1 2020-03-26 stsp update_panels();
1707 7c1452c1 2020-03-26 stsp doupdate();
1710 5e224a3e 2019-02-22 stsp return NULL;
1713 5e224a3e 2019-02-22 stsp static const struct got_error *
1714 7c1452c1 2020-03-26 stsp scroll_down(struct tog_view *log_view,
1715 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1716 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1717 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1718 7c1452c1 2020-03-26 stsp pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1720 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1721 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1722 7c1452c1 2020-03-26 stsp int nscrolled = 0, ncommits_needed;
1724 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1725 5e224a3e 2019-02-22 stsp return NULL;
1727 7c1452c1 2020-03-26 stsp ncommits_needed = (*last_displayed_entry)->idx + 1 + maxscroll;
1728 7c1452c1 2020-03-26 stsp if (commits->ncommits < ncommits_needed && !*log_complete) {
1730 7c1452c1 2020-03-26 stsp * Ask the log thread for required amount of commits.
1732 7c1452c1 2020-03-26 stsp (*commits_needed) += maxscroll;
1733 7c1452c1 2020-03-26 stsp err = trigger_log_thread(log_view, 1, commits_needed,
1734 7c1452c1 2020-03-26 stsp log_complete, need_commits, commit_loaded);
1736 5e224a3e 2019-02-22 stsp return err;
1740 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1741 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1744 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1746 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1747 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1749 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1750 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1752 dd0a52c1 2018-05-20 stsp return err;
1755 cd0acaa7 2018-05-20 stsp static const struct got_error *
1756 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1757 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1758 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1759 8b473291 2019-02-21 stsp struct got_repository *repo)
1761 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1762 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1763 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1765 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1766 15a94983 2018-12-23 stsp if (diff_view == NULL)
1767 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1769 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1770 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1771 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1772 e5a0f69f 2018-08-18 stsp if (err == NULL)
1773 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1774 cd0acaa7 2018-05-20 stsp return err;
1777 80ddbec8 2018-04-29 stsp static const struct got_error *
1778 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1779 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1781 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1783 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1784 941e9f74 2019-05-21 stsp if (parent == NULL)
1785 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1787 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1788 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1789 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1790 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1791 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1792 941e9f74 2019-05-21 stsp s->tree = subtree;
1793 941e9f74 2019-05-21 stsp s->selected = 0;
1794 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1795 941e9f74 2019-05-21 stsp return NULL;
1798 941e9f74 2019-05-21 stsp static const struct got_error *
1799 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
1800 55cccc34 2020-02-20 stsp struct got_object_id *commit_id,
1801 55cccc34 2020-02-20 stsp const char *path, struct got_repository *repo)
1803 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1804 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
1805 941e9f74 2019-05-21 stsp const char *p;
1806 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
1808 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1810 941e9f74 2019-05-21 stsp while (*p) {
1811 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
1812 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1813 56e0773d 2019-11-28 stsp char *te_name;
1815 33cbf02b 2020-01-12 stsp while (p[0] == '/')
1818 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1819 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1820 941e9f74 2019-05-21 stsp if (slash == NULL)
1821 33cbf02b 2020-01-12 stsp te_name = strdup(p);
1823 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
1824 56e0773d 2019-11-28 stsp if (te_name == NULL) {
1825 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
1828 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
1829 56e0773d 2019-11-28 stsp if (te == NULL) {
1830 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1831 56e0773d 2019-11-28 stsp free(te_name);
1834 56e0773d 2019-11-28 stsp free(te_name);
1835 56e0773d 2019-11-28 stsp s->selected_entry = te;
1836 56e0773d 2019-11-28 stsp s->selected = got_tree_entry_get_index(te);
1837 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1838 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1840 56e0773d 2019-11-28 stsp if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry))) {
1841 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1842 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1843 67409a31 2019-05-24 stsp s->selected = 0;
1847 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1848 941e9f74 2019-05-21 stsp if (slash)
1849 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1851 941e9f74 2019-05-21 stsp subpath = strdup(path);
1852 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1853 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1857 55cccc34 2020-02-20 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
1862 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1863 941e9f74 2019-05-21 stsp free(tree_id);
1867 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1868 941e9f74 2019-05-21 stsp if (err) {
1869 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1872 941e9f74 2019-05-21 stsp if (slash == NULL)
1874 941e9f74 2019-05-21 stsp free(subpath);
1875 941e9f74 2019-05-21 stsp subpath = NULL;
1876 941e9f74 2019-05-21 stsp p = slash;
1879 941e9f74 2019-05-21 stsp free(subpath);
1880 1a76625f 2018-10-22 stsp return err;
1883 61266923 2020-01-14 stsp static const struct got_error *
1884 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1885 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
1886 55cccc34 2020-02-20 stsp struct got_reflist_head *refs, struct got_repository *repo)
1888 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
1889 55cccc34 2020-02-20 stsp struct got_tree_object *tree;
1890 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
1891 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
1893 55cccc34 2020-02-20 stsp err = got_object_open_as_tree(&tree, repo,
1894 55cccc34 2020-02-20 stsp got_object_commit_get_tree_id(entry->commit));
1896 55cccc34 2020-02-20 stsp return err;
1898 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1899 55cccc34 2020-02-20 stsp if (tree_view == NULL)
1900 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
1902 55cccc34 2020-02-20 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1903 55cccc34 2020-02-20 stsp if (err) {
1904 55cccc34 2020-02-20 stsp got_object_tree_close(tree);
1905 55cccc34 2020-02-20 stsp return err;
1907 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
1909 55cccc34 2020-02-20 stsp *new_view = tree_view;
1911 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
1912 55cccc34 2020-02-20 stsp return NULL;
1914 55cccc34 2020-02-20 stsp return tree_view_walk_path(s, entry->id, path, repo);
1917 55cccc34 2020-02-20 stsp static const struct got_error *
1918 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
1920 61266923 2020-01-14 stsp sigset_t sigset;
1921 61266923 2020-01-14 stsp int errcode;
1923 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
1924 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
1926 61266923 2020-01-14 stsp /* tog handles SIGWINCH and SIGCONT */
1927 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
1928 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1929 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
1930 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1932 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
1933 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
1934 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1936 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1937 61266923 2020-01-14 stsp if (errcode)
1938 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
1940 61266923 2020-01-14 stsp return NULL;
1943 1a76625f 2018-10-22 stsp static void *
1944 1a76625f 2018-10-22 stsp log_thread(void *arg)
1946 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1947 1a76625f 2018-10-22 stsp int errcode = 0;
1948 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1949 1a76625f 2018-10-22 stsp int done = 0;
1951 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
1953 61266923 2020-01-14 stsp return (void *)err;
1955 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1956 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1957 13add988 2019-10-15 stsp a->in_repo_path, a->searching, a->search_next_done,
1958 13add988 2019-10-15 stsp a->regex);
1959 1a76625f 2018-10-22 stsp if (err) {
1960 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1961 1a76625f 2018-10-22 stsp return (void *)err;
1962 1a76625f 2018-10-22 stsp err = NULL;
1964 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1965 1a76625f 2018-10-22 stsp a->commits_needed--;
1967 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1968 3abe8080 2019-04-10 stsp if (errcode) {
1969 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1970 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1972 3abe8080 2019-04-10 stsp } else if (*a->quit)
1974 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1975 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1976 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1977 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1980 7c1452c1 2020-03-26 stsp errcode = pthread_cond_signal(&a->commit_loaded);
1981 7c1452c1 2020-03-26 stsp if (errcode) {
1982 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1983 7c1452c1 2020-03-26 stsp "pthread_cond_signal");
1984 7c1452c1 2020-03-26 stsp pthread_mutex_unlock(&tog_mutex);
1989 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1991 7c1452c1 2020-03-26 stsp if (a->commits_needed == 0) {
1992 7c1452c1 2020-03-26 stsp errcode = pthread_cond_wait(&a->need_commits,
1993 7c1452c1 2020-03-26 stsp &tog_mutex);
1994 7c1452c1 2020-03-26 stsp if (errcode)
1995 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode,
1996 7c1452c1 2020-03-26 stsp "pthread_cond_wait");
2000 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2001 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2002 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
2003 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2005 3abe8080 2019-04-10 stsp a->log_complete = 1;
2006 1a76625f 2018-10-22 stsp return (void *)err;
2009 1a76625f 2018-10-22 stsp static const struct got_error *
2010 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
2012 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2013 1a76625f 2018-10-22 stsp int errcode;
2015 1a76625f 2018-10-22 stsp if (s->thread) {
2016 1a76625f 2018-10-22 stsp s->quit = 1;
2017 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
2018 1a76625f 2018-10-22 stsp if (errcode)
2019 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2020 2af4a041 2019-05-11 jcs "pthread_cond_signal");
2021 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2022 1a76625f 2018-10-22 stsp if (errcode)
2023 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2024 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2025 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
2026 1a76625f 2018-10-22 stsp if (errcode)
2027 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2028 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2029 1a76625f 2018-10-22 stsp if (errcode)
2030 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2031 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2032 1a76625f 2018-10-22 stsp s->thread = NULL;
2035 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
2036 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
2037 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
2040 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
2041 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
2042 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
2045 9343a5fb 2018-06-23 stsp return err;
2048 9343a5fb 2018-06-23 stsp static const struct got_error *
2049 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
2051 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2052 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2053 276b94a1 2020-11-13 naddy int errcode;
2055 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2057 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2058 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2059 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2061 276b94a1 2020-11-13 naddy errcode = pthread_cond_destroy(&s->thread_args.commit_loaded);
2062 276b94a1 2020-11-13 naddy if (errcode && err == NULL)
2063 276b94a1 2020-11-13 naddy err = got_error_set_errno(errcode, "pthread_cond_destroy");
2065 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2066 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2067 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2068 1a76625f 2018-10-22 stsp free(s->start_id);
2069 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2070 1a76625f 2018-10-22 stsp return err;
2073 1a76625f 2018-10-22 stsp static const struct got_error *
2074 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2076 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2078 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2079 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2080 60493ae3 2019-06-20 stsp return NULL;
2083 60493ae3 2019-06-20 stsp static const struct got_error *
2084 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2086 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2087 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2088 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2090 f9686aa5 2020-03-27 stsp /* Display progress update in log view. */
2091 f9686aa5 2020-03-27 stsp show_log_view(view);
2092 f9686aa5 2020-03-27 stsp update_panels();
2093 f9686aa5 2020-03-27 stsp doupdate();
2095 96e2b566 2019-07-08 stsp if (s->search_entry) {
2096 13add988 2019-10-15 stsp int errcode, ch;
2097 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2098 13add988 2019-10-15 stsp if (errcode)
2099 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2100 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2101 13add988 2019-10-15 stsp ch = wgetch(view->window);
2102 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2103 13add988 2019-10-15 stsp if (errcode)
2104 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2105 13add988 2019-10-15 stsp "pthread_mutex_lock");
2106 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2107 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2108 678cbce5 2019-07-28 stsp return NULL;
2110 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2111 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2113 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2114 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2115 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2116 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2117 8f4ed634 2020-03-26 stsp entry = TAILQ_NEXT(s->matched_entry, entry);
2119 8f4ed634 2020-03-26 stsp entry = TAILQ_PREV(s->matched_entry,
2120 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2122 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2123 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
2125 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2128 60493ae3 2019-06-20 stsp while (1) {
2129 13add988 2019-10-15 stsp int have_match = 0;
2131 60493ae3 2019-06-20 stsp if (entry == NULL) {
2132 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2133 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2134 f9967bca 2020-03-27 stsp view->search_next_done =
2135 f9967bca 2020-03-27 stsp (s->matched_entry == NULL ?
2136 f9967bca 2020-03-27 stsp TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2137 8f4ed634 2020-03-26 stsp s->search_entry = NULL;
2138 f801134a 2019-06-25 stsp return NULL;
2141 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2142 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2143 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2145 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2146 7c1452c1 2020-03-26 stsp return trigger_log_thread(view, 0,
2147 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
2148 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
2149 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2150 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2153 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2154 13add988 2019-10-15 stsp &view->regex);
2157 13add988 2019-10-15 stsp if (have_match) {
2158 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
2159 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2163 96e2b566 2019-07-08 stsp s->search_entry = entry;
2164 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2165 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2167 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2170 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2171 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2172 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2173 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2175 60493ae3 2019-06-20 stsp return err;
2178 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2179 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2181 60493ae3 2019-06-20 stsp return err;
2186 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2188 60493ae3 2019-06-20 stsp return NULL;
2191 60493ae3 2019-06-20 stsp static const struct got_error *
2192 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2193 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
2194 f135c941 2020-02-20 stsp const char *head_ref_name, const char *in_repo_path,
2195 b672a97a 2020-01-27 stsp int log_branches)
2197 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2198 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2199 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2200 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2201 1a76625f 2018-10-22 stsp int errcode;
2203 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2204 f135c941 2020-02-20 stsp free(s->in_repo_path);
2205 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2206 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2207 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2210 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2211 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2212 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2214 8b473291 2019-02-21 stsp s->refs = refs;
2215 fb2756b9 2018-08-04 stsp s->repo = repo;
2216 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
2217 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2218 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2219 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2220 5036bf37 2018-09-24 stsp goto done;
2222 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2224 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
2225 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2226 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2227 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2229 11b20872 2019-11-08 stsp goto done;
2230 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2231 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2232 11b20872 2019-11-08 stsp if (err) {
2233 11b20872 2019-11-08 stsp free_colors(&s->colors);
2234 11b20872 2019-11-08 stsp goto done;
2236 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2237 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2238 11b20872 2019-11-08 stsp if (err) {
2239 11b20872 2019-11-08 stsp free_colors(&s->colors);
2240 11b20872 2019-11-08 stsp goto done;
2244 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2245 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2246 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2247 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2248 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2250 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2252 1a76625f 2018-10-22 stsp goto done;
2253 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2254 b672a97a 2020-01-27 stsp !s->log_branches);
2256 1a76625f 2018-10-22 stsp goto done;
2257 62d463ca 2020-10-20 naddy err = got_commit_graph_iter_start(thread_graph, s->start_id,
2258 62d463ca 2020-10-20 naddy s->repo, NULL, NULL);
2260 c5b78334 2020-01-12 stsp goto done;
2262 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2263 1a76625f 2018-10-22 stsp if (errcode) {
2264 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2265 1a76625f 2018-10-22 stsp goto done;
2267 7c1452c1 2020-03-26 stsp errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2268 7c1452c1 2020-03-26 stsp if (errcode) {
2269 7c1452c1 2020-03-26 stsp err = got_error_set_errno(errcode, "pthread_cond_init");
2270 7c1452c1 2020-03-26 stsp goto done;
2273 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2274 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2275 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2276 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2277 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2278 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2279 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2280 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2281 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2282 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2283 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2284 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2285 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2288 1a76625f 2018-10-22 stsp close_log_view(view);
2289 ba4f502b 2018-08-04 stsp return err;
2292 e5a0f69f 2018-08-18 stsp static const struct got_error *
2293 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2295 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2297 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2298 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2299 2b380cc8 2018-10-24 stsp &s->thread_args);
2300 2b380cc8 2018-10-24 stsp if (errcode)
2301 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2304 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
2305 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
2306 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
2307 11b20872 2019-11-08 stsp s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2310 e5a0f69f 2018-08-18 stsp static const struct got_error *
2311 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2312 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2314 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2315 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2316 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
2317 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2318 669b5ffa 2018-10-07 stsp int begin_x = 0;
2319 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
2321 e5a0f69f 2018-08-18 stsp switch (ch) {
2323 1e37a5c2 2019-05-12 jcs s->quit = 1;
2326 1e37a5c2 2019-05-12 jcs case KEY_UP:
2329 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2331 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2332 1e37a5c2 2019-05-12 jcs s->selected--;
2334 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
2335 1144d21a 2019-06-21 stsp &s->commits);
2337 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2338 a4292ac5 2019-05-12 jcs case CTRL('b'):
2339 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2341 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
2342 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
2343 1e37a5c2 2019-05-12 jcs s->selected = 0;
2346 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
2347 1831ac02 2020-03-23 naddy view->nlines - 1, &s->commits);
2350 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2353 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2355 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2356 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2357 1e37a5c2 2019-05-12 jcs s->selected++;
2360 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
2361 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
2362 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
2363 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2364 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2365 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2367 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2368 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2369 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2370 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2371 1e37a5c2 2019-05-12 jcs if (first == NULL)
2373 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
2374 1831ac02 2020-03-23 naddy view->nlines - 1, &s->last_displayed_entry,
2375 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
2376 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2377 7c1452c1 2020-03-26 stsp &s->thread_args.need_commits,
2378 7c1452c1 2020-03-26 stsp &s->thread_args.commit_loaded);
2381 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2382 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2383 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2384 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2385 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2386 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2388 1e37a5c2 2019-05-12 jcs err = NULL;
2391 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2392 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2393 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2394 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2395 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2397 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2400 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2402 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2403 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2404 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2405 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2406 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2409 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2410 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2412 1e37a5c2 2019-05-12 jcs return err;
2413 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2415 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2418 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2419 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2421 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2424 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2426 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2427 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2428 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2429 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2432 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2433 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2435 1e37a5c2 2019-05-12 jcs return err;
2436 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2438 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2441 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2442 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2444 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2446 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2447 74cfe85e 2020-10-20 stsp if (got_path_cmp(s->in_repo_path, "/",
2448 74cfe85e 2020-10-20 stsp strlen(s->in_repo_path), 1) == 0)
2450 74cfe85e 2020-10-20 stsp err = got_path_dirname(&parent_path, s->in_repo_path);
2452 74cfe85e 2020-10-20 stsp return err;
2453 74cfe85e 2020-10-20 stsp err = stop_log_thread(s);
2454 74cfe85e 2020-10-20 stsp if (err) {
2455 74cfe85e 2020-10-20 stsp free(parent_path);
2456 74cfe85e 2020-10-20 stsp return err;
2458 74cfe85e 2020-10-20 stsp lv = view_open(view->nlines, view->ncols,
2459 74cfe85e 2020-10-20 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2460 74cfe85e 2020-10-20 stsp if (lv == NULL) {
2461 74cfe85e 2020-10-20 stsp free(parent_path);
2462 74cfe85e 2020-10-20 stsp return got_error_from_errno("view_open");
2464 74cfe85e 2020-10-20 stsp err = open_log_view(lv, s->start_id, s->refs,
2465 74cfe85e 2020-10-20 stsp s->repo, s->head_ref_name, parent_path,
2466 74cfe85e 2020-10-20 stsp s->log_branches);
2467 74cfe85e 2020-10-20 stsp free(parent_path);
2469 74cfe85e 2020-10-20 stsp return err;;
2470 74cfe85e 2020-10-20 stsp if (view_is_parent_view(view))
2471 74cfe85e 2020-10-20 stsp *new_view = lv;
2473 74cfe85e 2020-10-20 stsp view_set_child(view->parent, lv);
2474 74cfe85e 2020-10-20 stsp *focus_view = lv;
2477 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2478 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2480 d01904d4 2019-06-25 stsp return err;
2481 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2482 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2483 d01904d4 2019-06-25 stsp if (lv == NULL)
2484 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2485 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&start_id, NULL,
2486 71a27632 2020-01-15 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2487 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2488 ef129c5e 2019-08-03 stsp if (err) {
2489 ef129c5e 2019-08-03 stsp view_close(lv);
2490 d01904d4 2019-06-25 stsp return err;
2492 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2493 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2494 e6b23735 2019-10-04 stsp free(start_id);
2495 e6b23735 2019-10-04 stsp view_close(lv);
2496 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2498 e6b23735 2019-10-04 stsp got_ref_list_free(s->refs);
2499 e6b23735 2019-10-04 stsp err = got_ref_list(s->refs, s->repo, NULL,
2500 e6b23735 2019-10-04 stsp got_ref_cmp_by_name, NULL);
2501 e6b23735 2019-10-04 stsp if (err) {
2502 d01904d4 2019-06-25 stsp free(start_id);
2503 ef129c5e 2019-08-03 stsp view_close(lv);
2504 50284065 2019-10-04 stsp return err;
2506 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2507 f135c941 2020-02-20 stsp s->head_ref_name, in_repo_path, s->log_branches);
2508 ef129c5e 2019-08-03 stsp if (err) {
2509 ef129c5e 2019-08-03 stsp free(start_id);
2510 b672a97a 2020-01-27 stsp view_close(lv);
2511 b672a97a 2020-01-27 stsp return err;;
2513 b672a97a 2020-01-27 stsp *dead_view = view;
2514 b672a97a 2020-01-27 stsp *new_view = lv;
2517 b672a97a 2020-01-27 stsp s->log_branches = !s->log_branches;
2518 b672a97a 2020-01-27 stsp err = stop_log_thread(s);
2520 b672a97a 2020-01-27 stsp return err;
2521 b672a97a 2020-01-27 stsp lv = view_open(view->nlines, view->ncols,
2522 b672a97a 2020-01-27 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2523 b672a97a 2020-01-27 stsp if (lv == NULL)
2524 b672a97a 2020-01-27 stsp return got_error_from_errno("view_open");
2525 b672a97a 2020-01-27 stsp err = open_log_view(lv, s->start_id, s->refs, s->repo,
2526 f135c941 2020-02-20 stsp s->head_ref_name, s->in_repo_path, s->log_branches);
2527 b672a97a 2020-01-27 stsp if (err) {
2528 ef129c5e 2019-08-03 stsp view_close(lv);
2529 d01904d4 2019-06-25 stsp return err;;
2531 d01904d4 2019-06-25 stsp *dead_view = view;
2532 d01904d4 2019-06-25 stsp *new_view = lv;
2538 80ddbec8 2018-04-29 stsp return err;
2541 4ed7e80c 2018-05-20 stsp static const struct got_error *
2542 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2544 c2db6724 2019-01-04 stsp const struct got_error *error;
2546 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2547 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2548 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2550 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2551 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2553 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2554 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2556 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2557 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2559 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2560 c2db6724 2019-01-04 stsp if (error != NULL)
2561 c2db6724 2019-01-04 stsp return error;
2563 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2564 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2566 c2db6724 2019-01-04 stsp return NULL;
2569 a915003a 2019-02-05 stsp static void
2570 a915003a 2019-02-05 stsp init_curses(void)
2572 a915003a 2019-02-05 stsp initscr();
2574 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2577 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2578 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2579 a915003a 2019-02-05 stsp curs_set(0);
2580 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2581 6d17833f 2019-11-08 stsp start_color();
2582 6d17833f 2019-11-08 stsp use_default_colors();
2584 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2585 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2586 61266923 2020-01-14 stsp signal(SIGCONT, tog_sigcont);
2589 c2db6724 2019-01-04 stsp static const struct got_error *
2590 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2591 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2593 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2595 f135c941 2020-02-20 stsp if (argc == 0) {
2596 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2597 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2598 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2599 f135c941 2020-02-20 stsp return NULL;
2602 f135c941 2020-02-20 stsp if (worktree) {
2603 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2606 bfd61697 2020-11-14 stsp err = got_worktree_resolve_path(&p, worktree, argv[0]);
2608 f135c941 2020-02-20 stsp return err;
2609 bfd61697 2020-11-14 stsp if (asprintf(in_repo_path, "%s%s%s", prefix,
2610 bfd61697 2020-11-14 stsp (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
2611 bfd61697 2020-11-14 stsp p) == -1) {
2612 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2613 bfd61697 2020-11-14 stsp *in_repo_path = NULL;
2617 8fa913ec 2020-11-14 stsp err = got_repo_map_path(in_repo_path, repo, argv[0]);
2619 f135c941 2020-02-20 stsp return err;
2622 f135c941 2020-02-20 stsp static const struct got_error *
2623 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2625 80ddbec8 2018-04-29 stsp const struct got_error *error;
2626 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2627 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2628 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2629 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2630 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2631 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2632 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2633 04cc582a 2018-08-01 stsp struct tog_view *view;
2635 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2637 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2638 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2639 c2db6724 2019-01-04 stsp NULL) == -1)
2640 80ddbec8 2018-04-29 stsp err(1, "pledge");
2643 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2644 80ddbec8 2018-04-29 stsp switch (ch) {
2646 b672a97a 2020-01-27 stsp log_branches = 1;
2649 80ddbec8 2018-04-29 stsp start_commit = optarg;
2652 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2653 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2654 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2658 17020d27 2019-03-07 stsp usage_log();
2659 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2663 80ddbec8 2018-04-29 stsp argc -= optind;
2664 80ddbec8 2018-04-29 stsp argv += optind;
2666 f135c941 2020-02-20 stsp if (argc > 1)
2667 f135c941 2020-02-20 stsp usage_log();
2669 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2670 6962eb72 2020-02-20 stsp if (cwd == NULL)
2671 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
2673 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2674 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2675 963f97a1 2019-03-18 stsp goto done;
2677 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2678 a1fbf39a 2019-08-11 stsp if (worktree)
2679 6962eb72 2020-02-20 stsp repo_path =
2680 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2682 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2684 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2685 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2686 963f97a1 2019-03-18 stsp goto done;
2689 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2690 80ddbec8 2018-04-29 stsp if (error != NULL)
2691 ecb28ae0 2018-07-16 stsp goto done;
2693 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2694 f135c941 2020-02-20 stsp repo, worktree);
2695 f135c941 2020-02-20 stsp if (error)
2696 f135c941 2020-02-20 stsp goto done;
2698 f135c941 2020-02-20 stsp init_curses();
2700 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2701 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2702 c02c541e 2019-03-29 stsp if (error)
2703 c02c541e 2019-03-29 stsp goto done;
2705 15a94983 2018-12-23 stsp if (start_commit == NULL)
2706 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, worktree ?
2707 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2708 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2710 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, start_commit,
2711 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2712 80ddbec8 2018-04-29 stsp if (error != NULL)
2713 8b473291 2019-02-21 stsp goto done;
2715 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2716 8b473291 2019-02-21 stsp if (error)
2717 ecb28ae0 2018-07-16 stsp goto done;
2719 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2720 04cc582a 2018-08-01 stsp if (view == NULL) {
2721 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2722 04cc582a 2018-08-01 stsp goto done;
2724 2fc00ff4 2019-08-31 stsp if (worktree) {
2725 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2726 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2727 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2728 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2729 2fc00ff4 2019-08-31 stsp goto done;
2732 2fc00ff4 2019-08-31 stsp error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2733 f135c941 2020-02-20 stsp in_repo_path, log_branches);
2734 ba4f502b 2018-08-04 stsp if (error)
2735 ba4f502b 2018-08-04 stsp goto done;
2736 2fc00ff4 2019-08-31 stsp if (worktree) {
2737 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2738 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2739 2fc00ff4 2019-08-31 stsp worktree = NULL;
2741 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2743 f135c941 2020-02-20 stsp free(in_repo_path);
2744 ecb28ae0 2018-07-16 stsp free(repo_path);
2745 ecb28ae0 2018-07-16 stsp free(cwd);
2746 899d86c2 2018-05-10 stsp free(start_id);
2747 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2749 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2750 ec142235 2019-03-07 stsp if (worktree)
2751 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2752 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2753 80ddbec8 2018-04-29 stsp return error;
2756 4ed7e80c 2018-05-20 stsp __dead static void
2757 9f7d7167 2018-04-29 stsp usage_diff(void)
2760 09b5bff8 2020-02-23 naddy fprintf(stderr, "usage: %s diff [-r repository-path] object1 object2\n",
2761 9f7d7167 2018-04-29 stsp getprogname());
2765 b304db33 2018-05-20 stsp static char *
2766 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2768 b304db33 2018-05-20 stsp char *line;
2769 b304db33 2018-05-20 stsp size_t linelen;
2770 b304db33 2018-05-20 stsp size_t lineno;
2771 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2773 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2775 b304db33 2018-05-20 stsp *len = linelen;
2776 b304db33 2018-05-20 stsp return line;
2779 6d17833f 2019-11-08 stsp static int
2780 41605754 2020-11-12 stsp match_line(const char *line, regex_t *regex, size_t nmatch,
2781 41605754 2020-11-12 stsp regmatch_t *regmatch)
2783 41605754 2020-11-12 stsp return regexec(regex, line, nmatch, regmatch, 0) == 0;
2786 f26dddb7 2019-11-08 stsp struct tog_color *
2787 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
2789 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
2791 6d17833f 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
2792 41605754 2020-11-12 stsp if (match_line(line, &tc->regex, 0, NULL))
2793 6d17833f 2019-11-08 stsp return tc;
2796 6d17833f 2019-11-08 stsp return NULL;
2799 4ed7e80c 2018-05-20 stsp static const struct got_error *
2800 41605754 2020-11-12 stsp add_matched_line(int *wtotal, const char *line, int wlimit, int col_tab_align,
2801 41605754 2020-11-12 stsp WINDOW *window, regmatch_t *regmatch)
2803 41605754 2020-11-12 stsp const struct got_error *err = NULL;
2804 41605754 2020-11-12 stsp wchar_t *wline;
2805 41605754 2020-11-12 stsp int width;
2808 41605754 2020-11-12 stsp *wtotal = 0;
2810 41605754 2020-11-12 stsp s = strndup(line, regmatch->rm_so);
2811 41605754 2020-11-12 stsp if (s == NULL)
2812 41605754 2020-11-12 stsp return got_error_from_errno("strndup");
2814 41605754 2020-11-12 stsp err = format_line(&wline, &width, s, wlimit, col_tab_align);
2815 41605754 2020-11-12 stsp if (err) {
2817 41605754 2020-11-12 stsp return err;
2819 41605754 2020-11-12 stsp waddwstr(window, wline);
2820 41605754 2020-11-12 stsp free(wline);
2822 41605754 2020-11-12 stsp wlimit -= width;
2823 41605754 2020-11-12 stsp *wtotal += width;
2825 41605754 2020-11-12 stsp if (wlimit > 0) {
2826 41605754 2020-11-12 stsp s = strndup(line + regmatch->rm_so,
2827 41605754 2020-11-12 stsp regmatch->rm_eo - regmatch->rm_so);
2828 41605754 2020-11-12 stsp if (s == NULL) {
2829 41605754 2020-11-12 stsp err = got_error_from_errno("strndup");
2831 41605754 2020-11-12 stsp return err;
2833 41605754 2020-11-12 stsp err = format_line(&wline, &width, s, wlimit, col_tab_align);
2834 41605754 2020-11-12 stsp if (err) {
2836 41605754 2020-11-12 stsp return err;
2838 41605754 2020-11-12 stsp wattr_on(window, A_STANDOUT, NULL);
2839 41605754 2020-11-12 stsp waddwstr(window, wline);
2840 41605754 2020-11-12 stsp wattr_off(window, A_STANDOUT, NULL);
2841 41605754 2020-11-12 stsp free(wline);
2843 41605754 2020-11-12 stsp wlimit -= width;
2844 41605754 2020-11-12 stsp *wtotal += width;
2847 41605754 2020-11-12 stsp if (wlimit > 0 && strlen(line) > regmatch->rm_eo) {
2848 41605754 2020-11-12 stsp err = format_line(&wline, &width,
2849 41605754 2020-11-12 stsp line + regmatch->rm_eo, wlimit, col_tab_align);
2851 41605754 2020-11-12 stsp return err;
2852 41605754 2020-11-12 stsp waddwstr(window, wline);
2853 41605754 2020-11-12 stsp free(wline);
2854 41605754 2020-11-12 stsp *wtotal += width;
2857 41605754 2020-11-12 stsp return NULL;
2860 41605754 2020-11-12 stsp static const struct got_error *
2861 fe621944 2020-11-10 stsp draw_file(struct tog_view *view, FILE *f, int first_displayed_line, int nlines,
2862 fe621944 2020-11-10 stsp off_t *line_offsets, int selected_line, int max_lines,
2863 41605754 2020-11-12 stsp int *last_displayed_line, int *eof, char *header,
2864 41605754 2020-11-12 stsp struct tog_colors *colors, int matched_line, regmatch_t *regmatch)
2866 61e69b96 2018-05-20 stsp const struct got_error *err;
2867 fe621944 2020-11-10 stsp int nprinted = 0;
2868 b304db33 2018-05-20 stsp char *line;
2869 f26dddb7 2019-11-08 stsp struct tog_color *tc;
2870 b304db33 2018-05-20 stsp size_t len;
2871 61e69b96 2018-05-20 stsp wchar_t *wline;
2872 e0b650dd 2018-05-20 stsp int width;
2873 fe621944 2020-11-10 stsp off_t line_offset;
2875 fe621944 2020-11-10 stsp line_offset = line_offsets[first_displayed_line - 1];
2876 fe621944 2020-11-10 stsp if (fseeko(f, line_offset, SEEK_SET) == -1)
2877 fe621944 2020-11-10 stsp return got_error_from_errno("fseek");
2879 f7d12f7e 2018-08-01 stsp werase(view->window);
2881 a3404814 2018-09-02 stsp if (header) {
2882 135a2da0 2020-11-11 stsp if (asprintf(&line, "[%d/%d] %s",
2883 135a2da0 2020-11-11 stsp first_displayed_line - 1 + selected_line, nlines,
2884 135a2da0 2020-11-11 stsp header) == -1)
2885 135a2da0 2020-11-11 stsp return got_error_from_errno("asprintf");
2886 135a2da0 2020-11-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2887 135a2da0 2020-11-11 stsp free(line);
2889 a3404814 2018-09-02 stsp return err;
2891 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2892 a3404814 2018-09-02 stsp wstandout(view->window);
2893 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2894 e54cc94a 2020-11-11 stsp free(wline);
2895 e54cc94a 2020-11-11 stsp wline = NULL;
2896 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2897 a3404814 2018-09-02 stsp wstandend(view->window);
2898 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2899 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2901 a3404814 2018-09-02 stsp if (max_lines <= 1)
2902 a3404814 2018-09-02 stsp return NULL;
2903 a3404814 2018-09-02 stsp max_lines--;
2907 fe621944 2020-11-10 stsp while (max_lines > 0 && nprinted < max_lines) {
2908 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2909 26ed57b2 2018-05-19 stsp if (line == NULL) {
2914 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
2916 f26dddb7 2019-11-08 stsp wattr_on(view->window,
2917 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2918 41605754 2020-11-12 stsp if (first_displayed_line + nprinted == matched_line &&
2919 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
2920 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols, 0,
2921 41605754 2020-11-12 stsp view->window, regmatch);
2922 41605754 2020-11-12 stsp if (err) {
2923 41605754 2020-11-12 stsp free(line);
2924 41605754 2020-11-12 stsp return err;
2927 41605754 2020-11-12 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2928 41605754 2020-11-12 stsp if (err) {
2929 41605754 2020-11-12 stsp free(line);
2930 41605754 2020-11-12 stsp return err;
2932 41605754 2020-11-12 stsp waddwstr(view->window, wline);
2933 41605754 2020-11-12 stsp free(wline);
2934 41605754 2020-11-12 stsp wline = NULL;
2937 6d17833f 2019-11-08 stsp wattr_off(view->window,
2938 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2939 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2940 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2941 fe621944 2020-11-10 stsp nprinted++;
2942 26ed57b2 2018-05-19 stsp free(line);
2944 fe621944 2020-11-10 stsp if (nprinted >= 1)
2945 fe621944 2020-11-10 stsp *last_displayed_line = first_displayed_line + (nprinted - 1);
2947 fe621944 2020-11-10 stsp *last_displayed_line = first_displayed_line;
2949 1a57306a 2018-09-02 stsp view_vborder(view);
2951 c3e9aa98 2019-05-13 jcs if (*eof) {
2952 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2953 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2954 c3e9aa98 2019-05-13 jcs nprinted++;
2957 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2959 c3e9aa98 2019-05-13 jcs return err;
2962 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2963 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2964 e54cc94a 2020-11-11 stsp free(wline);
2965 e54cc94a 2020-11-11 stsp wline = NULL;
2966 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2969 26ed57b2 2018-05-19 stsp return NULL;
2972 abd2672a 2018-12-23 stsp static char *
2973 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2975 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2976 09867e48 2019-08-13 stsp char *p, *s;
2978 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2979 09867e48 2019-08-13 stsp if (tm == NULL)
2980 09867e48 2019-08-13 stsp return NULL;
2981 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2982 09867e48 2019-08-13 stsp if (s == NULL)
2983 09867e48 2019-08-13 stsp return NULL;
2984 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2986 abd2672a 2018-12-23 stsp *p = '\0';
2990 4ed7e80c 2018-05-20 stsp static const struct got_error *
2991 0208f208 2020-05-05 stsp get_changed_paths(struct got_pathlist_head *paths,
2992 0208f208 2020-05-05 stsp struct got_commit_object *commit, struct got_repository *repo)
2994 0208f208 2020-05-05 stsp const struct got_error *err = NULL;
2995 0208f208 2020-05-05 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2996 0208f208 2020-05-05 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2997 0208f208 2020-05-05 stsp struct got_object_qid *qid;
2999 0208f208 2020-05-05 stsp qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3000 0208f208 2020-05-05 stsp if (qid != NULL) {
3001 0208f208 2020-05-05 stsp struct got_commit_object *pcommit;
3002 0208f208 2020-05-05 stsp err = got_object_open_as_commit(&pcommit, repo,
3005 0208f208 2020-05-05 stsp return err;
3007 0208f208 2020-05-05 stsp tree_id1 = got_object_commit_get_tree_id(pcommit);
3008 0208f208 2020-05-05 stsp got_object_commit_close(pcommit);
3012 0208f208 2020-05-05 stsp if (tree_id1) {
3013 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
3015 0208f208 2020-05-05 stsp goto done;
3018 0208f208 2020-05-05 stsp tree_id2 = got_object_commit_get_tree_id(commit);
3019 0208f208 2020-05-05 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
3021 0208f208 2020-05-05 stsp goto done;
3023 0208f208 2020-05-05 stsp err = got_diff_tree(tree1, tree2, "", "", repo,
3024 0208f208 2020-05-05 stsp got_diff_tree_collect_changed_paths, paths, 0);
3026 0208f208 2020-05-05 stsp if (tree1)
3027 0208f208 2020-05-05 stsp got_object_tree_close(tree1);
3028 0208f208 2020-05-05 stsp if (tree2)
3029 0208f208 2020-05-05 stsp got_object_tree_close(tree2);
3030 0208f208 2020-05-05 stsp return err;
3033 0208f208 2020-05-05 stsp static const struct got_error *
3034 fe621944 2020-11-10 stsp add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
3038 fe621944 2020-11-10 stsp p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
3039 fe621944 2020-11-10 stsp if (p == NULL)
3040 fe621944 2020-11-10 stsp return got_error_from_errno("reallocarray");
3041 fe621944 2020-11-10 stsp *line_offsets = p;
3042 fe621944 2020-11-10 stsp (*line_offsets)[*nlines] = off;
3043 fe621944 2020-11-10 stsp (*nlines)++;
3044 fe621944 2020-11-10 stsp return NULL;
3047 fe621944 2020-11-10 stsp static const struct got_error *
3048 fe621944 2020-11-10 stsp write_commit_info(off_t **line_offsets, size_t *nlines,
3049 fe621944 2020-11-10 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3050 fe621944 2020-11-10 stsp struct got_repository *repo, FILE *outfile)
3052 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
3053 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
3054 15a94983 2018-12-23 stsp struct got_commit_object *commit;
3055 fe621944 2020-11-10 stsp char *id_str = NULL, *logmsg = NULL, *s = NULL, *line;
3056 45d799e2 2018-12-23 stsp time_t committer_time;
3057 45d799e2 2018-12-23 stsp const char *author, *committer;
3058 8b473291 2019-02-21 stsp char *refs_str = NULL;
3059 0208f208 2020-05-05 stsp struct got_pathlist_head changed_paths;
3060 0208f208 2020-05-05 stsp struct got_pathlist_entry *pe;
3061 fe621944 2020-11-10 stsp off_t outoff = 0;
3064 0208f208 2020-05-05 stsp TAILQ_INIT(&changed_paths);
3066 8b473291 2019-02-21 stsp if (refs) {
3067 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
3069 8b473291 2019-02-21 stsp return err;
3072 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
3074 abd2672a 2018-12-23 stsp return err;
3076 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
3077 15a94983 2018-12-23 stsp if (err) {
3078 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
3079 15a94983 2018-12-23 stsp goto done;
3082 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, 0);
3084 fe621944 2020-11-10 stsp goto done;
3086 fe621944 2020-11-10 stsp n = fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3087 fe621944 2020-11-10 stsp refs_str ? refs_str : "", refs_str ? ")" : "");
3088 fe621944 2020-11-10 stsp if (n < 0) {
3089 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3090 abd2672a 2018-12-23 stsp goto done;
3092 fe621944 2020-11-10 stsp outoff += n;
3093 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3095 fe621944 2020-11-10 stsp goto done;
3097 fe621944 2020-11-10 stsp n = fprintf(outfile, "from: %s\n",
3098 fe621944 2020-11-10 stsp got_object_commit_get_author(commit));
3099 fe621944 2020-11-10 stsp if (n < 0) {
3100 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
3101 abd2672a 2018-12-23 stsp goto done;
3103 fe621944 2020-11-10 stsp outoff += n;
3104 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3106 fe621944 2020-11-10 stsp goto done;
3108 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
3109 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
3110 fe621944 2020-11-10 stsp if (datestr) {
3111 fe621944 2020-11-10 stsp n = fprintf(outfile, "date: %s UTC\n", datestr);
3112 fe621944 2020-11-10 stsp if (n < 0) {
3113 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3114 fe621944 2020-11-10 stsp goto done;
3116 fe621944 2020-11-10 stsp outoff += n;
3117 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3119 fe621944 2020-11-10 stsp goto done;
3121 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
3122 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
3123 fe621944 2020-11-10 stsp if (strcmp(author, committer) != 0) {
3124 fe621944 2020-11-10 stsp n = fprintf(outfile, "via: %s\n", committer);
3125 fe621944 2020-11-10 stsp if (n < 0) {
3126 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3127 fe621944 2020-11-10 stsp goto done;
3129 fe621944 2020-11-10 stsp outoff += n;
3130 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3132 fe621944 2020-11-10 stsp goto done;
3134 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
3136 5943eee2 2019-08-13 stsp goto done;
3137 fe621944 2020-11-10 stsp s = logmsg;
3138 fe621944 2020-11-10 stsp while ((line = strsep(&s, "\n")) != NULL) {
3139 fe621944 2020-11-10 stsp n = fprintf(outfile, "%s\n", line);
3140 fe621944 2020-11-10 stsp if (n < 0) {
3141 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3142 fe621944 2020-11-10 stsp goto done;
3144 fe621944 2020-11-10 stsp outoff += n;
3145 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3147 fe621944 2020-11-10 stsp goto done;
3150 0208f208 2020-05-05 stsp err = get_changed_paths(&changed_paths, commit, repo);
3152 0208f208 2020-05-05 stsp goto done;
3153 0208f208 2020-05-05 stsp TAILQ_FOREACH(pe, &changed_paths, entry) {
3154 0208f208 2020-05-05 stsp struct got_diff_changed_path *cp = pe->data;
3155 fe621944 2020-11-10 stsp n = fprintf(outfile, "%c %s\n", cp->status, pe->path);
3156 fe621944 2020-11-10 stsp if (n < 0) {
3157 fe621944 2020-11-10 stsp err = got_error_from_errno("fprintf");
3158 fe621944 2020-11-10 stsp goto done;
3160 fe621944 2020-11-10 stsp outoff += n;
3161 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3163 fe621944 2020-11-10 stsp goto done;
3164 0208f208 2020-05-05 stsp free((char *)pe->path);
3165 0208f208 2020-05-05 stsp free(pe->data);
3168 0208f208 2020-05-05 stsp fputc('\n', outfile);
3170 fe621944 2020-11-10 stsp err = add_line_offset(line_offsets, nlines, outoff);
3172 0208f208 2020-05-05 stsp got_pathlist_free(&changed_paths);
3173 abd2672a 2018-12-23 stsp free(id_str);
3174 5943eee2 2019-08-13 stsp free(logmsg);
3175 8b473291 2019-02-21 stsp free(refs_str);
3176 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3177 7510f233 2020-08-09 stsp if (err) {
3178 ae6a6978 2020-08-09 stsp free(*line_offsets);
3179 ae6a6978 2020-08-09 stsp *line_offsets = NULL;
3180 ae6a6978 2020-08-09 stsp *nlines = 0;
3182 fe621944 2020-11-10 stsp return err;
3185 abd2672a 2018-12-23 stsp static const struct got_error *
3186 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
3188 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
3189 48ae06ee 2018-10-18 stsp FILE *f = NULL;
3190 15a94983 2018-12-23 stsp int obj_type;
3192 fe621944 2020-11-10 stsp free(s->line_offsets);
3193 fe621944 2020-11-10 stsp s->line_offsets = malloc(sizeof(off_t));
3194 fe621944 2020-11-10 stsp if (s->line_offsets == NULL)
3195 fe621944 2020-11-10 stsp return got_error_from_errno("malloc");
3196 fe621944 2020-11-10 stsp s->nlines = 0;
3198 511a516b 2018-05-19 stsp f = got_opentemp();
3199 48ae06ee 2018-10-18 stsp if (f == NULL) {
3200 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3201 48ae06ee 2018-10-18 stsp goto done;
3203 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
3204 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3205 fb43ecf1 2019-02-11 stsp goto done;
3209 15a94983 2018-12-23 stsp if (s->id1)
3210 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3212 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3214 15a94983 2018-12-23 stsp goto done;
3216 15a94983 2018-12-23 stsp switch (obj_type) {
3217 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3218 fe621944 2020-11-10 stsp err = got_diff_objects_as_blobs(&s->line_offsets, &s->nlines,
3219 fe621944 2020-11-10 stsp s->id1, s->id2, NULL, NULL, s->diff_context, 0,
3220 fe621944 2020-11-10 stsp s->repo, s->f);
3222 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3223 fe621944 2020-11-10 stsp err = got_diff_objects_as_trees(&s->line_offsets, &s->nlines,
3224 fe621944 2020-11-10 stsp s->id1, s->id2, "", "", s->diff_context, 0, s->repo, s->f);
3226 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3227 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3228 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3229 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3231 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3233 3ffacbe1 2020-02-02 tracey goto done;
3234 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3235 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3236 fe621944 2020-11-10 stsp err = write_commit_info(&s->line_offsets, &s->nlines,
3237 fe621944 2020-11-10 stsp s->id2, s->refs, s->repo, s->f);
3238 f44b1f58 2020-02-02 tracey if (err)
3239 f44b1f58 2020-02-02 tracey goto done;
3240 f44b1f58 2020-02-02 tracey } else {
3241 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3242 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3243 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
3244 fe621944 2020-11-10 stsp err = write_commit_info(
3245 fe621944 2020-11-10 stsp &s->line_offsets, &s->nlines,
3246 fe621944 2020-11-10 stsp s->id2, s->refs, s->repo, s->f);
3247 f44b1f58 2020-02-02 tracey if (err)
3248 f44b1f58 2020-02-02 tracey goto done;
3253 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3255 fe621944 2020-11-10 stsp err = got_diff_objects_as_commits(&s->line_offsets, &s->nlines,
3256 fe621944 2020-11-10 stsp s->id1, s->id2, s->diff_context, 0, s->repo, s->f);
3260 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3263 f44b1f58 2020-02-02 tracey if (err)
3264 f44b1f58 2020-02-02 tracey goto done;
3266 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3267 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3268 48ae06ee 2018-10-18 stsp return err;
3271 f5215bb9 2019-02-22 stsp static void
3272 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3274 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3275 f5215bb9 2019-02-22 stsp update_panels();
3276 f5215bb9 2019-02-22 stsp doupdate();
3279 f44b1f58 2020-02-02 tracey static const struct got_error *
3280 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3282 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3284 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3285 f44b1f58 2020-02-02 tracey return NULL;
3288 f44b1f58 2020-02-02 tracey static const struct got_error *
3289 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3291 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3292 f44b1f58 2020-02-02 tracey int lineno;
3294 f44b1f58 2020-02-02 tracey if (!view->searching) {
3295 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3296 f44b1f58 2020-02-02 tracey return NULL;
3299 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3300 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3301 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3303 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3304 f44b1f58 2020-02-02 tracey } else {
3305 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3306 f44b1f58 2020-02-02 tracey lineno = 1;
3308 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3311 f44b1f58 2020-02-02 tracey while (1) {
3312 f44b1f58 2020-02-02 tracey char *line = NULL;
3313 f44b1f58 2020-02-02 tracey off_t offset;
3314 f44b1f58 2020-02-02 tracey size_t len;
3316 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3317 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3318 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3319 f44b1f58 2020-02-02 tracey free(line);
3323 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3324 f44b1f58 2020-02-02 tracey lineno = 1;
3326 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3329 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3330 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3331 f44b1f58 2020-02-02 tracey free(line);
3332 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3334 f44b1f58 2020-02-02 tracey free(line);
3335 f44b1f58 2020-02-02 tracey line = parse_next_line(s->f, &len);
3336 41605754 2020-11-12 stsp if (line &&
3337 41605754 2020-11-12 stsp match_line(line, &view->regex, 1, &view->regmatch)) {
3338 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
3339 f44b1f58 2020-02-02 tracey s->matched_line = lineno;
3340 f44b1f58 2020-02-02 tracey free(line);
3343 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++;
3347 f44b1f58 2020-02-02 tracey lineno--;
3350 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3351 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3352 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3355 f44b1f58 2020-02-02 tracey return NULL;
3358 48ae06ee 2018-10-18 stsp static const struct got_error *
3359 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3360 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
3361 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
3363 48ae06ee 2018-10-18 stsp const struct got_error *err;
3364 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3366 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3367 15a94983 2018-12-23 stsp int type1, type2;
3368 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3370 15a94983 2018-12-23 stsp return err;
3371 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3373 15a94983 2018-12-23 stsp return err;
3375 15a94983 2018-12-23 stsp if (type1 != type2)
3376 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3378 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3379 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3380 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3381 f44b1f58 2020-02-02 tracey s->repo = repo;
3382 f44b1f58 2020-02-02 tracey s->refs = refs;
3383 f44b1f58 2020-02-02 tracey s->id1 = id1;
3384 f44b1f58 2020-02-02 tracey s->id2 = id2;
3386 15a94983 2018-12-23 stsp if (id1) {
3387 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3388 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3389 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3391 5465d566 2020-02-01 tracey s->id1 = NULL;
3393 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3394 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3395 5465d566 2020-02-01 tracey free(s->id1);
3396 5465d566 2020-02-01 tracey s->id1 = NULL;
3397 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3399 5465d566 2020-02-01 tracey s->f = NULL;
3400 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3401 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3402 5465d566 2020-02-01 tracey s->diff_context = 3;
3403 5465d566 2020-02-01 tracey s->log_view = log_view;
3404 5465d566 2020-02-01 tracey s->repo = repo;
3405 5465d566 2020-02-01 tracey s->refs = refs;
3407 f44b1f58 2020-02-02 tracey SIMPLEQ_INIT(&s->colors);
3408 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3409 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3410 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3411 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3413 6d17833f 2019-11-08 stsp return err;
3414 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
3415 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
3416 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
3417 6d17833f 2019-11-08 stsp if (err) {
3418 5465d566 2020-02-01 tracey free_colors(&s->colors);
3419 6d17833f 2019-11-08 stsp return err;
3421 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3422 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3423 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3424 6d17833f 2019-11-08 stsp if (err) {
3425 5465d566 2020-02-01 tracey free_colors(&s->colors);
3426 6d17833f 2019-11-08 stsp return err;
3429 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3430 528c17dd 2020-07-31 stsp "^(commit [0-9a-f]|(blob|file) [-+] |[MDmA] [^ ])",
3431 0208f208 2020-05-05 stsp TOG_COLOR_DIFF_META,
3432 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3433 6d17833f 2019-11-08 stsp if (err) {
3434 5465d566 2020-02-01 tracey free_colors(&s->colors);
3435 6d17833f 2019-11-08 stsp return err;
3438 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3439 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3440 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3441 11b20872 2019-11-08 stsp if (err) {
3442 5465d566 2020-02-01 tracey free_colors(&s->colors);
3443 11b20872 2019-11-08 stsp return err;
3446 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3447 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3448 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3449 11b20872 2019-11-08 stsp if (err) {
3450 5465d566 2020-02-01 tracey free_colors(&s->colors);
3451 11b20872 2019-11-08 stsp return err;
3455 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3456 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3457 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3459 fe621944 2020-11-10 stsp s->line_offsets = NULL;
3460 fe621944 2020-11-10 stsp s->nlines = 0;
3461 5465d566 2020-02-01 tracey err = create_diff(s);
3462 48ae06ee 2018-10-18 stsp if (err) {
3463 5465d566 2020-02-01 tracey free(s->id1);
3464 5465d566 2020-02-01 tracey s->id1 = NULL;
3465 5465d566 2020-02-01 tracey free(s->id2);
3466 5465d566 2020-02-01 tracey s->id2 = NULL;
3467 48ae06ee 2018-10-18 stsp return err;
3470 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3471 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3472 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3473 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3474 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3476 5dc9f4bc 2018-08-04 stsp return NULL;
3479 e5a0f69f 2018-08-18 stsp static const struct got_error *
3480 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
3482 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3483 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3485 5465d566 2020-02-01 tracey free(s->id1);
3486 5465d566 2020-02-01 tracey s->id1 = NULL;
3487 5465d566 2020-02-01 tracey free(s->id2);
3488 5465d566 2020-02-01 tracey s->id2 = NULL;
3489 5465d566 2020-02-01 tracey if (s->f && fclose(s->f) == EOF)
3490 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3491 5465d566 2020-02-01 tracey free_colors(&s->colors);
3492 f44b1f58 2020-02-02 tracey free(s->line_offsets);
3493 fe621944 2020-11-10 stsp s->line_offsets = NULL;
3494 fe621944 2020-11-10 stsp s->nlines = 0;
3495 e5a0f69f 2018-08-18 stsp return err;
3498 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3499 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3501 a3404814 2018-09-02 stsp const struct got_error *err;
3502 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3503 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3505 a3404814 2018-09-02 stsp if (s->id1) {
3506 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3508 a3404814 2018-09-02 stsp return err;
3510 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3512 a3404814 2018-09-02 stsp return err;
3514 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
3515 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3516 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3517 a3404814 2018-09-02 stsp free(id_str1);
3518 a3404814 2018-09-02 stsp free(id_str2);
3519 a3404814 2018-09-02 stsp return err;
3521 a3404814 2018-09-02 stsp free(id_str1);
3522 a3404814 2018-09-02 stsp free(id_str2);
3524 fe621944 2020-11-10 stsp return draw_file(view, s->f, s->first_displayed_line, s->nlines,
3525 fe621944 2020-11-10 stsp s->line_offsets, s->selected_line, view->nlines,
3526 41605754 2020-11-12 stsp &s->last_displayed_line, &s->eof, header, &s->colors,
3527 41605754 2020-11-12 stsp s->matched_line, &view->regmatch);
3530 15a087fe 2019-02-21 stsp static const struct got_error *
3531 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3532 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3534 d7a04538 2019-02-21 stsp const struct got_error *err;
3535 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3536 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3537 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3539 15a087fe 2019-02-21 stsp free(s->id2);
3540 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3541 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3542 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3544 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3546 d7a04538 2019-02-21 stsp return err;
3547 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3548 15a087fe 2019-02-21 stsp free(s->id1);
3549 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
3550 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3551 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3552 15a087fe 2019-02-21 stsp return NULL;
3555 0cf4efb1 2018-09-29 stsp static const struct got_error *
3556 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3557 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3559 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3560 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3561 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3562 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
3565 e5a0f69f 2018-08-18 stsp switch (ch) {
3567 1e37a5c2 2019-05-12 jcs case KEY_UP:
3568 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
3569 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3571 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3572 a60a9dc4 2019-05-13 jcs case CTRL('b'):
3573 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
3576 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
3577 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3578 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3581 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3582 1e37a5c2 2019-05-12 jcs if (!s->eof)
3583 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3585 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3586 a60a9dc4 2019-05-13 jcs case CTRL('f'):
3588 00ba99a7 2019-05-12 jcs if (s->eof)
3591 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
3592 1e37a5c2 2019-05-12 jcs char *line;
3593 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
3594 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3595 1e37a5c2 2019-05-12 jcs if (line == NULL)
3600 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
3601 1e37a5c2 2019-05-12 jcs s->diff_context--;
3602 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3603 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3607 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3608 1e37a5c2 2019-05-12 jcs s->diff_context++;
3609 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3610 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3615 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3617 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3618 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
3619 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
3620 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3623 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3628 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3632 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3633 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3635 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3636 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3640 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3642 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3644 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3645 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
3646 7c1452c1 2020-03-26 stsp err = trigger_log_thread(s->log_view, 1,
3647 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
3648 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
3649 7c1452c1 2020-03-26 stsp &ls->thread_args.need_commits,
3650 7c1452c1 2020-03-26 stsp &ls->thread_args.commit_loaded);
3654 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3659 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
3660 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3663 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3667 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3668 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3670 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3671 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3677 bcbd79e2 2018-08-19 stsp return err;
3680 4ed7e80c 2018-05-20 stsp static const struct got_error *
3681 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
3683 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
3684 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
3685 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
3686 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3687 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3688 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
3689 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
3691 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
3693 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3695 26ed57b2 2018-05-19 stsp #ifndef PROFILE
3696 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3697 eb6600df 2019-01-04 stsp NULL) == -1)
3698 26ed57b2 2018-05-19 stsp err(1, "pledge");
3701 09b5bff8 2020-02-23 naddy while ((ch = getopt(argc, argv, "r:")) != -1) {
3702 26ed57b2 2018-05-19 stsp switch (ch) {
3703 09b5bff8 2020-02-23 naddy case 'r':
3704 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
3705 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
3706 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
3710 17020d27 2019-03-07 stsp usage_diff();
3711 26ed57b2 2018-05-19 stsp /* NOTREACHED */
3715 26ed57b2 2018-05-19 stsp argc -= optind;
3716 26ed57b2 2018-05-19 stsp argv += optind;
3718 26ed57b2 2018-05-19 stsp if (argc == 0) {
3719 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
3720 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
3721 15a94983 2018-12-23 stsp id_str1 = argv[0];
3722 15a94983 2018-12-23 stsp id_str2 = argv[1];
3724 26ed57b2 2018-05-19 stsp usage_diff();
3726 a273ac94 2020-02-23 naddy cwd = getcwd(NULL, 0);
3727 a273ac94 2020-02-23 naddy if (cwd == NULL)
3728 a273ac94 2020-02-23 naddy return got_error_from_errno("getcwd");
3730 a273ac94 2020-02-23 naddy error = got_worktree_open(&worktree, cwd);
3731 a273ac94 2020-02-23 naddy if (error && error->code != GOT_ERR_NOT_WORKTREE)
3732 a273ac94 2020-02-23 naddy goto done;
3734 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3735 a273ac94 2020-02-23 naddy if (worktree)
3736 a273ac94 2020-02-23 naddy repo_path =
3737 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
3739 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
3741 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3742 a273ac94 2020-02-23 naddy error = got_error_from_errno("strdup");
3743 a273ac94 2020-02-23 naddy goto done;
3746 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3747 eb6600df 2019-01-04 stsp if (error)
3748 eb6600df 2019-01-04 stsp goto done;
3750 a273ac94 2020-02-23 naddy init_curses();
3752 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3753 26ed57b2 2018-05-19 stsp if (error)
3754 26ed57b2 2018-05-19 stsp goto done;
3756 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
3757 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3758 26ed57b2 2018-05-19 stsp if (error)
3759 26ed57b2 2018-05-19 stsp goto done;
3761 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
3762 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3763 26ed57b2 2018-05-19 stsp if (error)
3764 26ed57b2 2018-05-19 stsp goto done;
3766 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3767 8b473291 2019-02-21 stsp if (error)
3768 8b473291 2019-02-21 stsp goto done;
3770 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3771 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3772 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3773 ea5e7bb5 2018-08-01 stsp goto done;
3775 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3776 5dc9f4bc 2018-08-04 stsp if (error)
3777 5dc9f4bc 2018-08-04 stsp goto done;
3778 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3780 c02c541e 2019-03-29 stsp free(repo_path);
3781 a273ac94 2020-02-23 naddy free(cwd);
3783 921be706 2019-06-28 stsp got_repo_close(repo);
3784 a273ac94 2020-02-23 naddy if (worktree)
3785 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
3786 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3787 26ed57b2 2018-05-19 stsp return error;
3790 4ed7e80c 2018-05-20 stsp __dead static void
3791 9f7d7167 2018-04-29 stsp usage_blame(void)
3794 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3795 9f7d7167 2018-04-29 stsp getprogname());
3799 84451b3e 2018-07-10 stsp struct tog_blame_line {
3800 84451b3e 2018-07-10 stsp int annotated;
3801 84451b3e 2018-07-10 stsp struct got_object_id *id;
3804 4ed7e80c 2018-05-20 stsp static const struct got_error *
3805 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3806 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
3807 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
3808 11b20872 2019-11-08 stsp int *last_displayed_line, int *eof, int max_lines,
3809 41605754 2020-11-12 stsp struct tog_colors *colors, int matched_line, regmatch_t *regmatch)
3811 84451b3e 2018-07-10 stsp const struct got_error *err;
3812 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3813 84451b3e 2018-07-10 stsp char *line;
3814 84451b3e 2018-07-10 stsp size_t len;
3815 84451b3e 2018-07-10 stsp wchar_t *wline;
3816 27a741e5 2019-09-11 stsp int width;
3817 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3818 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3819 ab089a2a 2018-07-12 stsp char *id_str;
3820 11b20872 2019-11-08 stsp struct tog_color *tc;
3822 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
3824 ab089a2a 2018-07-12 stsp return err;
3826 84451b3e 2018-07-10 stsp rewind(f);
3827 f7d12f7e 2018-08-01 stsp werase(view->window);
3829 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3830 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3831 ab089a2a 2018-07-12 stsp free(id_str);
3832 ab089a2a 2018-07-12 stsp return err;
3835 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3836 ab089a2a 2018-07-12 stsp free(line);
3837 2550e4c3 2018-07-13 stsp line = NULL;
3839 1cae65b4 2019-09-22 stsp return err;
3840 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3841 a3404814 2018-09-02 stsp wstandout(view->window);
3842 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3844 11b20872 2019-11-08 stsp wattr_on(view->window,
3845 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3846 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3848 11b20872 2019-11-08 stsp wattr_off(view->window,
3849 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3850 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3851 a3404814 2018-09-02 stsp wstandend(view->window);
3852 2550e4c3 2018-07-13 stsp free(wline);
3853 2550e4c3 2018-07-13 stsp wline = NULL;
3854 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3855 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3857 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3858 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
3859 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
3860 ab089a2a 2018-07-12 stsp free(id_str);
3861 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3863 ab089a2a 2018-07-12 stsp free(id_str);
3864 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3865 3f60a8ef 2018-07-10 stsp free(line);
3866 2550e4c3 2018-07-13 stsp line = NULL;
3868 3f60a8ef 2018-07-10 stsp return err;
3869 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3870 2550e4c3 2018-07-13 stsp free(wline);
3871 2550e4c3 2018-07-13 stsp wline = NULL;
3872 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3873 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3876 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
3877 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
3878 84451b3e 2018-07-10 stsp if (line == NULL) {
3882 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
3883 84451b3e 2018-07-10 stsp free(line);
3887 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3888 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3890 8d0fe45a 2019-08-12 stsp if (nlines > 0) {
3891 8d0fe45a 2019-08-12 stsp blame_line = &lines[lineno - 1];
3892 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3893 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3894 27a741e5 2019-09-11 stsp !(view->focussed &&
3895 27a741e5 2019-09-11 stsp nprinted == selected_line - 1)) {
3896 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3897 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3898 8d0fe45a 2019-08-12 stsp char *id_str;
3899 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3900 8d0fe45a 2019-08-12 stsp if (err) {
3901 8d0fe45a 2019-08-12 stsp free(line);
3902 8d0fe45a 2019-08-12 stsp return err;
3904 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3906 11b20872 2019-11-08 stsp wattr_on(view->window,
3907 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3908 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3910 11b20872 2019-11-08 stsp wattr_off(view->window,
3911 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3912 8d0fe45a 2019-08-12 stsp free(id_str);
3913 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3915 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3916 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3919 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3920 ee41ec32 2018-07-10 stsp prev_id = NULL;
3923 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3924 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3925 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3927 41605754 2020-11-12 stsp if (view->ncols <= 9) {
3928 41605754 2020-11-12 stsp width = 9;
3929 41605754 2020-11-12 stsp wline = wcsdup(L"");
3930 41605754 2020-11-12 stsp if (wline == NULL) {
3931 41605754 2020-11-12 stsp err = got_error_from_errno("wcsdup");
3932 41605754 2020-11-12 stsp free(line);
3933 41605754 2020-11-12 stsp return err;
3935 41605754 2020-11-12 stsp } else if (*first_displayed_line + nprinted == matched_line &&
3936 41605754 2020-11-12 stsp regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
3937 41605754 2020-11-12 stsp err = add_matched_line(&width, line, view->ncols - 9, 9,
3938 41605754 2020-11-12 stsp view->window, regmatch);
3939 41605754 2020-11-12 stsp if (err) {
3940 41605754 2020-11-12 stsp free(line);
3941 41605754 2020-11-12 stsp return err;
3943 41605754 2020-11-12 stsp width += 9;
3945 41605754 2020-11-12 stsp err = format_line(&wline, &width, line,
3946 41605754 2020-11-12 stsp view->ncols - 9, 9);
3947 41605754 2020-11-12 stsp waddwstr(view->window, wline);
3948 41605754 2020-11-12 stsp free(wline);
3949 41605754 2020-11-12 stsp wline = NULL;
3950 41605754 2020-11-12 stsp width += 9;
3953 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
3954 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
3955 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3956 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3957 84451b3e 2018-07-10 stsp free(line);
3959 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3961 1a57306a 2018-09-02 stsp view_vborder(view);
3963 84451b3e 2018-07-10 stsp return NULL;
3966 84451b3e 2018-07-10 stsp static const struct got_error *
3967 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3969 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3970 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3971 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3972 1a76625f 2018-10-22 stsp int errcode;
3974 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3975 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3976 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3978 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3979 1a76625f 2018-10-22 stsp if (errcode)
3980 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3982 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3983 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3984 d68a0a7d 2018-07-10 stsp goto done;
3987 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3988 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3990 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3991 d68a0a7d 2018-07-10 stsp if (line->annotated)
3992 d68a0a7d 2018-07-10 stsp goto done;
3994 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3995 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3996 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3997 84451b3e 2018-07-10 stsp goto done;
3999 84451b3e 2018-07-10 stsp line->annotated = 1;
4001 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4002 1a76625f 2018-10-22 stsp if (errcode)
4003 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4004 84451b3e 2018-07-10 stsp return err;
4007 84451b3e 2018-07-10 stsp static void *
4008 84451b3e 2018-07-10 stsp blame_thread(void *arg)
4010 18430de3 2018-07-10 stsp const struct got_error *err;
4011 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
4012 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
4013 1a76625f 2018-10-22 stsp int errcode;
4015 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
4017 61266923 2020-01-14 stsp return (void *)err;
4019 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
4020 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
4021 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
4022 fc06ba56 2019-08-22 stsp err = NULL;
4024 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4025 1a76625f 2018-10-22 stsp if (errcode)
4026 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
4027 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4029 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
4030 c9beca56 2018-07-22 stsp ta->repo = NULL;
4031 c9beca56 2018-07-22 stsp *ta->complete = 1;
4033 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4034 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
4035 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4037 18430de3 2018-07-10 stsp return (void *)err;
4040 245d91c1 2018-07-12 stsp static struct got_object_id *
4041 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
4042 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
4044 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
4046 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
4047 8d0fe45a 2019-08-12 stsp return NULL;
4049 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
4050 245d91c1 2018-07-12 stsp if (!line->annotated)
4051 245d91c1 2018-07-12 stsp return NULL;
4053 245d91c1 2018-07-12 stsp return line->id;
4056 b880a918 2018-07-10 stsp static const struct got_error *
4057 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
4059 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
4062 245d91c1 2018-07-12 stsp if (blame->thread) {
4063 1a76625f 2018-10-22 stsp int errcode;
4064 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4065 1a76625f 2018-10-22 stsp if (errcode)
4066 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4067 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
4068 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
4069 1a76625f 2018-10-22 stsp if (errcode)
4070 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
4071 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4072 1a76625f 2018-10-22 stsp if (errcode)
4073 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
4074 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
4075 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
4076 245d91c1 2018-07-12 stsp err = NULL;
4077 245d91c1 2018-07-12 stsp blame->thread = NULL;
4079 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
4080 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
4081 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
4083 245d91c1 2018-07-12 stsp if (blame->f) {
4084 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
4085 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
4086 245d91c1 2018-07-12 stsp blame->f = NULL;
4088 57670559 2018-12-23 stsp if (blame->lines) {
4089 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
4090 57670559 2018-12-23 stsp free(blame->lines[i].id);
4091 57670559 2018-12-23 stsp free(blame->lines);
4092 57670559 2018-12-23 stsp blame->lines = NULL;
4094 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
4095 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
4097 245d91c1 2018-07-12 stsp return err;
4100 245d91c1 2018-07-12 stsp static const struct got_error *
4101 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
4103 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
4104 fc06ba56 2019-08-22 stsp int *done = arg;
4105 fc06ba56 2019-08-22 stsp int errcode;
4107 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
4108 fc06ba56 2019-08-22 stsp if (errcode)
4109 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4110 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
4112 fc06ba56 2019-08-22 stsp if (*done)
4113 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
4115 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
4116 fc06ba56 2019-08-22 stsp if (errcode)
4117 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
4118 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
4120 fc06ba56 2019-08-22 stsp return err;
4123 fc06ba56 2019-08-22 stsp static const struct got_error *
4124 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
4125 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
4126 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
4127 245d91c1 2018-07-12 stsp struct got_repository *repo)
4129 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
4130 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
4131 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
4132 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
4133 15a94983 2018-12-23 stsp int obj_type;
4135 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
4137 15a94983 2018-12-23 stsp return err;
4139 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
4141 84451b3e 2018-07-10 stsp goto done;
4143 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
4144 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
4145 84451b3e 2018-07-10 stsp goto done;
4148 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4150 a70480e0 2018-06-23 stsp goto done;
4151 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
4152 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
4153 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
4154 84451b3e 2018-07-10 stsp goto done;
4156 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4157 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
4158 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
4159 84451b3e 2018-07-10 stsp goto done;
4161 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
4162 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4163 b02560ec 2019-08-19 stsp blame->nlines--;
4165 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4166 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
4167 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
4168 84451b3e 2018-07-10 stsp goto done;
4171 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
4173 bd24772e 2018-07-11 stsp goto done;
4175 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
4176 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
4177 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
4178 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
4179 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
4180 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4181 245d91c1 2018-07-12 stsp goto done;
4183 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
4185 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
4186 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
4187 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
4188 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
4189 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
4190 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_arg = done;
4191 245d91c1 2018-07-12 stsp *blame_complete = 0;
4195 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
4196 27d434c2 2018-09-15 stsp free(obj_id);
4198 245d91c1 2018-07-12 stsp stop_blame(blame);
4199 245d91c1 2018-07-12 stsp return err;
4202 245d91c1 2018-07-12 stsp static const struct got_error *
4203 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
4204 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4205 8b473291 2019-02-21 stsp struct got_repository *repo)
4207 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
4208 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4210 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
4212 c4843652 2019-08-12 stsp s->path = strdup(path);
4213 c4843652 2019-08-12 stsp if (s->path == NULL)
4214 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4216 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4217 c4843652 2019-08-12 stsp if (err) {
4218 c4843652 2019-08-12 stsp free(s->path);
4219 7cbe629d 2018-08-04 stsp return err;
4222 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4223 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4224 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4225 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4226 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4227 fb2756b9 2018-08-04 stsp s->repo = repo;
4228 8b473291 2019-02-21 stsp s->refs = refs;
4229 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4230 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4232 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4233 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4234 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4235 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4237 11b20872 2019-11-08 stsp return err;
4240 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4241 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4242 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4243 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4244 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4246 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
4247 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
4248 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
4249 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
4252 e5a0f69f 2018-08-18 stsp static const struct got_error *
4253 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4255 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4256 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4258 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4259 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4261 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4262 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4263 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4264 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4265 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4268 e5a0f69f 2018-08-18 stsp free(s->path);
4269 11b20872 2019-11-08 stsp free_colors(&s->colors);
4271 e5a0f69f 2018-08-18 stsp return err;
4274 7cbe629d 2018-08-04 stsp static const struct got_error *
4275 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4277 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4279 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4280 6c4c42e0 2019-06-24 stsp return NULL;
4283 6c4c42e0 2019-06-24 stsp static const struct got_error *
4284 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4286 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4287 6c4c42e0 2019-06-24 stsp int lineno;
4289 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4290 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4291 6c4c42e0 2019-06-24 stsp return NULL;
4294 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4295 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4296 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4298 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4300 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4301 6c4c42e0 2019-06-24 stsp lineno = 1;
4303 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4306 6c4c42e0 2019-06-24 stsp while (1) {
4307 6c4c42e0 2019-06-24 stsp char *line = NULL;
4308 6c4c42e0 2019-06-24 stsp off_t offset;
4309 6c4c42e0 2019-06-24 stsp size_t len;
4311 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4312 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4313 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4314 6c4c42e0 2019-06-24 stsp free(line);
4318 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4319 6c4c42e0 2019-06-24 stsp lineno = 1;
4321 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4324 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4325 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4326 6c4c42e0 2019-06-24 stsp free(line);
4327 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4329 6c4c42e0 2019-06-24 stsp free(line);
4330 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
4331 41605754 2020-11-12 stsp if (line &&
4332 41605754 2020-11-12 stsp match_line(line, &view->regex, 1, &view->regmatch)) {
4333 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
4334 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
4335 6c4c42e0 2019-06-24 stsp free(line);
4338 6c4c42e0 2019-06-24 stsp free(line);
4339 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4345 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4346 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4347 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4350 6c4c42e0 2019-06-24 stsp return NULL;
4353 6c4c42e0 2019-06-24 stsp static const struct got_error *
4354 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4356 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4357 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4358 2b380cc8 2018-10-24 stsp int errcode;
4360 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
4361 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4362 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4363 2b380cc8 2018-10-24 stsp if (errcode)
4364 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4366 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4369 51fe7530 2019-08-19 stsp if (s->blame_complete)
4370 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4372 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
4373 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
4374 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
4375 41605754 2020-11-12 stsp &s->last_displayed_line, &s->eof, view->nlines, &s->colors,
4376 41605754 2020-11-12 stsp s->matched_line, &view->regmatch);
4378 669b5ffa 2018-10-07 stsp view_vborder(view);
4379 e5a0f69f 2018-08-18 stsp return err;
4382 e5a0f69f 2018-08-18 stsp static const struct got_error *
4383 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
4384 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4386 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4387 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4388 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4389 669b5ffa 2018-10-07 stsp int begin_x = 0;
4391 e5a0f69f 2018-08-18 stsp switch (ch) {
4393 1e37a5c2 2019-05-12 jcs s->done = 1;
4396 1e37a5c2 2019-05-12 jcs case KEY_UP:
4397 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4398 1e37a5c2 2019-05-12 jcs s->selected_line--;
4399 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4400 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4401 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4403 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4404 ea025d1d 2020-02-22 naddy case CTRL('b'):
4405 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4406 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
4409 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
4410 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
4411 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
4413 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4416 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4417 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4418 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4419 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4420 1e37a5c2 2019-05-12 jcs s->selected_line++;
4421 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
4422 1e37a5c2 2019-05-12 jcs s->blame.nlines)
4423 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4426 1e37a5c2 2019-05-12 jcs case 'p': {
4427 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4428 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4429 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4430 1e37a5c2 2019-05-12 jcs if (id == NULL)
4432 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
4433 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
4434 15a94983 2018-12-23 stsp struct got_object_qid *pid;
4435 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
4436 1e37a5c2 2019-05-12 jcs int obj_type;
4437 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
4438 1e37a5c2 2019-05-12 jcs s->repo, id);
4441 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
4442 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
4443 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
4444 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4447 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
4448 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
4449 1e37a5c2 2019-05-12 jcs pid->id, s->path);
4450 e5a0f69f 2018-08-18 stsp if (err) {
4451 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
4452 1e37a5c2 2019-05-12 jcs err = NULL;
4453 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4456 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
4458 1e37a5c2 2019-05-12 jcs free(blob_id);
4459 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
4460 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
4461 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4464 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4466 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4468 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
4469 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
4471 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4476 1e37a5c2 2019-05-12 jcs s->done = 1;
4477 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4478 1e37a5c2 2019-05-12 jcs s->done = 0;
4479 1e37a5c2 2019-05-12 jcs if (thread_err)
4481 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4482 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
4483 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4484 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4485 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
4486 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
4491 1e37a5c2 2019-05-12 jcs case 'B': {
4492 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
4493 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
4494 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
4496 1e37a5c2 2019-05-12 jcs s->done = 1;
4497 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4498 1e37a5c2 2019-05-12 jcs s->done = 0;
4499 1e37a5c2 2019-05-12 jcs if (thread_err)
4501 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4502 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
4503 1e37a5c2 2019-05-12 jcs s->blamed_commit =
4504 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
4505 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4506 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4507 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
4508 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
4513 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4514 1e37a5c2 2019-05-12 jcs case '\r': {
4515 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4516 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
4517 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
4518 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4519 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4520 1e37a5c2 2019-05-12 jcs if (id == NULL)
4522 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
4525 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
4526 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
4527 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4528 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4529 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4530 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
4531 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4532 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
4535 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
4536 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
4537 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4539 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4542 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4543 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4546 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
4548 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4551 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
4552 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4554 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
4559 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4560 ea025d1d 2020-02-22 naddy case CTRL('f'):
4562 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4563 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
4564 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
4567 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4568 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
4569 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4570 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4573 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
4574 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
4575 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
4576 1e37a5c2 2019-05-12 jcs view->nlines - 2;
4578 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
4579 1e37a5c2 2019-05-12 jcs s->blame.nlines -
4580 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
4582 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4583 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
4584 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4585 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4591 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
4594 a70480e0 2018-06-23 stsp static const struct got_error *
4595 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
4597 a70480e0 2018-06-23 stsp const struct got_error *error;
4598 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
4599 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4600 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
4601 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4602 0587e10c 2020-07-23 stsp char *link_target = NULL;
4603 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4604 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
4606 e1cd8fed 2018-08-01 stsp struct tog_view *view;
4608 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4610 a70480e0 2018-06-23 stsp #ifndef PROFILE
4611 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4612 8e94dd5b 2019-01-04 stsp NULL) == -1)
4613 a70480e0 2018-06-23 stsp err(1, "pledge");
4616 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4617 a70480e0 2018-06-23 stsp switch (ch) {
4619 a70480e0 2018-06-23 stsp commit_id_str = optarg;
4622 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4623 69069811 2018-08-02 stsp if (repo_path == NULL)
4624 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4628 17020d27 2019-03-07 stsp usage_blame();
4629 a70480e0 2018-06-23 stsp /* NOTREACHED */
4633 a70480e0 2018-06-23 stsp argc -= optind;
4634 a70480e0 2018-06-23 stsp argv += optind;
4636 f135c941 2020-02-20 stsp if (argc != 1)
4637 a70480e0 2018-06-23 stsp usage_blame();
4639 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
4640 6962eb72 2020-02-20 stsp if (cwd == NULL)
4641 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
4643 f135c941 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
4644 f135c941 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4645 f135c941 2020-02-20 stsp goto done;
4647 69069811 2018-08-02 stsp if (repo_path == NULL) {
4648 f135c941 2020-02-20 stsp if (worktree)
4649 eb41ed75 2019-02-05 stsp repo_path =
4650 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4652 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
4654 f135c941 2020-02-20 stsp if (repo_path == NULL) {
4655 f135c941 2020-02-20 stsp error = got_error_from_errno("strdup");
4656 f135c941 2020-02-20 stsp goto done;
4659 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4660 c02c541e 2019-03-29 stsp if (error != NULL)
4661 8e94dd5b 2019-01-04 stsp goto done;
4663 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4664 f135c941 2020-02-20 stsp worktree);
4665 c02c541e 2019-03-29 stsp if (error)
4666 92205607 2019-01-04 stsp goto done;
4668 f135c941 2020-02-20 stsp init_curses();
4670 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4671 eb41ed75 2019-02-05 stsp if (error)
4672 69069811 2018-08-02 stsp goto done;
4674 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
4675 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
4676 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4677 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4678 a70480e0 2018-06-23 stsp if (error != NULL)
4679 66b4983c 2018-06-23 stsp goto done;
4680 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4681 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
4683 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4684 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4686 a19e88aa 2018-06-23 stsp if (error != NULL)
4687 8b473291 2019-02-21 stsp goto done;
4689 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4690 8b473291 2019-02-21 stsp if (error)
4691 a19e88aa 2018-06-23 stsp goto done;
4693 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4694 e1cd8fed 2018-08-01 stsp if (view == NULL) {
4695 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4696 e1cd8fed 2018-08-01 stsp goto done;
4699 0587e10c 2020-07-23 stsp error = got_object_resolve_symlinks(&link_target, in_repo_path,
4700 0587e10c 2020-07-23 stsp commit_id, repo);
4701 7cbe629d 2018-08-04 stsp if (error)
4702 7cbe629d 2018-08-04 stsp goto done;
4704 0587e10c 2020-07-23 stsp error = open_blame_view(view, link_target ? link_target : in_repo_path,
4705 0587e10c 2020-07-23 stsp commit_id, &refs, repo);
4706 0587e10c 2020-07-23 stsp if (error)
4707 0587e10c 2020-07-23 stsp goto done;
4708 12314ad4 2019-08-31 stsp if (worktree) {
4709 12314ad4 2019-08-31 stsp /* Release work tree lock. */
4710 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
4711 12314ad4 2019-08-31 stsp worktree = NULL;
4713 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4715 69069811 2018-08-02 stsp free(repo_path);
4716 f135c941 2020-02-20 stsp free(in_repo_path);
4717 0587e10c 2020-07-23 stsp free(link_target);
4718 69069811 2018-08-02 stsp free(cwd);
4719 a70480e0 2018-06-23 stsp free(commit_id);
4720 eb41ed75 2019-02-05 stsp if (worktree)
4721 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
4723 a70480e0 2018-06-23 stsp got_repo_close(repo);
4724 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4725 a70480e0 2018-06-23 stsp return error;
4728 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4729 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
4730 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
4731 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
4732 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
4733 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
4734 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int selected, int limit,
4735 0d6c6ee3 2020-05-20 stsp int isroot, struct tog_colors *colors, struct got_repository *repo)
4737 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4738 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
4739 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
4740 f26dddb7 2019-11-08 stsp struct tog_color *tc;
4741 56e0773d 2019-11-28 stsp int width, n, i, nentries;
4743 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
4745 f7d12f7e 2018-08-01 stsp werase(view->window);
4747 ffd1d5e5 2018-06-23 stsp if (limit == 0)
4748 ffd1d5e5 2018-06-23 stsp return NULL;
4750 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, label, view->ncols, 0);
4752 ffd1d5e5 2018-06-23 stsp return err;
4753 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4754 a3404814 2018-09-02 stsp wstandout(view->window);
4755 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
4757 11b20872 2019-11-08 stsp wattr_on(view->window,
4758 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4759 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4761 11b20872 2019-11-08 stsp wattr_off(view->window,
4762 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4763 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4764 a3404814 2018-09-02 stsp wstandend(view->window);
4765 2550e4c3 2018-07-13 stsp free(wline);
4766 2550e4c3 2018-07-13 stsp wline = NULL;
4767 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4768 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4769 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4770 ffd1d5e5 2018-06-23 stsp return NULL;
4771 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
4773 ce52c690 2018-06-23 stsp return err;
4774 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4775 2550e4c3 2018-07-13 stsp free(wline);
4776 2550e4c3 2018-07-13 stsp wline = NULL;
4777 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4778 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4779 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4780 ffd1d5e5 2018-06-23 stsp return NULL;
4781 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4782 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
4783 a1eca9bb 2018-06-23 stsp return NULL;
4785 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
4786 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(tree);
4787 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
4788 0cf4efb1 2018-09-29 stsp if (view->focussed)
4789 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4790 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
4792 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4793 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
4794 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4795 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4796 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4797 ffd1d5e5 2018-06-23 stsp return NULL;
4801 56e0773d 2019-11-28 stsp te = *first_displayed_entry;
4804 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4805 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4806 0d6c6ee3 2020-05-20 stsp char *line = NULL, *id_str = NULL, *link_target = NULL;
4807 848d6979 2019-08-12 stsp const char *modestr = "";
4808 56e0773d 2019-11-28 stsp mode_t mode;
4810 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4811 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
4813 1d13200f 2018-07-12 stsp if (show_ids) {
4814 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4815 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4817 638f9024 2019-05-13 stsp return got_error_from_errno(
4818 230a42bd 2019-05-11 jcs "got_object_id_str");
4820 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4821 63c5ca5d 2019-08-24 stsp modestr = "$";
4822 0d6c6ee3 2020-05-20 stsp else if (S_ISLNK(mode)) {
4825 0d6c6ee3 2020-05-20 stsp err = got_tree_entry_get_symlink_target(&link_target,
4826 0d6c6ee3 2020-05-20 stsp te, repo);
4827 0d6c6ee3 2020-05-20 stsp if (err) {
4828 0d6c6ee3 2020-05-20 stsp free(id_str);
4829 0d6c6ee3 2020-05-20 stsp return err;
4831 0d6c6ee3 2020-05-20 stsp for (i = 0; i < strlen(link_target); i++) {
4832 0d6c6ee3 2020-05-20 stsp if (!isprint((unsigned char)link_target[i]))
4833 0d6c6ee3 2020-05-20 stsp link_target[i] = '?';
4835 848d6979 2019-08-12 stsp modestr = "@";
4837 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4838 848d6979 2019-08-12 stsp modestr = "/";
4839 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4840 848d6979 2019-08-12 stsp modestr = "*";
4841 0d6c6ee3 2020-05-20 stsp if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
4842 0d6c6ee3 2020-05-20 stsp got_tree_entry_get_name(te), modestr,
4843 0d6c6ee3 2020-05-20 stsp link_target ? " -> ": "",
4844 0d6c6ee3 2020-05-20 stsp link_target ? link_target : "") == -1) {
4845 1d13200f 2018-07-12 stsp free(id_str);
4846 0d6c6ee3 2020-05-20 stsp free(link_target);
4847 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4849 1d13200f 2018-07-12 stsp free(id_str);
4850 0d6c6ee3 2020-05-20 stsp free(link_target);
4851 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4852 ffd1d5e5 2018-06-23 stsp if (err) {
4853 ffd1d5e5 2018-06-23 stsp free(line);
4856 ffd1d5e5 2018-06-23 stsp if (n == selected) {
4857 0cf4efb1 2018-09-29 stsp if (view->focussed)
4858 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4859 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
4861 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
4863 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
4864 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4865 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4867 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
4868 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4869 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4870 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4871 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
4872 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4873 ffd1d5e5 2018-06-23 stsp free(line);
4874 2550e4c3 2018-07-13 stsp free(wline);
4875 2550e4c3 2018-07-13 stsp wline = NULL;
4877 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4878 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
4879 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4883 ffd1d5e5 2018-06-23 stsp return err;
4886 ffd1d5e5 2018-06-23 stsp static void
4887 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
4888 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
4889 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int isroot)
4891 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4894 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
4897 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, 0);
4898 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
4899 ffd1d5e5 2018-06-23 stsp if (!isroot)
4900 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4905 56e0773d 2019-11-28 stsp while (*first_displayed_entry && i < maxscroll) {
4906 56e0773d 2019-11-28 stsp *first_displayed_entry = got_tree_entry_get_prev(tree,
4907 56e0773d 2019-11-28 stsp *first_displayed_entry);
4910 56e0773d 2019-11-28 stsp if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4911 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4914 768394f3 2019-01-24 stsp static int
4915 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4916 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
4917 56e0773d 2019-11-28 stsp struct got_tree_object *tree)
4919 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4920 ffd1d5e5 2018-06-23 stsp int n = 0;
4922 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
4923 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, *first_displayed_entry);
4925 56e0773d 2019-11-28 stsp next = got_object_tree_get_first_entry(tree);
4927 768394f3 2019-01-24 stsp last = last_displayed_entry;
4928 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4929 56e0773d 2019-11-28 stsp last = got_tree_entry_get_next(tree, last);
4930 768394f3 2019-01-24 stsp if (last) {
4931 768394f3 2019-01-24 stsp *first_displayed_entry = next;
4932 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, next);
4938 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4939 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4940 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4942 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4943 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4944 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4946 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4947 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
4948 56e0773d 2019-11-28 stsp + 1 /* slash */;
4950 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
4952 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4953 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4954 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4956 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4957 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4958 d9765a41 2018-06-23 stsp while (pt) {
4959 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
4960 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
4961 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4962 cb2ebc8a 2018-06-23 stsp goto done;
4964 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4965 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4966 cb2ebc8a 2018-06-23 stsp goto done;
4968 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4971 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4972 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4973 ce52c690 2018-06-23 stsp goto done;
4977 ce52c690 2018-06-23 stsp if (err) {
4978 ce52c690 2018-06-23 stsp free(*path);
4979 ce52c690 2018-06-23 stsp *path = NULL;
4981 ce52c690 2018-06-23 stsp return err;
4984 ce52c690 2018-06-23 stsp static const struct got_error *
4985 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4986 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4987 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4988 8b473291 2019-02-21 stsp struct got_repository *repo)
4990 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
4991 ce52c690 2018-06-23 stsp char *path;
4992 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
4994 a0de39f3 2019-08-09 stsp *new_view = NULL;
4996 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
4998 ce52c690 2018-06-23 stsp return err;
5000 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
5001 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
5002 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
5003 83ce39e3 2019-08-12 stsp goto done;
5006 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
5007 e5a0f69f 2018-08-18 stsp if (err) {
5008 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
5009 fc06ba56 2019-08-22 stsp err = NULL;
5010 e5a0f69f 2018-08-18 stsp view_close(blame_view);
5012 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
5014 83ce39e3 2019-08-12 stsp free(path);
5015 69efd4c4 2018-07-18 stsp return err;
5018 69efd4c4 2018-07-18 stsp static const struct got_error *
5019 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
5020 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
5021 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
5022 8b473291 2019-02-21 stsp struct got_repository *repo)
5024 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
5025 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
5026 69efd4c4 2018-07-18 stsp char *path;
5028 a0de39f3 2019-08-09 stsp *new_view = NULL;
5030 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
5031 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
5032 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
5034 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
5036 69efd4c4 2018-07-18 stsp return err;
5038 f135c941 2020-02-20 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
5040 e5a0f69f 2018-08-18 stsp view_close(log_view);
5042 e5a0f69f 2018-08-18 stsp *new_view = log_view;
5043 cb2ebc8a 2018-06-23 stsp free(path);
5044 cb2ebc8a 2018-06-23 stsp return err;
5047 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5048 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
5049 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
5050 8b473291 2019-02-21 stsp struct got_repository *repo)
5052 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
5053 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
5054 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5056 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
5058 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
5059 ffd1d5e5 2018-06-23 stsp if (err != NULL)
5060 ffd1d5e5 2018-06-23 stsp goto done;
5062 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
5063 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
5064 ffd1d5e5 2018-06-23 stsp goto done;
5067 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
5068 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
5069 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
5070 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
5071 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
5072 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
5073 6484ec90 2018-09-29 stsp goto done;
5075 8b473291 2019-02-21 stsp s->refs = refs;
5076 fb2756b9 2018-08-04 stsp s->repo = repo;
5078 bddb1296 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
5080 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
5081 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
5082 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
5083 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
5085 c0b01bdb 2019-11-08 stsp goto done;
5086 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5087 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
5088 c0b01bdb 2019-11-08 stsp if (err) {
5089 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5090 c0b01bdb 2019-11-08 stsp goto done;
5092 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
5093 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
5094 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5095 c0b01bdb 2019-11-08 stsp if (err) {
5096 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5097 c0b01bdb 2019-11-08 stsp goto done;
5100 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
5101 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
5102 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5103 11b20872 2019-11-08 stsp if (err) {
5104 11b20872 2019-11-08 stsp free_colors(&s->colors);
5105 11b20872 2019-11-08 stsp goto done;
5108 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5109 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
5110 c0b01bdb 2019-11-08 stsp if (err) {
5111 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5112 c0b01bdb 2019-11-08 stsp goto done;
5116 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
5117 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
5118 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
5119 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
5120 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
5122 ad80ab7b 2018-08-04 stsp free(commit_id_str);
5123 6484ec90 2018-09-29 stsp if (err) {
5124 fb2756b9 2018-08-04 stsp free(s->tree_label);
5125 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5127 ad80ab7b 2018-08-04 stsp return err;
5130 e5a0f69f 2018-08-18 stsp static const struct got_error *
5131 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
5133 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5135 bddb1296 2019-11-08 stsp free_colors(&s->colors);
5136 fb2756b9 2018-08-04 stsp free(s->tree_label);
5137 6484ec90 2018-09-29 stsp s->tree_label = NULL;
5138 6484ec90 2018-09-29 stsp free(s->commit_id);
5139 6484ec90 2018-09-29 stsp s->commit_id = NULL;
5140 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
5141 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
5142 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
5143 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
5144 ad80ab7b 2018-08-04 stsp free(parent);
5147 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
5148 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
5149 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
5151 7c32bd05 2019-06-22 stsp return NULL;
5154 7c32bd05 2019-06-22 stsp static const struct got_error *
5155 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
5157 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5159 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
5160 7c32bd05 2019-06-22 stsp return NULL;
5163 7c32bd05 2019-06-22 stsp static int
5164 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5166 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
5168 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5172 7c32bd05 2019-06-22 stsp static const struct got_error *
5173 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
5175 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
5176 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
5178 7c32bd05 2019-06-22 stsp if (!view->searching) {
5179 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5180 7c32bd05 2019-06-22 stsp return NULL;
5183 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5184 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
5185 7c32bd05 2019-06-22 stsp if (s->selected_entry)
5186 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
5187 56e0773d 2019-11-28 stsp s->selected_entry);
5189 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5191 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
5192 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5194 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
5195 56e0773d 2019-11-28 stsp s->selected_entry);
5198 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5199 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5201 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5204 7c32bd05 2019-06-22 stsp while (1) {
5205 56e0773d 2019-11-28 stsp if (te == NULL) {
5206 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
5207 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5208 ac66afb8 2019-06-24 stsp return NULL;
5210 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5211 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
5213 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
5216 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
5217 8f4ed634 2020-03-26 stsp view->search_next_done = TOG_SEARCH_HAVE_MORE;
5218 56e0773d 2019-11-28 stsp s->matched_entry = te;
5222 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
5223 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5225 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
5228 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
5229 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
5230 7c32bd05 2019-06-22 stsp s->selected = 0;
5233 e5a0f69f 2018-08-18 stsp return NULL;
5236 ad80ab7b 2018-08-04 stsp static const struct got_error *
5237 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
5239 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
5240 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5241 e5a0f69f 2018-08-18 stsp char *parent_path;
5243 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5245 e5a0f69f 2018-08-18 stsp return err;
5247 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
5248 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
5249 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
5250 56e0773d 2019-11-28 stsp s->tree, s->selected, view->nlines, s->tree == s->root,
5251 0d6c6ee3 2020-05-20 stsp &s->colors, s->repo);
5252 e5a0f69f 2018-08-18 stsp free(parent_path);
5254 669b5ffa 2018-10-07 stsp view_vborder(view);
5255 e5a0f69f 2018-08-18 stsp return err;
5258 e5a0f69f 2018-08-18 stsp static const struct got_error *
5259 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
5260 878940b7 2018-09-29 stsp struct tog_view **focus_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 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
5265 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
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 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
5277 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
5278 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
5279 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5280 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5282 1e37a5c2 2019-05-12 jcs return err;
5283 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
5285 1e37a5c2 2019-05-12 jcs view_close(log_view);
5288 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
5289 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
5291 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5294 1e37a5c2 2019-05-12 jcs case KEY_UP:
5295 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5296 1e37a5c2 2019-05-12 jcs s->selected--;
5297 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
5300 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
5302 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
5303 56e0773d 2019-11-28 stsp s->tree, s->tree == s->root);
5305 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5306 ea025d1d 2020-02-22 naddy case CTRL('b'):
5307 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
5308 56e0773d 2019-11-28 stsp MAX(0, view->nlines - 4 - s->selected), s->tree,
5309 1e37a5c2 2019-05-12 jcs s->tree == s->root);
5310 1e37a5c2 2019-05-12 jcs s->selected = 0;
5311 56e0773d 2019-11-28 stsp if (got_object_tree_get_first_entry(s->tree) ==
5312 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
5313 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
5316 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5317 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5318 1e37a5c2 2019-05-12 jcs s->selected++;
5321 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5323 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5325 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
5326 56e0773d 2019-11-28 stsp s->last_displayed_entry, s->tree);
5328 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5329 ea025d1d 2020-02-22 naddy case CTRL('f'):
5330 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5332 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5333 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5334 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5337 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
5338 56e0773d 2019-11-28 stsp view->nlines, s->last_displayed_entry, s->tree);
5339 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
5340 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
5341 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
5342 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
5344 1e37a5c2 2019-05-12 jcs ndisplayed++;
5345 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5346 1e37a5c2 2019-05-12 jcs } while (te);
5347 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
5350 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5352 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5353 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5354 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5355 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5356 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5358 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5359 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5361 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5362 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5363 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5364 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
5365 1e37a5c2 2019-05-12 jcs s->selected_entry =
5366 1e37a5c2 2019-05-12 jcs parent->selected_entry;
5367 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
5368 1e37a5c2 2019-05-12 jcs free(parent);
5369 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
5370 56e0773d 2019-11-28 stsp s->selected_entry))) {
5371 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
5372 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
5373 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
5376 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
5377 941e9f74 2019-05-21 stsp if (err) {
5378 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
5381 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
5382 56e0773d 2019-11-28 stsp s->selected_entry))) {
5383 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
5384 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
5385 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
5387 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
5388 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
5389 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
5392 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
5393 669b5ffa 2018-10-07 stsp err = view_close_child(view);
5395 669b5ffa 2018-10-07 stsp return err;
5396 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
5397 669b5ffa 2018-10-07 stsp if (err) {
5398 1e37a5c2 2019-05-12 jcs view_close(blame_view);
5401 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
5402 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
5404 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
5407 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5408 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
5409 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5415 ffd1d5e5 2018-06-23 stsp return err;
5418 ffd1d5e5 2018-06-23 stsp __dead static void
5419 ffd1d5e5 2018-06-23 stsp usage_tree(void)
5422 55cccc34 2020-02-20 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5423 ffd1d5e5 2018-06-23 stsp getprogname());
5427 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5428 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
5430 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
5431 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
5432 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
5433 8b473291 2019-02-21 stsp struct got_reflist_head refs;
5434 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5435 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5436 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
5437 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
5438 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
5440 5221c383 2018-08-01 stsp struct tog_view *view;
5442 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
5444 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
5445 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
5446 d188b9a6 2019-01-04 stsp NULL) == -1)
5447 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
5450 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5451 ffd1d5e5 2018-06-23 stsp switch (ch) {
5453 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
5456 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
5457 74283ab8 2020-02-07 stsp if (repo_path == NULL)
5458 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
5462 17020d27 2019-03-07 stsp usage_tree();
5463 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
5467 ffd1d5e5 2018-06-23 stsp argc -= optind;
5468 ffd1d5e5 2018-06-23 stsp argv += optind;
5470 55cccc34 2020-02-20 stsp if (argc > 1)
5471 74283ab8 2020-02-07 stsp usage_tree();
5473 55cccc34 2020-02-20 stsp cwd = getcwd(NULL, 0);
5474 55cccc34 2020-02-20 stsp if (cwd == NULL)
5475 55cccc34 2020-02-20 stsp return got_error_from_errno("getcwd");
5477 55cccc34 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
5478 55cccc34 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5479 55cccc34 2020-02-20 stsp goto done;
5481 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
5482 55cccc34 2020-02-20 stsp if (worktree)
5483 52185f70 2019-02-05 stsp repo_path =
5484 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5486 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
5488 55cccc34 2020-02-20 stsp if (repo_path == NULL) {
5489 55cccc34 2020-02-20 stsp error = got_error_from_errno("strdup");
5490 55cccc34 2020-02-20 stsp goto done;
5493 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5494 c02c541e 2019-03-29 stsp if (error != NULL)
5495 52185f70 2019-02-05 stsp goto done;
5497 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5498 55cccc34 2020-02-20 stsp repo, worktree);
5499 55cccc34 2020-02-20 stsp if (error)
5500 55cccc34 2020-02-20 stsp goto done;
5502 55cccc34 2020-02-20 stsp init_curses();
5504 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5505 c02c541e 2019-03-29 stsp if (error)
5506 52185f70 2019-02-05 stsp goto done;
5508 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5509 71a27632 2020-01-15 stsp commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5510 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5511 55cccc34 2020-02-20 stsp if (error)
5512 ffd1d5e5 2018-06-23 stsp goto done;
5514 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5515 55cccc34 2020-02-20 stsp if (error)
5516 ffd1d5e5 2018-06-23 stsp goto done;
5518 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
5519 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
5520 55cccc34 2020-02-20 stsp if (error)
5521 8b473291 2019-02-21 stsp goto done;
5523 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5524 8b473291 2019-02-21 stsp if (error)
5525 ffd1d5e5 2018-06-23 stsp goto done;
5527 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5528 5221c383 2018-08-01 stsp if (view == NULL) {
5529 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5530 5221c383 2018-08-01 stsp goto done;
5532 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
5533 ad80ab7b 2018-08-04 stsp if (error)
5534 ad80ab7b 2018-08-04 stsp goto done;
5535 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
5536 55cccc34 2020-02-20 stsp error = tree_view_walk_path(&view->state.tree, commit_id,
5537 55cccc34 2020-02-20 stsp in_repo_path, repo);
5538 55cccc34 2020-02-20 stsp if (error)
5539 55cccc34 2020-02-20 stsp goto done;
5542 55cccc34 2020-02-20 stsp if (worktree) {
5543 55cccc34 2020-02-20 stsp /* Release work tree lock. */
5544 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
5545 55cccc34 2020-02-20 stsp worktree = NULL;
5547 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5549 52185f70 2019-02-05 stsp free(repo_path);
5550 e4a0e26d 2020-02-20 stsp free(cwd);
5551 ffd1d5e5 2018-06-23 stsp free(commit_id);
5552 ffd1d5e5 2018-06-23 stsp if (commit)
5553 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
5555 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
5557 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
5558 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5559 ffd1d5e5 2018-06-23 stsp return error;
5562 ce5b7c56 2019-07-09 stsp static void
5563 6879ba42 2020-10-01 naddy list_commands(FILE *fp)
5567 6879ba42 2020-10-01 naddy fprintf(fp, "commands:");
5568 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
5569 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
5570 6879ba42 2020-10-01 naddy fprintf(fp, " %s", cmd->name);
5572 6879ba42 2020-10-01 naddy fputc('\n', fp);
5575 4ed7e80c 2018-05-20 stsp __dead static void
5576 6879ba42 2020-10-01 naddy usage(int hflag, int status)
5578 6879ba42 2020-10-01 naddy FILE *fp = (status == 0) ? stdout : stderr;
5580 6879ba42 2020-10-01 naddy fprintf(fp, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
5581 6879ba42 2020-10-01 naddy getprogname());
5582 6879ba42 2020-10-01 naddy if (hflag) {
5583 6879ba42 2020-10-01 naddy fprintf(fp, "lazy usage: %s path\n", getprogname());
5584 6879ba42 2020-10-01 naddy list_commands(fp);
5586 6879ba42 2020-10-01 naddy exit(status);
5589 c2301be8 2018-04-30 stsp static char **
5590 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
5592 ee85c5e8 2020-02-29 stsp va_list ap;
5593 c2301be8 2018-04-30 stsp char **argv;
5596 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
5598 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
5599 c2301be8 2018-04-30 stsp if (argv == NULL)
5600 c2301be8 2018-04-30 stsp err(1, "calloc");
5601 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
5602 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
5603 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
5604 e10c916e 2019-09-15 hiltjo err(1, "strdup");
5607 ee85c5e8 2020-02-29 stsp va_end(ap);
5608 c2301be8 2018-04-30 stsp return argv;
5612 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
5613 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
5614 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
5615 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
5616 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
5618 ee85c5e8 2020-02-29 stsp static const struct got_error *
5619 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
5621 ee85c5e8 2020-02-29 stsp const struct got_error *error = NULL;
5622 ee85c5e8 2020-02-29 stsp struct tog_cmd *cmd = NULL;
5623 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
5624 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
5625 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
5626 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5627 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
5629 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
5630 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
5631 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
5633 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
5634 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5635 ee85c5e8 2020-02-29 stsp goto done;
5637 ee85c5e8 2020-02-29 stsp if (worktree)
5638 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
5640 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
5641 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
5642 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
5643 ee85c5e8 2020-02-29 stsp goto done;
5646 ee85c5e8 2020-02-29 stsp error = got_repo_open(&repo, repo_path, NULL);
5647 ee85c5e8 2020-02-29 stsp if (error != NULL)
5648 ee85c5e8 2020-02-29 stsp goto done;
5650 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5651 ee85c5e8 2020-02-29 stsp repo, worktree);
5652 ee85c5e8 2020-02-29 stsp if (error)
5653 ee85c5e8 2020-02-29 stsp goto done;
5655 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
5656 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
5657 ee85c5e8 2020-02-29 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5658 ee85c5e8 2020-02-29 stsp if (error)
5659 ee85c5e8 2020-02-29 stsp goto done;
5661 ee85c5e8 2020-02-29 stsp if (worktree) {
5662 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5663 ee85c5e8 2020-02-29 stsp worktree = NULL;
5666 ee85c5e8 2020-02-29 stsp error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
5667 ee85c5e8 2020-02-29 stsp if (error) {
5668 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
5669 ee85c5e8 2020-02-29 stsp goto done;
5670 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
5671 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
5672 6879ba42 2020-10-01 naddy usage(1, 1);
5673 ee85c5e8 2020-02-29 stsp /* not reached */
5676 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5677 ee85c5e8 2020-02-29 stsp repo = NULL;
5679 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
5680 ee85c5e8 2020-02-29 stsp if (error)
5681 ee85c5e8 2020-02-29 stsp goto done;
5683 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
5685 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
5686 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
5689 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5690 ee85c5e8 2020-02-29 stsp if (worktree)
5691 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5693 ee85c5e8 2020-02-29 stsp free(commit_id_str);
5694 ee85c5e8 2020-02-29 stsp free(commit_id);
5695 ee85c5e8 2020-02-29 stsp free(cwd);
5696 ee85c5e8 2020-02-29 stsp free(repo_path);
5697 ee85c5e8 2020-02-29 stsp free(in_repo_path);
5698 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
5700 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
5701 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
5702 ee85c5e8 2020-02-29 stsp free(cmd_argv);
5704 ee85c5e8 2020-02-29 stsp return error;
5708 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
5710 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
5711 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
5712 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
5713 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
5714 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
5715 62d463ca 2020-10-20 naddy { "version", no_argument, NULL, 'V' },
5716 62d463ca 2020-10-20 naddy { NULL, 0, NULL, 0}
5719 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
5721 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5722 9f7d7167 2018-04-29 stsp switch (ch) {
5724 9f7d7167 2018-04-29 stsp hflag = 1;
5727 53ccebc2 2019-07-30 stsp Vflag = 1;
5730 6879ba42 2020-10-01 naddy usage(hflag, 1);
5731 9f7d7167 2018-04-29 stsp /* NOTREACHED */
5735 9f7d7167 2018-04-29 stsp argc -= optind;
5736 9f7d7167 2018-04-29 stsp argv += optind;
5737 9814e6a3 2020-09-27 naddy optind = 1;
5738 c2301be8 2018-04-30 stsp optreset = 1;
5740 53ccebc2 2019-07-30 stsp if (Vflag) {
5741 53ccebc2 2019-07-30 stsp got_version_print_str();
5742 6879ba42 2020-10-01 naddy return 0;
5745 c2301be8 2018-04-30 stsp if (argc == 0) {
5746 f29d3e89 2018-06-23 stsp if (hflag)
5747 6879ba42 2020-10-01 naddy usage(hflag, 0);
5748 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
5749 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
5751 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
5755 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
5756 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
5757 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
5758 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
5759 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
5765 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
5766 ee85c5e8 2020-02-29 stsp if (argc != 1)
5767 6879ba42 2020-10-01 naddy usage(0, 1);
5768 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
5769 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
5771 ee85c5e8 2020-02-29 stsp if (hflag)
5772 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
5774 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5778 b46c1e04 2020-09-20 naddy putchar('\n');
5779 a2f4a359 2020-02-28 stsp if (cmd_argv) {
5781 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
5782 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
5783 a2f4a359 2020-02-28 stsp free(cmd_argv);
5786 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
5787 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
