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 31120ada 2018-04-30 stsp #include <errno.h>
22 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
23 9f7d7167 2018-04-29 stsp #include <curses.h>
24 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
25 9f7d7167 2018-04-29 stsp #include <panel.h>
26 9f7d7167 2018-04-29 stsp #include <locale.h>
27 61266923 2020-01-14 stsp #include <signal.h>
28 9f7d7167 2018-04-29 stsp #include <stdlib.h>
29 ee85c5e8 2020-02-29 stsp #include <stdarg.h>
30 26ed57b2 2018-05-19 stsp #include <stdio.h>
31 9f7d7167 2018-04-29 stsp #include <getopt.h>
32 9f7d7167 2018-04-29 stsp #include <string.h>
33 9f7d7167 2018-04-29 stsp #include <err.h>
34 80ddbec8 2018-04-29 stsp #include <unistd.h>
35 26ed57b2 2018-05-19 stsp #include <util.h>
36 26ed57b2 2018-05-19 stsp #include <limits.h>
37 61e69b96 2018-05-20 stsp #include <wchar.h>
38 788c352e 2018-06-16 stsp #include <time.h>
39 84451b3e 2018-07-10 stsp #include <pthread.h>
40 5036bf37 2018-09-24 stsp #include <libgen.h>
41 60493ae3 2019-06-20 stsp #include <regex.h>
43 53ccebc2 2019-07-30 stsp #include "got_version.h"
44 9f7d7167 2018-04-29 stsp #include "got_error.h"
45 80ddbec8 2018-04-29 stsp #include "got_object.h"
46 80ddbec8 2018-04-29 stsp #include "got_reference.h"
47 80ddbec8 2018-04-29 stsp #include "got_repository.h"
48 80ddbec8 2018-04-29 stsp #include "got_diff.h"
49 511a516b 2018-05-19 stsp #include "got_opentemp.h"
50 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
51 6fb7cd11 2019-08-22 stsp #include "got_cancel.h"
52 6fb7cd11 2019-08-22 stsp #include "got_commit_graph.h"
53 a70480e0 2018-06-23 stsp #include "got_blame.h"
54 c2db6724 2019-01-04 stsp #include "got_privsep.h"
55 1dd54920 2019-05-11 stsp #include "got_path.h"
56 b7165be3 2019-02-05 stsp #include "got_worktree.h"
59 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
66 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
68 9f7d7167 2018-04-29 stsp #ifndef nitems
69 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
72 9f7d7167 2018-04-29 stsp struct tog_cmd {
73 c2301be8 2018-04-30 stsp const char *name;
74 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
75 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
78 ce5b7c56 2019-07-09 stsp __dead static void usage(int);
79 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
80 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
81 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
82 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
84 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
85 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
86 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
87 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
89 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
90 5e070240 2019-06-22 stsp { "log", cmd_log, usage_log },
91 5e070240 2019-06-22 stsp { "diff", cmd_diff, usage_diff },
92 5e070240 2019-06-22 stsp { "blame", cmd_blame, usage_blame },
93 5e070240 2019-06-22 stsp { "tree", cmd_tree, usage_tree },
96 d6b05b5b 2018-08-04 stsp enum tog_view_type {
97 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
98 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
99 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
100 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
103 c3e9aa98 2019-05-13 jcs #define TOG_EOF_STRING "(END)"
105 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
106 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
107 ba4f502b 2018-08-04 stsp struct got_object_id *id;
108 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
111 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
112 ba4f502b 2018-08-04 stsp struct commit_queue {
113 ba4f502b 2018-08-04 stsp int ncommits;
114 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
117 f26dddb7 2019-11-08 stsp struct tog_color {
118 f26dddb7 2019-11-08 stsp SIMPLEQ_ENTRY(tog_color) entry;
119 6d17833f 2019-11-08 stsp regex_t regex;
120 6d17833f 2019-11-08 stsp short colorpair;
122 f26dddb7 2019-11-08 stsp SIMPLEQ_HEAD(tog_colors, tog_color);
124 11b20872 2019-11-08 stsp static const struct got_error *
125 11b20872 2019-11-08 stsp add_color(struct tog_colors *colors, const char *pattern,
126 11b20872 2019-11-08 stsp int idx, short color)
128 11b20872 2019-11-08 stsp const struct got_error *err = NULL;
129 11b20872 2019-11-08 stsp struct tog_color *tc;
130 11b20872 2019-11-08 stsp int regerr = 0;
132 11b20872 2019-11-08 stsp if (idx < 1 || idx > COLOR_PAIRS - 1)
133 11b20872 2019-11-08 stsp return NULL;
135 11b20872 2019-11-08 stsp init_pair(idx, color, -1);
137 11b20872 2019-11-08 stsp tc = calloc(1, sizeof(*tc));
138 11b20872 2019-11-08 stsp if (tc == NULL)
139 11b20872 2019-11-08 stsp return got_error_from_errno("calloc");
140 11b20872 2019-11-08 stsp regerr = regcomp(&tc->regex, pattern,
141 11b20872 2019-11-08 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
142 11b20872 2019-11-08 stsp if (regerr) {
143 11b20872 2019-11-08 stsp static char regerr_msg[512];
144 11b20872 2019-11-08 stsp static char err_msg[512];
145 11b20872 2019-11-08 stsp regerror(regerr, &tc->regex, regerr_msg,
146 11b20872 2019-11-08 stsp sizeof(regerr_msg));
147 11b20872 2019-11-08 stsp snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
148 11b20872 2019-11-08 stsp regerr_msg);
149 11b20872 2019-11-08 stsp err = got_error_msg(GOT_ERR_REGEX, err_msg);
151 11b20872 2019-11-08 stsp return err;
153 11b20872 2019-11-08 stsp tc->colorpair = idx;
154 11b20872 2019-11-08 stsp SIMPLEQ_INSERT_HEAD(colors, tc, entry);
155 11b20872 2019-11-08 stsp return NULL;
158 11b20872 2019-11-08 stsp static void
159 11b20872 2019-11-08 stsp free_colors(struct tog_colors *colors)
161 11b20872 2019-11-08 stsp struct tog_color *tc;
163 11b20872 2019-11-08 stsp while (!SIMPLEQ_EMPTY(colors)) {
164 11b20872 2019-11-08 stsp tc = SIMPLEQ_FIRST(colors);
165 11b20872 2019-11-08 stsp SIMPLEQ_REMOVE_HEAD(colors, entry);
166 11b20872 2019-11-08 stsp regfree(&tc->regex);
171 11b20872 2019-11-08 stsp struct tog_color *
172 11b20872 2019-11-08 stsp get_color(struct tog_colors *colors, int colorpair)
174 11b20872 2019-11-08 stsp struct tog_color *tc = NULL;
176 11b20872 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
177 11b20872 2019-11-08 stsp if (tc->colorpair == colorpair)
181 11b20872 2019-11-08 stsp return NULL;
185 11b20872 2019-11-08 stsp default_color_value(const char *envvar)
187 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
188 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
189 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
190 11b20872 2019-11-08 stsp return COLOR_CYAN;
191 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
192 11b20872 2019-11-08 stsp return COLOR_YELLOW;
193 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
194 11b20872 2019-11-08 stsp return COLOR_GREEN;
195 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
196 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
197 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
198 91b8c405 2020-01-25 stsp return COLOR_MAGENTA;
199 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
200 91b8c405 2020-01-25 stsp return COLOR_CYAN;
201 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
202 11b20872 2019-11-08 stsp return COLOR_GREEN;
203 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
204 11b20872 2019-11-08 stsp return COLOR_GREEN;
205 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
206 11b20872 2019-11-08 stsp return COLOR_CYAN;
207 11b20872 2019-11-08 stsp if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
208 11b20872 2019-11-08 stsp return COLOR_YELLOW;
214 11b20872 2019-11-08 stsp get_color_value(const char *envvar)
216 11b20872 2019-11-08 stsp const char *val = getenv(envvar);
218 11b20872 2019-11-08 stsp if (val == NULL)
219 11b20872 2019-11-08 stsp return default_color_value(envvar);
221 11b20872 2019-11-08 stsp if (strcasecmp(val, "black") == 0)
222 11b20872 2019-11-08 stsp return COLOR_BLACK;
223 11b20872 2019-11-08 stsp if (strcasecmp(val, "red") == 0)
224 11b20872 2019-11-08 stsp return COLOR_RED;
225 11b20872 2019-11-08 stsp if (strcasecmp(val, "green") == 0)
226 11b20872 2019-11-08 stsp return COLOR_GREEN;
227 11b20872 2019-11-08 stsp if (strcasecmp(val, "yellow") == 0)
228 11b20872 2019-11-08 stsp return COLOR_YELLOW;
229 11b20872 2019-11-08 stsp if (strcasecmp(val, "blue") == 0)
230 11b20872 2019-11-08 stsp return COLOR_BLUE;
231 11b20872 2019-11-08 stsp if (strcasecmp(val, "magenta") == 0)
232 11b20872 2019-11-08 stsp return COLOR_MAGENTA;
233 11b20872 2019-11-08 stsp if (strcasecmp(val, "cyan") == 0)
234 11b20872 2019-11-08 stsp return COLOR_CYAN;
235 11b20872 2019-11-08 stsp if (strcasecmp(val, "white") == 0)
236 11b20872 2019-11-08 stsp return COLOR_WHITE;
237 11b20872 2019-11-08 stsp if (strcasecmp(val, "default") == 0)
240 11b20872 2019-11-08 stsp return default_color_value(envvar);
244 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
245 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
247 15a087fe 2019-02-21 stsp int first_displayed_line;
248 15a087fe 2019-02-21 stsp int last_displayed_line;
250 15a087fe 2019-02-21 stsp int diff_context;
251 15a087fe 2019-02-21 stsp struct got_repository *repo;
252 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
253 bddb1296 2019-11-08 stsp struct tog_colors colors;
254 f44b1f58 2020-02-02 tracey int nlines;
255 f44b1f58 2020-02-02 tracey off_t *line_offsets;
256 f44b1f58 2020-02-02 tracey int matched_line;
257 f44b1f58 2020-02-02 tracey int selected_line;
258 f44b1f58 2020-02-02 tracey size_t filesize;
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 1a76625f 2018-10-22 stsp int commits_needed;
269 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
270 1a76625f 2018-10-22 stsp struct commit_queue *commits;
271 1a76625f 2018-10-22 stsp const char *in_repo_path;
272 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
273 1a76625f 2018-10-22 stsp struct got_repository *repo;
274 1a76625f 2018-10-22 stsp int log_complete;
275 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
276 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
277 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
278 13add988 2019-10-15 stsp int *searching;
279 13add988 2019-10-15 stsp int *search_next_done;
280 13add988 2019-10-15 stsp regex_t *regex;
283 1a76625f 2018-10-22 stsp struct tog_log_view_state {
284 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
285 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
286 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
287 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
288 b01e7d3b 2018-08-04 stsp int selected;
289 b01e7d3b 2018-08-04 stsp char *in_repo_path;
290 d01904d4 2019-06-25 stsp const char *head_ref_name;
291 b672a97a 2020-01-27 stsp int log_branches;
292 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
293 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
294 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
295 1a76625f 2018-10-22 stsp sig_atomic_t quit;
296 1a76625f 2018-10-22 stsp pthread_t thread;
297 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
298 60493ae3 2019-06-20 stsp struct commit_queue_entry *matched_entry;
299 96e2b566 2019-07-08 stsp struct commit_queue_entry *search_entry;
300 11b20872 2019-11-08 stsp struct tog_colors colors;
303 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_MINUS 1
304 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_PLUS 2
305 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_CHUNK_HEADER 3
306 11b20872 2019-11-08 stsp #define TOG_COLOR_DIFF_META 4
307 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SUBMODULE 5
308 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_SYMLINK 6
309 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_DIRECTORY 7
310 11b20872 2019-11-08 stsp #define TOG_COLOR_TREE_EXECUTABLE 8
311 11b20872 2019-11-08 stsp #define TOG_COLOR_COMMIT 9
312 11b20872 2019-11-08 stsp #define TOG_COLOR_AUTHOR 10
313 11b20872 2019-11-08 stsp #define TOG_COLOR_DATE 11
315 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
316 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
317 e9424729 2018-08-04 stsp int nlines;
319 e9424729 2018-08-04 stsp struct tog_view *view;
320 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
324 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
325 e9424729 2018-08-04 stsp const char *path;
326 e9424729 2018-08-04 stsp struct got_repository *repo;
327 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
328 e9424729 2018-08-04 stsp int *complete;
329 fc06ba56 2019-08-22 stsp got_cancel_cb cancel_cb;
330 fc06ba56 2019-08-22 stsp void *cancel_arg;
333 e9424729 2018-08-04 stsp struct tog_blame {
335 e9424729 2018-08-04 stsp size_t filesize;
336 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
337 6fcac457 2018-11-19 stsp int nlines;
338 6c4c42e0 2019-06-24 stsp off_t *line_offsets;
339 e9424729 2018-08-04 stsp pthread_t thread;
340 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
341 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
342 e9424729 2018-08-04 stsp const char *path;
345 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
346 7cbe629d 2018-08-04 stsp int first_displayed_line;
347 7cbe629d 2018-08-04 stsp int last_displayed_line;
348 7cbe629d 2018-08-04 stsp int selected_line;
349 7cbe629d 2018-08-04 stsp int blame_complete;
352 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
353 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
354 e5a0f69f 2018-08-18 stsp char *path;
355 7cbe629d 2018-08-04 stsp struct got_repository *repo;
356 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
357 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
358 e9424729 2018-08-04 stsp struct tog_blame blame;
359 6c4c42e0 2019-06-24 stsp int matched_line;
360 11b20872 2019-11-08 stsp struct tog_colors colors;
363 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
364 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
365 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
366 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
367 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
368 ad80ab7b 2018-08-04 stsp int selected;
371 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
373 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
374 ad80ab7b 2018-08-04 stsp char *tree_label;
375 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
376 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
377 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
378 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
379 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
380 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
381 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
382 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
383 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
384 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
385 7c32bd05 2019-06-22 stsp struct got_tree_entry *matched_entry;
386 bddb1296 2019-11-08 stsp struct tog_colors colors;
390 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
392 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
393 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
394 669b5ffa 2018-10-07 stsp * there is enough screen estate.
396 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
397 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
399 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
400 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
401 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
403 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
404 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
406 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
408 cc3c9aac 2018-08-01 stsp struct tog_view {
409 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
410 26ed57b2 2018-05-19 stsp WINDOW *window;
411 26ed57b2 2018-05-19 stsp PANEL *panel;
412 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
413 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
414 1004088d 2018-09-29 stsp int focussed;
415 669b5ffa 2018-10-07 stsp struct tog_view *parent;
416 669b5ffa 2018-10-07 stsp struct tog_view *child;
417 669b5ffa 2018-10-07 stsp int child_focussed;
419 5dc9f4bc 2018-08-04 stsp /* type-specific state */
420 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
422 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
423 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
424 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
425 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
428 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
429 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
430 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
431 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
433 60493ae3 2019-06-20 stsp const struct got_error *(*search_start)(struct tog_view *);
434 60493ae3 2019-06-20 stsp const struct got_error *(*search_next)(struct tog_view *);
435 60493ae3 2019-06-20 stsp int searching;
436 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_FORWARD 1
437 b1bf1435 2019-06-21 stsp #define TOG_SEARCH_BACKWARD 2
438 60493ae3 2019-06-20 stsp int search_next_done;
439 1803e47f 2019-06-22 stsp regex_t regex;
442 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
443 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
444 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
445 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
446 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
447 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
448 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
449 f44b1f58 2020-02-02 tracey static const struct got_error *search_start_diff_view(struct tog_view *);
450 f44b1f58 2020-02-02 tracey static const struct got_error *search_next_diff_view(struct tog_view *);
452 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
453 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
454 f135c941 2020-02-20 stsp struct got_repository *, const char *, const char *, int);
455 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
456 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
457 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
458 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
459 60493ae3 2019-06-20 stsp static const struct got_error *search_start_log_view(struct tog_view *);
460 60493ae3 2019-06-20 stsp static const struct got_error *search_next_log_view(struct tog_view *);
462 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
463 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
464 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
465 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
466 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
467 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
468 6c4c42e0 2019-06-24 stsp static const struct got_error *search_start_blame_view(struct tog_view *);
469 6c4c42e0 2019-06-24 stsp static const struct got_error *search_next_blame_view(struct tog_view *);
471 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
472 55cccc34 2020-02-20 stsp struct got_tree_object *, struct got_object_id *, struct got_reflist_head *,
473 55cccc34 2020-02-20 stsp struct got_repository *);
474 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
475 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
476 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
477 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
478 7c32bd05 2019-06-22 stsp static const struct got_error *search_start_tree_view(struct tog_view *);
479 7c32bd05 2019-06-22 stsp static const struct got_error *search_next_tree_view(struct tog_view *);
481 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
482 83baff54 2019-08-12 stsp static volatile sig_atomic_t tog_sigpipe_received;
483 61266923 2020-01-14 stsp static volatile sig_atomic_t tog_sigcont_received;
485 25791caa 2018-10-24 stsp static void
486 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
488 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
491 83baff54 2019-08-12 stsp static void
492 83baff54 2019-08-12 stsp tog_sigpipe(int signo)
494 83baff54 2019-08-12 stsp tog_sigpipe_received = 1;
497 61266923 2020-01-14 stsp static void
498 61266923 2020-01-14 stsp tog_sigcont(int signo)
500 61266923 2020-01-14 stsp tog_sigcont_received = 1;
503 e5a0f69f 2018-08-18 stsp static const struct got_error *
504 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
506 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
508 669b5ffa 2018-10-07 stsp if (view->child) {
509 669b5ffa 2018-10-07 stsp view_close(view->child);
510 669b5ffa 2018-10-07 stsp view->child = NULL;
512 e5a0f69f 2018-08-18 stsp if (view->close)
513 e5a0f69f 2018-08-18 stsp err = view->close(view);
514 ea5e7bb5 2018-08-01 stsp if (view->panel)
515 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
516 ea5e7bb5 2018-08-01 stsp if (view->window)
517 ea5e7bb5 2018-08-01 stsp delwin(view->window);
518 ea5e7bb5 2018-08-01 stsp free(view);
519 e5a0f69f 2018-08-18 stsp return err;
522 ea5e7bb5 2018-08-01 stsp static struct tog_view *
523 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
524 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
526 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
528 ea5e7bb5 2018-08-01 stsp if (view == NULL)
529 ea5e7bb5 2018-08-01 stsp return NULL;
531 d6b05b5b 2018-08-04 stsp view->type = type;
532 f7d12f7e 2018-08-01 stsp view->lines = LINES;
533 f7d12f7e 2018-08-01 stsp view->cols = COLS;
534 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
535 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
536 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
537 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
538 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
539 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
540 96a765a8 2018-08-04 stsp view_close(view);
541 ea5e7bb5 2018-08-01 stsp return NULL;
543 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
544 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
545 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
546 96a765a8 2018-08-04 stsp view_close(view);
547 ea5e7bb5 2018-08-01 stsp return NULL;
550 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
551 ea5e7bb5 2018-08-01 stsp return view;
555 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
557 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
559 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
562 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
564 5c60c32a 2018-10-18 stsp static const struct got_error *
565 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
567 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
569 5c60c32a 2018-10-18 stsp view->begin_y = 0;
570 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
571 5c60c32a 2018-10-18 stsp view->nlines = LINES;
572 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
573 5c60c32a 2018-10-18 stsp view->lines = LINES;
574 5c60c32a 2018-10-18 stsp view->cols = COLS;
575 5c60c32a 2018-10-18 stsp err = view_resize(view);
577 5c60c32a 2018-10-18 stsp return err;
579 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
580 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
582 5c60c32a 2018-10-18 stsp return NULL;
585 5c60c32a 2018-10-18 stsp static const struct got_error *
586 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
588 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
590 5c60c32a 2018-10-18 stsp view->begin_x = 0;
591 5c60c32a 2018-10-18 stsp view->begin_y = 0;
592 5c60c32a 2018-10-18 stsp view->nlines = LINES;
593 5c60c32a 2018-10-18 stsp view->ncols = COLS;
594 5c60c32a 2018-10-18 stsp view->lines = LINES;
595 5c60c32a 2018-10-18 stsp view->cols = COLS;
596 5c60c32a 2018-10-18 stsp err = view_resize(view);
598 5c60c32a 2018-10-18 stsp return err;
600 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
601 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
603 5c60c32a 2018-10-18 stsp return NULL;
607 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
609 5c60c32a 2018-10-18 stsp return view->parent == NULL;
612 4d8c2215 2018-08-19 stsp static const struct got_error *
613 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
615 f7d12f7e 2018-08-01 stsp int nlines, ncols;
617 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
618 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
620 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
622 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
623 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
625 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
627 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
628 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
629 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
630 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
631 25791caa 2018-10-24 stsp wclear(view->window);
633 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
634 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
635 0cf4efb1 2018-09-29 stsp view->lines = LINES;
636 0cf4efb1 2018-09-29 stsp view->cols = COLS;
638 6e3e5d9c 2018-10-18 stsp if (view->child) {
639 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
640 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
641 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
642 5c60c32a 2018-10-18 stsp if (view->child->focussed)
643 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
645 5c60c32a 2018-10-18 stsp show_panel(view->panel);
647 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
648 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
652 5c60c32a 2018-10-18 stsp return NULL;
655 669b5ffa 2018-10-07 stsp static const struct got_error *
656 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
658 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
660 669b5ffa 2018-10-07 stsp if (view->child == NULL)
661 669b5ffa 2018-10-07 stsp return NULL;
663 669b5ffa 2018-10-07 stsp err = view_close(view->child);
664 669b5ffa 2018-10-07 stsp view->child = NULL;
665 669b5ffa 2018-10-07 stsp return err;
668 669b5ffa 2018-10-07 stsp static const struct got_error *
669 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
671 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
673 669b5ffa 2018-10-07 stsp view->child = child;
674 669b5ffa 2018-10-07 stsp child->parent = view;
675 669b5ffa 2018-10-07 stsp return err;
679 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
681 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
684 34bc9ec9 2019-02-22 stsp static void
685 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
687 25791caa 2018-10-24 stsp int cols, lines;
688 25791caa 2018-10-24 stsp struct winsize size;
690 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
691 25791caa 2018-10-24 stsp cols = 80; /* Default */
692 25791caa 2018-10-24 stsp lines = 24;
694 25791caa 2018-10-24 stsp cols = size.ws_col;
695 25791caa 2018-10-24 stsp lines = size.ws_row;
697 25791caa 2018-10-24 stsp resize_term(lines, cols);
700 2b49a8ae 2019-06-22 stsp static const struct got_error *
701 2b49a8ae 2019-06-22 stsp view_search_start(struct tog_view *view)
703 7c32bd05 2019-06-22 stsp const struct got_error *err = NULL;
704 2b49a8ae 2019-06-22 stsp char pattern[1024];
707 2b49a8ae 2019-06-22 stsp if (view->nlines < 1)
708 2b49a8ae 2019-06-22 stsp return NULL;
710 cb1159f8 2020-02-19 stsp mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
711 2b49a8ae 2019-06-22 stsp wclrtoeol(view->window);
713 2b49a8ae 2019-06-22 stsp nocbreak();
715 2b49a8ae 2019-06-22 stsp ret = wgetnstr(view->window, pattern, sizeof(pattern));
718 2b49a8ae 2019-06-22 stsp if (ret == ERR)
719 2b49a8ae 2019-06-22 stsp return NULL;
721 2b49a8ae 2019-06-22 stsp if (view->searching) {
722 2b49a8ae 2019-06-22 stsp regfree(&view->regex);
723 2b49a8ae 2019-06-22 stsp view->searching = 0;
726 2b49a8ae 2019-06-22 stsp if (regcomp(&view->regex, pattern,
727 f5daf9b1 2019-06-24 stsp REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
728 7c32bd05 2019-06-22 stsp err = view->search_start(view);
730 7c32bd05 2019-06-22 stsp regfree(&view->regex);
731 7c32bd05 2019-06-22 stsp return err;
733 2b49a8ae 2019-06-22 stsp view->searching = TOG_SEARCH_FORWARD;
734 2b49a8ae 2019-06-22 stsp view->search_next_done = 0;
735 2b49a8ae 2019-06-22 stsp view->search_next(view);
738 2b49a8ae 2019-06-22 stsp return NULL;
741 0cf4efb1 2018-09-29 stsp static const struct got_error *
742 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
743 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
744 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
746 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
747 669b5ffa 2018-10-07 stsp struct tog_view *v;
748 1a76625f 2018-10-22 stsp int ch, errcode;
750 e5a0f69f 2018-08-18 stsp *new = NULL;
751 e5a0f69f 2018-08-18 stsp *dead = NULL;
752 0cf4efb1 2018-09-29 stsp *focus = NULL;
754 60493ae3 2019-06-20 stsp if (view->searching && !view->search_next_done) {
755 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
756 82954512 2020-02-03 stsp if (errcode)
757 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
758 82954512 2020-02-03 stsp "pthread_mutex_unlock");
759 82954512 2020-02-03 stsp pthread_yield();
760 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
761 82954512 2020-02-03 stsp if (errcode)
762 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
763 82954512 2020-02-03 stsp "pthread_mutex_lock");
764 60493ae3 2019-06-20 stsp view->search_next(view);
765 60493ae3 2019-06-20 stsp return NULL;
768 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
769 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
770 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
771 1a76625f 2018-10-22 stsp if (errcode)
772 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
773 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
774 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
775 1a76625f 2018-10-22 stsp if (errcode)
776 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
777 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
779 61266923 2020-01-14 stsp if (tog_sigwinch_received || tog_sigcont_received) {
780 25791caa 2018-10-24 stsp tog_resizeterm();
781 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
782 61266923 2020-01-14 stsp tog_sigcont_received = 0;
783 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
784 25791caa 2018-10-24 stsp err = view_resize(v);
786 25791caa 2018-10-24 stsp return err;
787 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
789 25791caa 2018-10-24 stsp return err;
793 e5a0f69f 2018-08-18 stsp switch (ch) {
797 1e37a5c2 2019-05-12 jcs if (view->child) {
798 1e37a5c2 2019-05-12 jcs *focus = view->child;
799 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
800 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
801 1e37a5c2 2019-05-12 jcs *focus = view->parent;
802 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
806 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
807 1e37a5c2 2019-05-12 jcs *dead = view;
813 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
814 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
816 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
817 669b5ffa 2018-10-07 stsp *focus = view->child;
818 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
819 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
821 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
824 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
825 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
827 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
828 1e37a5c2 2019-05-12 jcs *focus = view;
829 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
830 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
832 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
836 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
837 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
840 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
843 60493ae3 2019-06-20 stsp if (view->search_start)
844 2b49a8ae 2019-06-22 stsp view_search_start(view);
846 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
850 60493ae3 2019-06-20 stsp if (view->search_next && view->searching) {
851 b1bf1435 2019-06-21 stsp view->searching = (ch == 'n' ?
852 b1bf1435 2019-06-21 stsp TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
853 60493ae3 2019-06-20 stsp view->search_next_done = 0;
854 60493ae3 2019-06-20 stsp view->search_next(view);
856 60493ae3 2019-06-20 stsp err = view->input(new, dead, focus, view, ch);
859 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
863 e5a0f69f 2018-08-18 stsp return err;
867 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
869 0cf4efb1 2018-09-29 stsp PANEL *panel;
870 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
872 669b5ffa 2018-10-07 stsp if (view->parent)
873 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
875 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
876 0cf4efb1 2018-09-29 stsp if (panel == NULL)
879 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
880 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
881 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
885 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
887 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
888 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
890 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
892 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
895 669b5ffa 2018-10-07 stsp return view->focussed;
898 bcbd79e2 2018-08-19 stsp static const struct got_error *
899 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
901 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
902 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
903 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
904 fd823528 2018-10-22 stsp int fast_refresh = 10;
905 1a76625f 2018-10-22 stsp int done = 0, errcode;
907 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
908 1a76625f 2018-10-22 stsp if (errcode)
909 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
911 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
912 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
914 a81bf10d 2018-09-29 stsp main_view = view;
915 1004088d 2018-09-29 stsp view->focussed = 1;
916 878940b7 2018-09-29 stsp err = view->show(view);
918 0cf4efb1 2018-09-29 stsp return err;
919 0cf4efb1 2018-09-29 stsp update_panels();
920 0cf4efb1 2018-09-29 stsp doupdate();
921 83baff54 2019-08-12 stsp while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
922 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
923 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
924 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
926 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
927 e4197bf9 2018-08-18 stsp view, &views);
930 e5a0f69f 2018-08-18 stsp if (dead_view) {
931 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
933 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
934 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
935 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
936 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
937 669b5ffa 2018-10-07 stsp prev = view->parent;
939 669b5ffa 2018-10-07 stsp if (dead_view->parent)
940 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
942 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
944 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
945 d01904d4 2019-06-25 stsp if (err || (dead_view == main_view && new_view == NULL))
948 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
949 0cf4efb1 2018-09-29 stsp if (focus_view)
950 0cf4efb1 2018-09-29 stsp view = focus_view;
951 669b5ffa 2018-10-07 stsp else if (prev)
952 669b5ffa 2018-10-07 stsp view = prev;
953 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
954 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
955 0cf4efb1 2018-09-29 stsp tog_view_list_head);
957 0cf4efb1 2018-09-29 stsp view = NULL;
958 669b5ffa 2018-10-07 stsp if (view) {
959 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
960 669b5ffa 2018-10-07 stsp focus_view = view->child;
962 669b5ffa 2018-10-07 stsp focus_view = view;
966 bcbd79e2 2018-08-19 stsp if (new_view) {
967 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
968 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
969 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
970 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
972 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
973 86c66b02 2018-10-18 stsp err = view_close(v);
978 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
979 fed7eaa8 2018-10-24 stsp view = new_view;
980 878940b7 2018-09-29 stsp if (focus_view == NULL)
981 878940b7 2018-09-29 stsp focus_view = new_view;
983 0cf4efb1 2018-09-29 stsp if (focus_view) {
984 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
986 0cf4efb1 2018-09-29 stsp view->focussed = 0;
987 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
988 0cf4efb1 2018-09-29 stsp view = focus_view;
989 878940b7 2018-09-29 stsp if (new_view)
990 878940b7 2018-09-29 stsp show_panel(new_view->panel);
991 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
992 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
994 669b5ffa 2018-10-07 stsp if (view) {
995 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
996 758194b5 2018-10-24 stsp view->focussed = 1;
997 758194b5 2018-10-24 stsp show_panel(view->panel);
998 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
999 758194b5 2018-10-24 stsp show_panel(view->child->panel);
1000 1a76625f 2018-10-22 stsp focus_view = view;
1002 669b5ffa 2018-10-07 stsp if (view->parent) {
1003 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
1005 1a76625f 2018-10-22 stsp goto done;
1007 669b5ffa 2018-10-07 stsp err = view->show(view);
1009 1a76625f 2018-10-22 stsp goto done;
1010 669b5ffa 2018-10-07 stsp if (view->child) {
1011 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
1013 1a76625f 2018-10-22 stsp goto done;
1015 1a76625f 2018-10-22 stsp update_panels();
1016 1a76625f 2018-10-22 stsp doupdate();
1020 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
1021 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
1022 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
1023 e5a0f69f 2018-08-18 stsp view_close(view);
1026 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1027 963ecf2a 2019-08-12 stsp if (errcode && err == NULL)
1028 963ecf2a 2019-08-12 stsp err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1030 e5a0f69f 2018-08-18 stsp return err;
1033 4ed7e80c 2018-05-20 stsp __dead static void
1034 9f7d7167 2018-04-29 stsp usage_log(void)
1037 c70c5802 2018-08-01 stsp fprintf(stderr,
1038 b672a97a 2020-01-27 stsp "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1039 9f7d7167 2018-04-29 stsp getprogname());
1043 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
1044 80ddbec8 2018-04-29 stsp static const struct got_error *
1045 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1047 00dfcb92 2018-06-11 stsp char *vis = NULL;
1048 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1050 963b370f 2018-05-20 stsp *ws = NULL;
1051 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
1052 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
1053 00dfcb92 2018-06-11 stsp int vislen;
1054 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
1055 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
1057 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
1058 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
1060 00dfcb92 2018-06-11 stsp return err;
1061 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
1062 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
1063 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
1064 a7f50699 2018-06-11 stsp goto done;
1068 fd9f4a2d 2019-08-28 hiltjo *ws = calloc(*wlen + 1, sizeof(**ws));
1069 a7f50699 2018-06-11 stsp if (*ws == NULL) {
1070 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
1071 a7f50699 2018-06-11 stsp goto done;
1074 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1075 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
1077 00dfcb92 2018-06-11 stsp free(vis);
1078 963b370f 2018-05-20 stsp if (err) {
1079 963b370f 2018-05-20 stsp free(*ws);
1080 963b370f 2018-05-20 stsp *ws = NULL;
1081 963b370f 2018-05-20 stsp *wlen = 0;
1083 963b370f 2018-05-20 stsp return err;
1086 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
1087 963b370f 2018-05-20 stsp static const struct got_error *
1088 27a741e5 2019-09-11 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1089 27a741e5 2019-09-11 stsp int col_tab_align)
1091 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
1092 963b370f 2018-05-20 stsp int cols = 0;
1093 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
1094 963b370f 2018-05-20 stsp size_t wlen;
1097 963b370f 2018-05-20 stsp *wlinep = NULL;
1098 b700b5d6 2018-07-10 stsp *widthp = 0;
1100 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
1102 963b370f 2018-05-20 stsp return err;
1105 27a741e5 2019-09-11 stsp while (i < wlen) {
1106 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
1108 27a741e5 2019-09-11 stsp if (width == 0) {
1113 27a741e5 2019-09-11 stsp if (width == 1 || width == 2) {
1114 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1116 27a741e5 2019-09-11 stsp cols += width;
1118 27a741e5 2019-09-11 stsp } else if (width == -1) {
1119 27a741e5 2019-09-11 stsp if (wline[i] == L'\t') {
1120 27a741e5 2019-09-11 stsp width = TABSIZE -
1121 27a741e5 2019-09-11 stsp ((cols + col_tab_align) % TABSIZE);
1122 27a741e5 2019-09-11 stsp if (cols + width > wlimit)
1124 27a741e5 2019-09-11 stsp cols += width;
1128 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
1129 963b370f 2018-05-20 stsp goto done;
1132 963b370f 2018-05-20 stsp wline[i] = L'\0';
1133 b700b5d6 2018-07-10 stsp if (widthp)
1134 b700b5d6 2018-07-10 stsp *widthp = cols;
1137 963b370f 2018-05-20 stsp free(wline);
1139 963b370f 2018-05-20 stsp *wlinep = wline;
1140 963b370f 2018-05-20 stsp return err;
1143 8b473291 2019-02-21 stsp static const struct got_error*
1144 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
1145 52b5abe1 2019-08-13 stsp struct got_object_id *id, struct got_repository *repo)
1147 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
1148 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
1150 8b473291 2019-02-21 stsp const char *name;
1152 8b473291 2019-02-21 stsp *refs_str = NULL;
1154 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
1155 52b5abe1 2019-08-13 stsp struct got_tag_object *tag = NULL;
1158 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
1159 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
1161 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
1162 8b473291 2019-02-21 stsp name += 5;
1163 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
1165 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
1166 8b473291 2019-02-21 stsp name += 6;
1167 8b473291 2019-02-21 stsp if (strncmp(name, "remotes/", 8) == 0)
1168 8b473291 2019-02-21 stsp name += 8;
1169 52b5abe1 2019-08-13 stsp if (strncmp(name, "tags/", 5) == 0) {
1170 52b5abe1 2019-08-13 stsp err = got_object_open_as_tag(&tag, repo, re->id);
1171 5d844a1e 2019-08-13 stsp if (err) {
1172 5d844a1e 2019-08-13 stsp if (err->code != GOT_ERR_OBJ_TYPE)
1174 5d844a1e 2019-08-13 stsp /* Ref points at something other than a tag. */
1175 5d844a1e 2019-08-13 stsp err = NULL;
1176 5d844a1e 2019-08-13 stsp tag = NULL;
1179 52b5abe1 2019-08-13 stsp cmp = got_object_id_cmp(tag ?
1180 52b5abe1 2019-08-13 stsp got_object_tag_get_object_id(tag) : re->id, id);
1182 52b5abe1 2019-08-13 stsp got_object_tag_close(tag);
1183 52b5abe1 2019-08-13 stsp if (cmp != 0)
1185 8b473291 2019-02-21 stsp s = *refs_str;
1186 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
1187 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
1188 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1190 8b473291 2019-02-21 stsp *refs_str = NULL;
1196 8b473291 2019-02-21 stsp return err;
1199 963b370f 2018-05-20 stsp static const struct got_error *
1200 27a741e5 2019-09-11 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1201 27a741e5 2019-09-11 stsp int col_tab_align)
1203 5813d178 2019-03-09 stsp char *smallerthan, *at;
1205 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
1206 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
1207 5813d178 2019-03-09 stsp author = smallerthan + 1;
1208 5813d178 2019-03-09 stsp at = strchr(author, '@');
1210 5813d178 2019-03-09 stsp *at = '\0';
1211 27a741e5 2019-09-11 stsp return format_line(wauthor, author_width, author, limit, col_tab_align);
1214 5813d178 2019-03-09 stsp static const struct got_error *
1215 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
1216 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
1217 11b20872 2019-11-08 stsp const size_t date_display_cols, int author_display_cols,
1218 11b20872 2019-11-08 stsp struct tog_colors *colors)
1220 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1221 6db9f7f6 2019-12-10 stsp char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1222 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
1223 5813d178 2019-03-09 stsp char *author = NULL;
1224 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
1225 bb737323 2018-05-20 stsp int author_width, logmsg_width;
1226 5813d178 2019-03-09 stsp char *newline, *line = NULL;
1227 bb737323 2018-05-20 stsp int col, limit;
1228 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
1229 ccb26ccd 2018-11-05 stsp struct tm tm;
1230 45d799e2 2018-12-23 stsp time_t committer_time;
1231 11b20872 2019-11-08 stsp struct tog_color *tc;
1233 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1234 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
1235 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
1236 6db9f7f6 2019-12-10 stsp if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1237 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
1238 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
1240 27a741e5 2019-09-11 stsp if (avail <= date_display_cols)
1241 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
1243 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1244 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_DATE);
1246 11b20872 2019-11-08 stsp wattr_on(view->window,
1247 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1248 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
1250 11b20872 2019-11-08 stsp wattr_off(view->window,
1251 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1252 27a741e5 2019-09-11 stsp col = limit;
1253 b39d25c7 2018-07-10 stsp if (col > avail)
1254 b39d25c7 2018-07-10 stsp goto done;
1256 6570a66d 2019-11-08 stsp if (avail >= 120) {
1257 6570a66d 2019-11-08 stsp char *id_str;
1258 6570a66d 2019-11-08 stsp err = got_object_id_str(&id_str, id);
1260 6570a66d 2019-11-08 stsp goto done;
1261 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1263 11b20872 2019-11-08 stsp wattr_on(view->window,
1264 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1265 6570a66d 2019-11-08 stsp wprintw(view->window, "%.8s ", id_str);
1267 11b20872 2019-11-08 stsp wattr_off(view->window,
1268 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1269 6570a66d 2019-11-08 stsp free(id_str);
1271 6570a66d 2019-11-08 stsp if (col > avail)
1272 6570a66d 2019-11-08 stsp goto done;
1275 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
1276 5813d178 2019-03-09 stsp if (author == NULL) {
1277 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1278 80ddbec8 2018-04-29 stsp goto done;
1280 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &author_width, author, avail - col, col);
1282 bb737323 2018-05-20 stsp goto done;
1283 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_AUTHOR);
1285 11b20872 2019-11-08 stsp wattr_on(view->window,
1286 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1287 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
1289 11b20872 2019-11-08 stsp wattr_off(view->window,
1290 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1291 bb737323 2018-05-20 stsp col += author_width;
1292 27a741e5 2019-09-11 stsp while (col < avail && author_width < author_display_cols + 2) {
1293 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1295 bb737323 2018-05-20 stsp author_width++;
1297 9c2eaf34 2018-05-20 stsp if (col > avail)
1298 9c2eaf34 2018-05-20 stsp goto done;
1300 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg0, commit);
1302 6d9fbc00 2018-04-29 stsp goto done;
1303 bb737323 2018-05-20 stsp logmsg = logmsg0;
1304 bb737323 2018-05-20 stsp while (*logmsg == '\n')
1306 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
1307 bb737323 2018-05-20 stsp if (newline)
1308 bb737323 2018-05-20 stsp *newline = '\0';
1309 bb737323 2018-05-20 stsp limit = avail - col;
1310 dee2c213 2019-11-13 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1312 bb737323 2018-05-20 stsp goto done;
1313 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
1314 bb737323 2018-05-20 stsp col += logmsg_width;
1315 27a741e5 2019-09-11 stsp while (col < avail) {
1316 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1320 80ddbec8 2018-04-29 stsp free(logmsg0);
1321 bb737323 2018-05-20 stsp free(wlogmsg);
1322 5813d178 2019-03-09 stsp free(author);
1323 bb737323 2018-05-20 stsp free(wauthor);
1324 80ddbec8 2018-04-29 stsp free(line);
1325 80ddbec8 2018-04-29 stsp return err;
1328 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1329 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1330 899d86c2 2018-05-10 stsp struct got_object_id *id)
1332 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1334 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1335 80ddbec8 2018-04-29 stsp if (entry == NULL)
1336 899d86c2 2018-05-10 stsp return NULL;
1338 899d86c2 2018-05-10 stsp entry->id = id;
1339 99db9666 2018-05-07 stsp entry->commit = commit;
1340 899d86c2 2018-05-10 stsp return entry;
1343 99db9666 2018-05-07 stsp static void
1344 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1346 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1348 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1349 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1350 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1351 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1352 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1353 99db9666 2018-05-07 stsp free(entry);
1356 99db9666 2018-05-07 stsp static void
1357 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1359 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1360 99db9666 2018-05-07 stsp pop_commit(commits);
1363 c4972b91 2018-05-07 stsp static const struct got_error *
1364 13add988 2019-10-15 stsp match_commit(int *have_match, struct got_object_id *id,
1365 13add988 2019-10-15 stsp struct got_commit_object *commit, regex_t *regex)
1367 13add988 2019-10-15 stsp const struct got_error *err = NULL;
1368 13add988 2019-10-15 stsp regmatch_t regmatch;
1369 13add988 2019-10-15 stsp char *id_str = NULL, *logmsg = NULL;
1371 13add988 2019-10-15 stsp *have_match = 0;
1373 13add988 2019-10-15 stsp err = got_object_id_str(&id_str, id);
1375 13add988 2019-10-15 stsp return err;
1377 13add988 2019-10-15 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
1379 13add988 2019-10-15 stsp goto done;
1381 13add988 2019-10-15 stsp if (regexec(regex, got_object_commit_get_author(commit), 1,
1382 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1383 13add988 2019-10-15 stsp regexec(regex, got_object_commit_get_committer(commit), 1,
1384 13add988 2019-10-15 stsp ®match, 0) == 0 ||
1385 13add988 2019-10-15 stsp regexec(regex, id_str, 1, ®match, 0) == 0 ||
1386 13add988 2019-10-15 stsp regexec(regex, logmsg, 1, ®match, 0) == 0)
1387 13add988 2019-10-15 stsp *have_match = 1;
1389 13add988 2019-10-15 stsp free(id_str);
1390 13add988 2019-10-15 stsp free(logmsg);
1391 13add988 2019-10-15 stsp return err;
1394 13add988 2019-10-15 stsp static const struct got_error *
1395 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1396 13add988 2019-10-15 stsp int minqueue, struct got_repository *repo, const char *path,
1397 13add988 2019-10-15 stsp int *searching, int *search_next_done, regex_t *regex)
1399 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1400 13add988 2019-10-15 stsp int nqueued = 0, have_match = 0;
1403 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1404 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1405 1a76625f 2018-10-22 stsp * while updating the display.
1407 13add988 2019-10-15 stsp while (nqueued < minqueue ||
1408 13add988 2019-10-15 stsp (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1409 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1410 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1411 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1412 1a76625f 2018-10-22 stsp int errcode;
1414 ee780d5c 2020-01-04 stsp err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1415 ee780d5c 2020-01-04 stsp if (err || id == NULL)
1418 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1421 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1422 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1423 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1427 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1428 1a76625f 2018-10-22 stsp if (errcode) {
1429 13add988 2019-10-15 stsp err = got_error_set_errno(errcode,
1430 13add988 2019-10-15 stsp "pthread_mutex_lock");
1434 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1435 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1436 ecb28ae0 2018-07-16 stsp nqueued++;
1437 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1439 13add988 2019-10-15 stsp if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1440 13add988 2019-10-15 stsp err = match_commit(&have_match, id, commit, regex);
1443 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1444 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1445 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1446 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1448 a93813fa 2020-01-20 mpi if (err || have_match)
1452 9ba79e04 2018-06-11 stsp return err;
1455 0553a4e3 2018-04-30 stsp static const struct got_error *
1456 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1457 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1458 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1459 11b20872 2019-11-08 stsp struct got_reflist_head *refs, const char *path, int commits_needed,
1460 11b20872 2019-11-08 stsp struct tog_colors *colors)
1462 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1463 52b5abe1 2019-08-13 stsp struct tog_log_view_state *s = &view->state.log;
1464 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1465 60493ae3 2019-06-20 stsp int width;
1466 52e88aae 2019-11-08 stsp int ncommits, author_cols = 4;
1467 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1468 8b473291 2019-02-21 stsp char *refs_str = NULL;
1469 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1470 11b20872 2019-11-08 stsp struct tog_color *tc;
1471 6db9f7f6 2019-12-10 stsp static const size_t date_display_cols = 12;
1473 e0d42f60 2018-07-22 stsp entry = first;
1474 e0d42f60 2018-07-22 stsp ncommits = 0;
1475 e0d42f60 2018-07-22 stsp while (entry) {
1476 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1477 e0d42f60 2018-07-22 stsp *selected = entry;
1480 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1481 e0d42f60 2018-07-22 stsp ncommits++;
1484 60493ae3 2019-06-20 stsp if (*selected && !(view->searching && view->search_next_done == 0)) {
1485 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1487 ecb28ae0 2018-07-16 stsp return err;
1488 8b473291 2019-02-21 stsp if (refs) {
1489 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, (*selected)->id,
1492 8b473291 2019-02-21 stsp goto done;
1496 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1497 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1499 8b473291 2019-02-21 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1500 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1501 60493ae3 2019-06-20 stsp commits_needed > 0 ?
1502 60493ae3 2019-06-20 stsp (view->searching && view->search_next_done == 0
1503 60493ae3 2019-06-20 stsp ? "searching..." : "loading... ") :
1504 8b473291 2019-02-21 stsp (refs_str ? refs_str : "")) == -1) {
1505 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1506 8b473291 2019-02-21 stsp goto done;
1509 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1510 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1511 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1512 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1513 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1514 1a76625f 2018-10-22 stsp header = NULL;
1515 1a76625f 2018-10-22 stsp goto done;
1517 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1518 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1519 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1520 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1521 1a76625f 2018-10-22 stsp header = NULL;
1522 1a76625f 2018-10-22 stsp goto done;
1524 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
1526 1a76625f 2018-10-22 stsp goto done;
1528 2814baeb 2018-08-01 stsp werase(view->window);
1530 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1531 a3404814 2018-09-02 stsp wstandout(view->window);
1532 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
1534 11b20872 2019-11-08 stsp wattr_on(view->window,
1535 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1536 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1538 11b20872 2019-11-08 stsp wattr_off(view->window,
1539 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
1540 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1541 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1544 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1545 a3404814 2018-09-02 stsp wstandend(view->window);
1546 ecb28ae0 2018-07-16 stsp free(wline);
1547 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1548 1a76625f 2018-10-22 stsp goto done;
1550 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1551 899d86c2 2018-05-10 stsp entry = first;
1552 5813d178 2019-03-09 stsp ncommits = 0;
1553 5813d178 2019-03-09 stsp while (entry) {
1554 5813d178 2019-03-09 stsp char *author;
1555 5813d178 2019-03-09 stsp wchar_t *wauthor;
1556 5813d178 2019-03-09 stsp int width;
1557 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1559 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1560 5813d178 2019-03-09 stsp if (author == NULL) {
1561 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1562 5813d178 2019-03-09 stsp goto done;
1564 27a741e5 2019-09-11 stsp err = format_author(&wauthor, &width, author, COLS,
1565 27a741e5 2019-09-11 stsp date_display_cols);
1566 5813d178 2019-03-09 stsp if (author_cols < width)
1567 5813d178 2019-03-09 stsp author_cols = width;
1568 5813d178 2019-03-09 stsp free(wauthor);
1569 5813d178 2019-03-09 stsp free(author);
1570 7ca04879 2019-10-19 stsp ncommits++;
1571 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1574 5813d178 2019-03-09 stsp entry = first;
1575 899d86c2 2018-05-10 stsp *last = first;
1576 867c6645 2018-07-10 stsp ncommits = 0;
1577 899d86c2 2018-05-10 stsp while (entry) {
1578 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1580 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1581 2814baeb 2018-08-01 stsp wstandout(view->window);
1582 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1583 11b20872 2019-11-08 stsp date_display_cols, author_cols, colors);
1584 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1585 2814baeb 2018-08-01 stsp wstandend(view->window);
1587 60493ae3 2019-06-20 stsp goto done;
1588 0553a4e3 2018-04-30 stsp ncommits++;
1589 899d86c2 2018-05-10 stsp *last = entry;
1590 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1593 1a57306a 2018-09-02 stsp view_vborder(view);
1595 1a76625f 2018-10-22 stsp free(id_str);
1596 8b473291 2019-02-21 stsp free(refs_str);
1597 1a76625f 2018-10-22 stsp free(ncommits_str);
1598 1a76625f 2018-10-22 stsp free(header);
1599 80ddbec8 2018-04-29 stsp return err;
1602 07b55e75 2018-05-10 stsp static void
1603 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1604 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1605 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1607 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1608 07b55e75 2018-05-10 stsp int nscrolled = 0;
1610 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1611 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1614 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1615 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1616 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1617 07b55e75 2018-05-10 stsp if (entry) {
1618 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1619 07b55e75 2018-05-10 stsp nscrolled++;
1624 aa075928 2018-05-10 stsp static const struct got_error *
1625 5e224a3e 2019-02-22 stsp trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1626 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1628 5e224a3e 2019-02-22 stsp int errcode;
1629 8a42fca8 2019-02-22 stsp int max_wait = 20;
1631 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1633 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1634 5e224a3e 2019-02-22 stsp if (*log_complete)
1637 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1638 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1639 7aafa0d1 2019-02-22 stsp if (errcode)
1640 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1641 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1642 82954512 2020-02-03 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1643 82954512 2020-02-03 stsp if (errcode)
1644 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1645 82954512 2020-02-03 stsp "pthread_mutex_unlock");
1646 82954512 2020-02-03 stsp pthread_yield();
1647 82954512 2020-02-03 stsp errcode = pthread_mutex_lock(&tog_mutex);
1648 82954512 2020-02-03 stsp if (errcode)
1649 82954512 2020-02-03 stsp return got_error_set_errno(errcode,
1650 82954512 2020-02-03 stsp "pthread_mutex_lock");
1652 8a42fca8 2019-02-22 stsp if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1654 5e224a3e 2019-02-22 stsp * Thread is not done yet; lose a key press
1655 5e224a3e 2019-02-22 stsp * and let the user retry... this way the GUI
1656 5e224a3e 2019-02-22 stsp * remains interactive while logging deep paths
1657 5e224a3e 2019-02-22 stsp * with few commits in history.
1659 7aafa0d1 2019-02-22 stsp return NULL;
1663 5e224a3e 2019-02-22 stsp return NULL;
1666 5e224a3e 2019-02-22 stsp static const struct got_error *
1667 34bc9ec9 2019-02-22 stsp scroll_down(struct tog_view *view,
1668 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1669 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1670 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1671 5e224a3e 2019-02-22 stsp pthread_cond_t *need_commits)
1673 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1674 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1675 5e224a3e 2019-02-22 stsp int nscrolled = 0;
1677 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1678 5e224a3e 2019-02-22 stsp return NULL;
1680 5e224a3e 2019-02-22 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1681 5e224a3e 2019-02-22 stsp if (pentry == NULL && !*log_complete) {
1683 08ebd0a9 2019-02-22 stsp * Ask the log thread for required amount of commits
1684 08ebd0a9 2019-02-22 stsp * plus some amount of pre-fetching.
1686 08ebd0a9 2019-02-22 stsp (*commits_needed) += maxscroll + 20;
1687 5e224a3e 2019-02-22 stsp err = trigger_log_thread(0, commits_needed, log_complete,
1688 5e224a3e 2019-02-22 stsp need_commits);
1690 5e224a3e 2019-02-22 stsp return err;
1694 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1695 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1698 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1700 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1701 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1703 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1704 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1706 dd0a52c1 2018-05-20 stsp return err;
1709 cd0acaa7 2018-05-20 stsp static const struct got_error *
1710 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1711 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1712 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1713 8b473291 2019-02-21 stsp struct got_repository *repo)
1715 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1716 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1717 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1719 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1720 15a94983 2018-12-23 stsp if (diff_view == NULL)
1721 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1723 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1724 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1725 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1726 e5a0f69f 2018-08-18 stsp if (err == NULL)
1727 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1728 cd0acaa7 2018-05-20 stsp return err;
1731 80ddbec8 2018-04-29 stsp static const struct got_error *
1732 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1733 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1735 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1737 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1738 941e9f74 2019-05-21 stsp if (parent == NULL)
1739 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1741 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1742 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1743 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1744 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1745 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1746 941e9f74 2019-05-21 stsp s->tree = subtree;
1747 941e9f74 2019-05-21 stsp s->selected = 0;
1748 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1749 941e9f74 2019-05-21 stsp return NULL;
1752 941e9f74 2019-05-21 stsp static const struct got_error *
1753 55cccc34 2020-02-20 stsp tree_view_walk_path(struct tog_tree_view_state *s,
1754 55cccc34 2020-02-20 stsp struct got_object_id *commit_id,
1755 55cccc34 2020-02-20 stsp const char *path, struct got_repository *repo)
1757 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1758 55cccc34 2020-02-20 stsp struct got_tree_object *tree = NULL;
1759 941e9f74 2019-05-21 stsp const char *p;
1760 55cccc34 2020-02-20 stsp char *slash, *subpath = NULL;
1762 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1764 941e9f74 2019-05-21 stsp while (*p) {
1765 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
1766 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1767 56e0773d 2019-11-28 stsp char *te_name;
1769 33cbf02b 2020-01-12 stsp while (p[0] == '/')
1772 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1773 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1774 941e9f74 2019-05-21 stsp if (slash == NULL)
1775 33cbf02b 2020-01-12 stsp te_name = strdup(p);
1777 33cbf02b 2020-01-12 stsp te_name = strndup(p, slash - p);
1778 56e0773d 2019-11-28 stsp if (te_name == NULL) {
1779 56e0773d 2019-11-28 stsp err = got_error_from_errno("strndup");
1782 56e0773d 2019-11-28 stsp te = got_object_tree_find_entry(s->tree, te_name);
1783 56e0773d 2019-11-28 stsp if (te == NULL) {
1784 56e0773d 2019-11-28 stsp err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1785 56e0773d 2019-11-28 stsp free(te_name);
1788 56e0773d 2019-11-28 stsp free(te_name);
1789 56e0773d 2019-11-28 stsp s->selected_entry = te;
1790 56e0773d 2019-11-28 stsp s->selected = got_tree_entry_get_index(te);
1791 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1792 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1794 56e0773d 2019-11-28 stsp if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry))) {
1795 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1796 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1797 67409a31 2019-05-24 stsp s->selected = 0;
1801 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1802 941e9f74 2019-05-21 stsp if (slash)
1803 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1805 941e9f74 2019-05-21 stsp subpath = strdup(path);
1806 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1807 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1811 55cccc34 2020-02-20 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
1816 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1817 941e9f74 2019-05-21 stsp free(tree_id);
1821 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1822 941e9f74 2019-05-21 stsp if (err) {
1823 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1826 941e9f74 2019-05-21 stsp if (slash == NULL)
1828 941e9f74 2019-05-21 stsp free(subpath);
1829 941e9f74 2019-05-21 stsp subpath = NULL;
1830 941e9f74 2019-05-21 stsp p = slash;
1833 941e9f74 2019-05-21 stsp free(subpath);
1834 1a76625f 2018-10-22 stsp return err;
1837 61266923 2020-01-14 stsp static const struct got_error *
1838 55cccc34 2020-02-20 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1839 55cccc34 2020-02-20 stsp struct commit_queue_entry *entry, const char *path,
1840 55cccc34 2020-02-20 stsp struct got_reflist_head *refs, struct got_repository *repo)
1842 55cccc34 2020-02-20 stsp const struct got_error *err = NULL;
1843 55cccc34 2020-02-20 stsp struct got_tree_object *tree;
1844 55cccc34 2020-02-20 stsp struct tog_tree_view_state *s;
1845 55cccc34 2020-02-20 stsp struct tog_view *tree_view;
1847 55cccc34 2020-02-20 stsp err = got_object_open_as_tree(&tree, repo,
1848 55cccc34 2020-02-20 stsp got_object_commit_get_tree_id(entry->commit));
1850 55cccc34 2020-02-20 stsp return err;
1852 55cccc34 2020-02-20 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1853 55cccc34 2020-02-20 stsp if (tree_view == NULL)
1854 55cccc34 2020-02-20 stsp return got_error_from_errno("view_open");
1856 55cccc34 2020-02-20 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1857 55cccc34 2020-02-20 stsp if (err) {
1858 55cccc34 2020-02-20 stsp got_object_tree_close(tree);
1859 55cccc34 2020-02-20 stsp return err;
1861 55cccc34 2020-02-20 stsp s = &tree_view->state.tree;
1863 55cccc34 2020-02-20 stsp *new_view = tree_view;
1865 55cccc34 2020-02-20 stsp if (got_path_is_root_dir(path))
1866 55cccc34 2020-02-20 stsp return NULL;
1868 55cccc34 2020-02-20 stsp return tree_view_walk_path(s, entry->id, path, repo);
1871 55cccc34 2020-02-20 stsp static const struct got_error *
1872 61266923 2020-01-14 stsp block_signals_used_by_main_thread(void)
1874 61266923 2020-01-14 stsp sigset_t sigset;
1875 61266923 2020-01-14 stsp int errcode;
1877 61266923 2020-01-14 stsp if (sigemptyset(&sigset) == -1)
1878 61266923 2020-01-14 stsp return got_error_from_errno("sigemptyset");
1880 61266923 2020-01-14 stsp /* tog handles SIGWINCH and SIGCONT */
1881 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGWINCH) == -1)
1882 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1883 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGCONT) == -1)
1884 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1886 61266923 2020-01-14 stsp /* ncurses handles SIGTSTP */
1887 61266923 2020-01-14 stsp if (sigaddset(&sigset, SIGTSTP) == -1)
1888 61266923 2020-01-14 stsp return got_error_from_errno("sigaddset");
1890 61266923 2020-01-14 stsp errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1891 61266923 2020-01-14 stsp if (errcode)
1892 61266923 2020-01-14 stsp return got_error_set_errno(errcode, "pthread_sigmask");
1894 61266923 2020-01-14 stsp return NULL;
1897 1a76625f 2018-10-22 stsp static void *
1898 1a76625f 2018-10-22 stsp log_thread(void *arg)
1900 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1901 1a76625f 2018-10-22 stsp int errcode = 0;
1902 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1903 1a76625f 2018-10-22 stsp int done = 0;
1905 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
1907 61266923 2020-01-14 stsp return (void *)err;
1909 d264cece 2019-08-12 stsp while (!done && !err && !tog_sigpipe_received) {
1910 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1911 13add988 2019-10-15 stsp a->in_repo_path, a->searching, a->search_next_done,
1912 13add988 2019-10-15 stsp a->regex);
1913 1a76625f 2018-10-22 stsp if (err) {
1914 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1915 1a76625f 2018-10-22 stsp return (void *)err;
1916 1a76625f 2018-10-22 stsp err = NULL;
1918 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1919 1a76625f 2018-10-22 stsp a->commits_needed--;
1921 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1922 3abe8080 2019-04-10 stsp if (errcode) {
1923 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1924 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1926 3abe8080 2019-04-10 stsp } else if (*a->quit)
1928 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1929 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1930 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1931 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1935 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1936 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1937 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1938 1a76625f 2018-10-22 stsp &tog_mutex);
1939 1a76625f 2018-10-22 stsp if (errcode)
1940 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1941 2af4a041 2019-05-11 jcs "pthread_cond_wait");
1944 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1945 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1946 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1947 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1949 3abe8080 2019-04-10 stsp a->log_complete = 1;
1950 1a76625f 2018-10-22 stsp return (void *)err;
1953 1a76625f 2018-10-22 stsp static const struct got_error *
1954 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1956 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1957 1a76625f 2018-10-22 stsp int errcode;
1959 1a76625f 2018-10-22 stsp if (s->thread) {
1960 1a76625f 2018-10-22 stsp s->quit = 1;
1961 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1962 1a76625f 2018-10-22 stsp if (errcode)
1963 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1964 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1965 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1966 1a76625f 2018-10-22 stsp if (errcode)
1967 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1968 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1969 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1970 1a76625f 2018-10-22 stsp if (errcode)
1971 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
1972 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1973 1a76625f 2018-10-22 stsp if (errcode)
1974 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1975 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1976 1a76625f 2018-10-22 stsp s->thread = NULL;
1979 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1980 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1981 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
1983 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1984 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1985 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1988 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1989 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1990 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1993 9343a5fb 2018-06-23 stsp return err;
1996 9343a5fb 2018-06-23 stsp static const struct got_error *
1997 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1999 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
2000 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
2002 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
2003 1a76625f 2018-10-22 stsp free_commits(&s->commits);
2004 1a76625f 2018-10-22 stsp free(s->in_repo_path);
2005 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
2006 1a76625f 2018-10-22 stsp free(s->start_id);
2007 797bc7b9 2018-10-22 stsp s->start_id = NULL;
2008 1a76625f 2018-10-22 stsp return err;
2011 1a76625f 2018-10-22 stsp static const struct got_error *
2012 60493ae3 2019-06-20 stsp search_start_log_view(struct tog_view *view)
2014 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2016 60493ae3 2019-06-20 stsp s->matched_entry = NULL;
2017 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2018 60493ae3 2019-06-20 stsp return NULL;
2021 60493ae3 2019-06-20 stsp static const struct got_error *
2022 60493ae3 2019-06-20 stsp search_next_log_view(struct tog_view *view)
2024 60493ae3 2019-06-20 stsp const struct got_error *err = NULL;
2025 60493ae3 2019-06-20 stsp struct tog_log_view_state *s = &view->state.log;
2026 60493ae3 2019-06-20 stsp struct commit_queue_entry *entry;
2028 60493ae3 2019-06-20 stsp if (!view->searching) {
2029 60493ae3 2019-06-20 stsp view->search_next_done = 1;
2030 60493ae3 2019-06-20 stsp return NULL;
2033 96e2b566 2019-07-08 stsp if (s->search_entry) {
2034 13add988 2019-10-15 stsp int errcode, ch;
2035 13add988 2019-10-15 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2036 13add988 2019-10-15 stsp if (errcode)
2037 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2038 13add988 2019-10-15 stsp "pthread_mutex_unlock");
2039 13add988 2019-10-15 stsp ch = wgetch(view->window);
2040 13add988 2019-10-15 stsp errcode = pthread_mutex_lock(&tog_mutex);
2041 13add988 2019-10-15 stsp if (errcode)
2042 13add988 2019-10-15 stsp return got_error_set_errno(errcode,
2043 13add988 2019-10-15 stsp "pthread_mutex_lock");
2044 13add988 2019-10-15 stsp if (ch == KEY_BACKSPACE) {
2045 678cbce5 2019-07-28 stsp view->search_next_done = 1;
2046 678cbce5 2019-07-28 stsp return NULL;
2048 96e2b566 2019-07-08 stsp if (view->searching == TOG_SEARCH_FORWARD)
2049 96e2b566 2019-07-08 stsp entry = TAILQ_NEXT(s->search_entry, entry);
2051 96e2b566 2019-07-08 stsp entry = TAILQ_PREV(s->search_entry,
2052 96e2b566 2019-07-08 stsp commit_queue_head, entry);
2053 96e2b566 2019-07-08 stsp } else if (s->matched_entry) {
2054 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2055 b55df7bc 2019-06-21 stsp entry = TAILQ_NEXT(s->selected_entry, entry);
2057 b55df7bc 2019-06-21 stsp entry = TAILQ_PREV(s->selected_entry,
2058 b1bf1435 2019-06-21 stsp commit_queue_head, entry);
2060 20be8d96 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2061 20be8d96 2019-06-21 stsp entry = TAILQ_FIRST(&s->commits.head);
2063 20be8d96 2019-06-21 stsp entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2066 60493ae3 2019-06-20 stsp while (1) {
2067 13add988 2019-10-15 stsp int have_match = 0;
2069 60493ae3 2019-06-20 stsp if (entry == NULL) {
2070 f801134a 2019-06-25 stsp if (s->thread_args.log_complete ||
2071 f801134a 2019-06-25 stsp view->searching == TOG_SEARCH_BACKWARD) {
2072 f801134a 2019-06-25 stsp view->search_next_done = 1;
2073 f801134a 2019-06-25 stsp return NULL;
2076 96e2b566 2019-07-08 stsp * Poke the log thread for more commits and return,
2077 96e2b566 2019-07-08 stsp * allowing the main loop to make progress. Search
2078 96e2b566 2019-07-08 stsp * will resume at s->search_entry once we come back.
2080 57b33b64 2019-07-08 stsp s->thread_args.commits_needed++;
2081 57b33b64 2019-07-08 stsp return trigger_log_thread(1,
2082 f801134a 2019-06-25 stsp &s->thread_args.commits_needed,
2083 f801134a 2019-06-25 stsp &s->thread_args.log_complete,
2084 f801134a 2019-06-25 stsp &s->thread_args.need_commits);
2087 13add988 2019-10-15 stsp err = match_commit(&have_match, entry->id, entry->commit,
2088 13add988 2019-10-15 stsp &view->regex);
2091 13add988 2019-10-15 stsp if (have_match) {
2092 60493ae3 2019-06-20 stsp view->search_next_done = 1;
2093 bcf2df4d 2019-06-21 stsp s->matched_entry = entry;
2097 96e2b566 2019-07-08 stsp s->search_entry = entry;
2098 b1bf1435 2019-06-21 stsp if (view->searching == TOG_SEARCH_FORWARD)
2099 b1bf1435 2019-06-21 stsp entry = TAILQ_NEXT(entry, entry);
2101 b1bf1435 2019-06-21 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
2104 bcf2df4d 2019-06-21 stsp if (s->matched_entry) {
2105 ead14cbe 2019-06-21 stsp int cur = s->selected_entry->idx;
2106 ead14cbe 2019-06-21 stsp while (cur < s->matched_entry->idx) {
2107 60493ae3 2019-06-20 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2109 60493ae3 2019-06-20 stsp return err;
2112 ead14cbe 2019-06-21 stsp while (cur > s->matched_entry->idx) {
2113 ead14cbe 2019-06-21 stsp err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2115 60493ae3 2019-06-20 stsp return err;
2120 96e2b566 2019-07-08 stsp s->search_entry = NULL;
2122 60493ae3 2019-06-20 stsp return NULL;
2125 60493ae3 2019-06-20 stsp static const struct got_error *
2126 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
2127 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
2128 f135c941 2020-02-20 stsp const char *head_ref_name, const char *in_repo_path,
2129 b672a97a 2020-01-27 stsp int log_branches)
2131 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
2132 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2133 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
2134 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
2135 1a76625f 2018-10-22 stsp int errcode;
2137 f135c941 2020-02-20 stsp if (in_repo_path != s->in_repo_path) {
2138 f135c941 2020-02-20 stsp free(s->in_repo_path);
2139 f135c941 2020-02-20 stsp s->in_repo_path = strdup(in_repo_path);
2140 f135c941 2020-02-20 stsp if (s->in_repo_path == NULL)
2141 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2144 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
2145 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
2146 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
2148 8b473291 2019-02-21 stsp s->refs = refs;
2149 fb2756b9 2018-08-04 stsp s->repo = repo;
2150 d01904d4 2019-06-25 stsp s->head_ref_name = head_ref_name;
2151 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
2152 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
2153 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2154 5036bf37 2018-09-24 stsp goto done;
2156 b672a97a 2020-01-27 stsp s->log_branches = log_branches;
2158 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
2159 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
2160 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2161 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
2163 11b20872 2019-11-08 stsp goto done;
2164 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2165 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
2166 11b20872 2019-11-08 stsp if (err) {
2167 11b20872 2019-11-08 stsp free_colors(&s->colors);
2168 11b20872 2019-11-08 stsp goto done;
2170 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2171 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
2172 11b20872 2019-11-08 stsp if (err) {
2173 11b20872 2019-11-08 stsp free_colors(&s->colors);
2174 11b20872 2019-11-08 stsp goto done;
2178 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
2179 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
2180 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
2181 60493ae3 2019-06-20 stsp view->search_start = search_start_log_view;
2182 60493ae3 2019-06-20 stsp view->search_next = search_next_log_view;
2184 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2186 1a76625f 2018-10-22 stsp goto done;
2187 b672a97a 2020-01-27 stsp err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2188 b672a97a 2020-01-27 stsp !s->log_branches);
2190 1a76625f 2018-10-22 stsp goto done;
2191 c5b78334 2020-01-12 stsp err = got_commit_graph_iter_start(thread_graph,
2192 c5b78334 2020-01-12 stsp s->start_id, s->repo, NULL, NULL);
2194 c5b78334 2020-01-12 stsp goto done;
2196 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2197 1a76625f 2018-10-22 stsp if (errcode) {
2198 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
2199 1a76625f 2018-10-22 stsp goto done;
2202 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
2203 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
2204 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
2205 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
2206 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
2207 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
2208 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
2209 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
2210 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2211 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
2212 13add988 2019-10-15 stsp s->thread_args.searching = &view->searching;
2213 13add988 2019-10-15 stsp s->thread_args.search_next_done = &view->search_next_done;
2214 13add988 2019-10-15 stsp s->thread_args.regex = &view->regex;
2217 1a76625f 2018-10-22 stsp close_log_view(view);
2218 ba4f502b 2018-08-04 stsp return err;
2221 e5a0f69f 2018-08-18 stsp static const struct got_error *
2222 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
2224 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
2226 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
2227 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
2228 2b380cc8 2018-10-24 stsp &s->thread_args);
2229 2b380cc8 2018-10-24 stsp if (errcode)
2230 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
2233 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
2234 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
2235 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
2236 11b20872 2019-11-08 stsp s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2239 e5a0f69f 2018-08-18 stsp static const struct got_error *
2240 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2241 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2243 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2244 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
2245 d01904d4 2019-06-25 stsp char *parent_path, *in_repo_path = NULL;
2246 d01904d4 2019-06-25 stsp struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2247 669b5ffa 2018-10-07 stsp int begin_x = 0;
2248 d01904d4 2019-06-25 stsp struct got_object_id *start_id;
2250 e5a0f69f 2018-08-18 stsp switch (ch) {
2252 1e37a5c2 2019-05-12 jcs s->quit = 1;
2255 1e37a5c2 2019-05-12 jcs case KEY_UP:
2258 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2260 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
2261 1e37a5c2 2019-05-12 jcs s->selected--;
2263 1144d21a 2019-06-21 stsp scroll_up(view, &s->first_displayed_entry, 1,
2264 1144d21a 2019-06-21 stsp &s->commits);
2266 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2267 a4292ac5 2019-05-12 jcs case CTRL('b'):
2268 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2270 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
2271 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
2272 1e37a5c2 2019-05-12 jcs s->selected = 0;
2275 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
2276 1e37a5c2 2019-05-12 jcs view->nlines, &s->commits);
2279 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2282 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
2284 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
2285 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2286 1e37a5c2 2019-05-12 jcs s->selected++;
2289 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
2290 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
2291 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
2292 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2293 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
2295 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
2296 a4292ac5 2019-05-12 jcs case CTRL('f'): {
2297 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
2298 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
2299 1e37a5c2 2019-05-12 jcs if (first == NULL)
2301 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
2302 1e37a5c2 2019-05-12 jcs view->nlines, &s->last_displayed_entry,
2303 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
2304 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
2305 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
2308 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
2309 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
2310 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
2311 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
2312 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
2313 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
2315 1e37a5c2 2019-05-12 jcs err = NULL;
2318 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
2319 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
2320 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
2321 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
2322 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
2324 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
2327 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2329 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2330 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2331 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
2332 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
2333 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
2336 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2337 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2339 1e37a5c2 2019-05-12 jcs return err;
2340 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
2342 1e37a5c2 2019-05-12 jcs view_close(diff_view);
2345 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
2346 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2348 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
2351 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
2353 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2354 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
2355 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
2356 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
2359 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
2360 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
2362 1e37a5c2 2019-05-12 jcs return err;
2363 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
2365 1e37a5c2 2019-05-12 jcs view_close(tree_view);
2368 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
2369 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
2371 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
2373 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
2374 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
2376 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
2377 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
2378 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
2380 1e37a5c2 2019-05-12 jcs return err;
2381 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
2382 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
2383 1e37a5c2 2019-05-12 jcs if (lv == NULL)
2384 638f9024 2019-05-13 stsp return got_error_from_errno(
2385 1e37a5c2 2019-05-12 jcs "view_open");
2386 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
2387 f135c941 2020-02-20 stsp s->repo, s->head_ref_name, parent_path,
2388 b672a97a 2020-01-27 stsp s->log_branches);
2390 1e37a5c2 2019-05-12 jcs return err;;
2391 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
2392 1e37a5c2 2019-05-12 jcs *new_view = lv;
2394 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
2395 1e37a5c2 2019-05-12 jcs *focus_view = lv;
2397 1e37a5c2 2019-05-12 jcs return NULL;
2400 e3d2a5c6 2019-06-26 stsp case CTRL('l'):
2401 d01904d4 2019-06-25 stsp err = stop_log_thread(s);
2403 d01904d4 2019-06-25 stsp return err;
2404 d01904d4 2019-06-25 stsp lv = view_open(view->nlines, view->ncols,
2405 d01904d4 2019-06-25 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2406 d01904d4 2019-06-25 stsp if (lv == NULL)
2407 d01904d4 2019-06-25 stsp return got_error_from_errno("view_open");
2408 71a27632 2020-01-15 stsp err = got_repo_match_object_id(&start_id, NULL,
2409 71a27632 2020-01-15 stsp s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2410 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2411 ef129c5e 2019-08-03 stsp if (err) {
2412 ef129c5e 2019-08-03 stsp view_close(lv);
2413 d01904d4 2019-06-25 stsp return err;
2415 d01904d4 2019-06-25 stsp in_repo_path = strdup(s->in_repo_path);
2416 d01904d4 2019-06-25 stsp if (in_repo_path == NULL) {
2417 e6b23735 2019-10-04 stsp free(start_id);
2418 e6b23735 2019-10-04 stsp view_close(lv);
2419 e6b23735 2019-10-04 stsp return got_error_from_errno("strdup");
2421 e6b23735 2019-10-04 stsp got_ref_list_free(s->refs);
2422 e6b23735 2019-10-04 stsp err = got_ref_list(s->refs, s->repo, NULL,
2423 e6b23735 2019-10-04 stsp got_ref_cmp_by_name, NULL);
2424 e6b23735 2019-10-04 stsp if (err) {
2425 d01904d4 2019-06-25 stsp free(start_id);
2426 ef129c5e 2019-08-03 stsp view_close(lv);
2427 50284065 2019-10-04 stsp return err;
2429 d01904d4 2019-06-25 stsp err = open_log_view(lv, start_id, s->refs, s->repo,
2430 f135c941 2020-02-20 stsp s->head_ref_name, in_repo_path, s->log_branches);
2431 ef129c5e 2019-08-03 stsp if (err) {
2432 ef129c5e 2019-08-03 stsp free(start_id);
2433 b672a97a 2020-01-27 stsp view_close(lv);
2434 b672a97a 2020-01-27 stsp return err;;
2436 b672a97a 2020-01-27 stsp *dead_view = view;
2437 b672a97a 2020-01-27 stsp *new_view = lv;
2440 b672a97a 2020-01-27 stsp s->log_branches = !s->log_branches;
2441 b672a97a 2020-01-27 stsp err = stop_log_thread(s);
2443 b672a97a 2020-01-27 stsp return err;
2444 b672a97a 2020-01-27 stsp lv = view_open(view->nlines, view->ncols,
2445 b672a97a 2020-01-27 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
2446 b672a97a 2020-01-27 stsp if (lv == NULL)
2447 b672a97a 2020-01-27 stsp return got_error_from_errno("view_open");
2448 b672a97a 2020-01-27 stsp err = open_log_view(lv, s->start_id, s->refs, s->repo,
2449 f135c941 2020-02-20 stsp s->head_ref_name, s->in_repo_path, s->log_branches);
2450 b672a97a 2020-01-27 stsp if (err) {
2451 ef129c5e 2019-08-03 stsp view_close(lv);
2452 d01904d4 2019-06-25 stsp return err;;
2454 d01904d4 2019-06-25 stsp *dead_view = view;
2455 d01904d4 2019-06-25 stsp *new_view = lv;
2461 80ddbec8 2018-04-29 stsp return err;
2464 4ed7e80c 2018-05-20 stsp static const struct got_error *
2465 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
2467 c2db6724 2019-01-04 stsp const struct got_error *error;
2469 37c06ea4 2019-07-15 stsp #ifdef PROFILE
2470 37c06ea4 2019-07-15 stsp if (unveil("gmon.out", "rwc") != 0)
2471 37c06ea4 2019-07-15 stsp return got_error_from_errno2("unveil", "gmon.out");
2473 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
2474 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
2476 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
2477 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
2479 bb63914a 2020-02-17 stsp if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2480 bb63914a 2020-02-17 stsp return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2482 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
2483 c2db6724 2019-01-04 stsp if (error != NULL)
2484 c2db6724 2019-01-04 stsp return error;
2486 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
2487 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
2489 c2db6724 2019-01-04 stsp return NULL;
2492 a915003a 2019-02-05 stsp static void
2493 a915003a 2019-02-05 stsp init_curses(void)
2495 a915003a 2019-02-05 stsp initscr();
2497 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
2500 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
2501 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
2502 a915003a 2019-02-05 stsp curs_set(0);
2503 6d17833f 2019-11-08 stsp if (getenv("TOG_COLORS") != NULL) {
2504 6d17833f 2019-11-08 stsp start_color();
2505 6d17833f 2019-11-08 stsp use_default_colors();
2507 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
2508 83baff54 2019-08-12 stsp signal(SIGPIPE, tog_sigpipe);
2509 61266923 2020-01-14 stsp signal(SIGCONT, tog_sigcont);
2512 c2db6724 2019-01-04 stsp static const struct got_error *
2513 f135c941 2020-02-20 stsp get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2514 f135c941 2020-02-20 stsp struct got_repository *repo, struct got_worktree *worktree)
2516 f135c941 2020-02-20 stsp const struct got_error *err = NULL;
2518 f135c941 2020-02-20 stsp if (argc == 0) {
2519 f135c941 2020-02-20 stsp *in_repo_path = strdup("/");
2520 f135c941 2020-02-20 stsp if (*in_repo_path == NULL)
2521 f135c941 2020-02-20 stsp return got_error_from_errno("strdup");
2522 f135c941 2020-02-20 stsp return NULL;
2525 f135c941 2020-02-20 stsp if (worktree) {
2526 f135c941 2020-02-20 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
2527 f135c941 2020-02-20 stsp char *wt_path, *p;
2529 f135c941 2020-02-20 stsp err = got_worktree_resolve_path(&wt_path, worktree, argv[0]);
2531 f135c941 2020-02-20 stsp return err;
2533 f135c941 2020-02-20 stsp if (asprintf(&p, "%s%s%s", prefix,
2534 f135c941 2020-02-20 stsp (strcmp(prefix, "/") != 0) ? "/" : "", wt_path) == -1) {
2535 f135c941 2020-02-20 stsp err = got_error_from_errno("asprintf");
2536 f135c941 2020-02-20 stsp free(wt_path);
2537 f135c941 2020-02-20 stsp return err;
2539 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, p, 0);
2541 f135c941 2020-02-20 stsp free(wt_path);
2543 f135c941 2020-02-20 stsp err = got_repo_map_path(in_repo_path, repo, argv[0], 1);
2545 f135c941 2020-02-20 stsp return err;
2548 f135c941 2020-02-20 stsp static const struct got_error *
2549 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
2551 80ddbec8 2018-04-29 stsp const struct got_error *error;
2552 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
2553 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
2554 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2555 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
2556 f135c941 2020-02-20 stsp char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2557 2fc00ff4 2019-08-31 stsp char *start_commit = NULL, *head_ref_name = NULL;
2558 f135c941 2020-02-20 stsp int ch, log_branches = 0;
2559 04cc582a 2018-08-01 stsp struct tog_view *view;
2561 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2563 80ddbec8 2018-04-29 stsp #ifndef PROFILE
2564 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2565 c2db6724 2019-01-04 stsp NULL) == -1)
2566 80ddbec8 2018-04-29 stsp err(1, "pledge");
2569 b672a97a 2020-01-27 stsp while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2570 80ddbec8 2018-04-29 stsp switch (ch) {
2572 b672a97a 2020-01-27 stsp log_branches = 1;
2575 80ddbec8 2018-04-29 stsp start_commit = optarg;
2578 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
2579 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
2580 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
2584 17020d27 2019-03-07 stsp usage_log();
2585 80ddbec8 2018-04-29 stsp /* NOTREACHED */
2589 80ddbec8 2018-04-29 stsp argc -= optind;
2590 80ddbec8 2018-04-29 stsp argv += optind;
2592 f135c941 2020-02-20 stsp if (argc > 1)
2593 f135c941 2020-02-20 stsp usage_log();
2595 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
2596 6962eb72 2020-02-20 stsp if (cwd == NULL)
2597 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
2599 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
2600 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
2601 963f97a1 2019-03-18 stsp goto done;
2603 a1fbf39a 2019-08-11 stsp if (repo_path == NULL) {
2604 a1fbf39a 2019-08-11 stsp if (worktree)
2605 6962eb72 2020-02-20 stsp repo_path =
2606 6962eb72 2020-02-20 stsp strdup(got_worktree_get_repo_path(worktree));
2608 a1fbf39a 2019-08-11 stsp repo_path = strdup(cwd);
2610 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
2611 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
2612 963f97a1 2019-03-18 stsp goto done;
2615 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
2616 80ddbec8 2018-04-29 stsp if (error != NULL)
2617 ecb28ae0 2018-07-16 stsp goto done;
2619 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2620 f135c941 2020-02-20 stsp repo, worktree);
2621 f135c941 2020-02-20 stsp if (error)
2622 f135c941 2020-02-20 stsp goto done;
2624 f135c941 2020-02-20 stsp init_curses();
2626 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
2627 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
2628 c02c541e 2019-03-29 stsp if (error)
2629 c02c541e 2019-03-29 stsp goto done;
2631 15a94983 2018-12-23 stsp if (start_commit == NULL)
2632 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, worktree ?
2633 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2634 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2636 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&start_id, NULL, start_commit,
2637 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
2638 80ddbec8 2018-04-29 stsp if (error != NULL)
2639 8b473291 2019-02-21 stsp goto done;
2641 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2642 8b473291 2019-02-21 stsp if (error)
2643 ecb28ae0 2018-07-16 stsp goto done;
2645 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2646 04cc582a 2018-08-01 stsp if (view == NULL) {
2647 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2648 04cc582a 2018-08-01 stsp goto done;
2650 2fc00ff4 2019-08-31 stsp if (worktree) {
2651 2fc00ff4 2019-08-31 stsp head_ref_name = strdup(
2652 2fc00ff4 2019-08-31 stsp got_worktree_get_head_ref_name(worktree));
2653 2fc00ff4 2019-08-31 stsp if (head_ref_name == NULL) {
2654 2fc00ff4 2019-08-31 stsp error = got_error_from_errno("strdup");
2655 2fc00ff4 2019-08-31 stsp goto done;
2658 2fc00ff4 2019-08-31 stsp error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2659 f135c941 2020-02-20 stsp in_repo_path, log_branches);
2660 ba4f502b 2018-08-04 stsp if (error)
2661 ba4f502b 2018-08-04 stsp goto done;
2662 2fc00ff4 2019-08-31 stsp if (worktree) {
2663 2fc00ff4 2019-08-31 stsp /* Release work tree lock. */
2664 2fc00ff4 2019-08-31 stsp got_worktree_close(worktree);
2665 2fc00ff4 2019-08-31 stsp worktree = NULL;
2667 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2669 f135c941 2020-02-20 stsp free(in_repo_path);
2670 ecb28ae0 2018-07-16 stsp free(repo_path);
2671 ecb28ae0 2018-07-16 stsp free(cwd);
2672 899d86c2 2018-05-10 stsp free(start_id);
2673 2fc00ff4 2019-08-31 stsp free(head_ref_name);
2675 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2676 ec142235 2019-03-07 stsp if (worktree)
2677 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2678 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2679 80ddbec8 2018-04-29 stsp return error;
2682 4ed7e80c 2018-05-20 stsp __dead static void
2683 9f7d7167 2018-04-29 stsp usage_diff(void)
2686 09b5bff8 2020-02-23 naddy fprintf(stderr, "usage: %s diff [-r repository-path] object1 object2\n",
2687 9f7d7167 2018-04-29 stsp getprogname());
2691 b304db33 2018-05-20 stsp static char *
2692 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2694 b304db33 2018-05-20 stsp char *line;
2695 b304db33 2018-05-20 stsp size_t linelen;
2696 b304db33 2018-05-20 stsp size_t lineno;
2697 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2699 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2701 b304db33 2018-05-20 stsp *len = linelen;
2702 b304db33 2018-05-20 stsp return line;
2705 6d17833f 2019-11-08 stsp static int
2706 6d17833f 2019-11-08 stsp match_line(const char *line, regex_t *regex)
2708 6d17833f 2019-11-08 stsp regmatch_t regmatch;
2710 6d17833f 2019-11-08 stsp return regexec(regex, line, 1, ®match, 0) == 0;
2713 f26dddb7 2019-11-08 stsp struct tog_color *
2714 bddb1296 2019-11-08 stsp match_color(struct tog_colors *colors, const char *line)
2716 f26dddb7 2019-11-08 stsp struct tog_color *tc = NULL;
2718 6d17833f 2019-11-08 stsp SIMPLEQ_FOREACH(tc, colors, entry) {
2719 6d17833f 2019-11-08 stsp if (match_line(line, &tc->regex))
2720 6d17833f 2019-11-08 stsp return tc;
2723 6d17833f 2019-11-08 stsp return NULL;
2726 4ed7e80c 2018-05-20 stsp static const struct got_error *
2727 f44b1f58 2020-02-02 tracey draw_file(struct tog_view *view, FILE *f, int *first_displayed_line, int nlines,
2728 f44b1f58 2020-02-02 tracey int selected_line, int max_lines, int *last_displayed_line, int *eof,
2729 f44b1f58 2020-02-02 tracey char *header, struct tog_colors *colors)
2731 61e69b96 2018-05-20 stsp const struct got_error *err;
2732 f44b1f58 2020-02-02 tracey int lineno = 0, nprinted = 0;
2733 b304db33 2018-05-20 stsp char *line;
2734 f26dddb7 2019-11-08 stsp struct tog_color *tc;
2735 b304db33 2018-05-20 stsp size_t len;
2736 61e69b96 2018-05-20 stsp wchar_t *wline;
2737 e0b650dd 2018-05-20 stsp int width;
2739 26ed57b2 2018-05-19 stsp rewind(f);
2740 f7d12f7e 2018-08-01 stsp werase(view->window);
2742 a3404814 2018-09-02 stsp if (header) {
2743 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, header, view->ncols, 0);
2744 a3404814 2018-09-02 stsp if (err) {
2745 a3404814 2018-09-02 stsp return err;
2748 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2749 a3404814 2018-09-02 stsp wstandout(view->window);
2750 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2751 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2752 a3404814 2018-09-02 stsp wstandend(view->window);
2753 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2754 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2756 a3404814 2018-09-02 stsp if (max_lines <= 1)
2757 a3404814 2018-09-02 stsp return NULL;
2758 a3404814 2018-09-02 stsp max_lines--;
2762 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2763 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2764 26ed57b2 2018-05-19 stsp if (line == NULL) {
2768 f44b1f58 2020-02-02 tracey if (++lineno < *first_displayed_line) {
2769 26ed57b2 2018-05-19 stsp free(line);
2773 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
2774 61e69b96 2018-05-20 stsp if (err) {
2775 61e69b96 2018-05-20 stsp free(line);
2776 61e69b96 2018-05-20 stsp return err;
2779 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
2781 f26dddb7 2019-11-08 stsp wattr_on(view->window,
2782 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2783 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2785 6d17833f 2019-11-08 stsp wattr_off(view->window,
2786 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
2787 239f6369 2019-09-08 stsp if (width <= view->ncols - 1)
2788 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2789 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2790 f44b1f58 2020-02-02 tracey *first_displayed_line = lineno;
2791 26ed57b2 2018-05-19 stsp free(line);
2792 2550e4c3 2018-07-13 stsp free(wline);
2793 2550e4c3 2018-07-13 stsp wline = NULL;
2795 f44b1f58 2020-02-02 tracey *last_displayed_line = lineno;
2797 1a57306a 2018-09-02 stsp view_vborder(view);
2799 c3e9aa98 2019-05-13 jcs if (*eof) {
2800 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2801 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2802 c3e9aa98 2019-05-13 jcs nprinted++;
2805 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2807 c3e9aa98 2019-05-13 jcs return err;
2810 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2811 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2812 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2815 26ed57b2 2018-05-19 stsp return NULL;
2818 abd2672a 2018-12-23 stsp static char *
2819 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2821 09867e48 2019-08-13 stsp struct tm mytm, *tm;
2822 09867e48 2019-08-13 stsp char *p, *s;
2824 09867e48 2019-08-13 stsp tm = gmtime_r(time, &mytm);
2825 09867e48 2019-08-13 stsp if (tm == NULL)
2826 09867e48 2019-08-13 stsp return NULL;
2827 09867e48 2019-08-13 stsp s = asctime_r(tm, datebuf);
2828 09867e48 2019-08-13 stsp if (s == NULL)
2829 09867e48 2019-08-13 stsp return NULL;
2830 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2832 abd2672a 2018-12-23 stsp *p = '\0';
2836 4ed7e80c 2018-05-20 stsp static const struct got_error *
2837 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2838 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2840 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2841 09867e48 2019-08-13 stsp char datebuf[26], *datestr;
2842 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2843 5943eee2 2019-08-13 stsp char *id_str = NULL, *logmsg = NULL;
2844 45d799e2 2018-12-23 stsp time_t committer_time;
2845 45d799e2 2018-12-23 stsp const char *author, *committer;
2846 8b473291 2019-02-21 stsp char *refs_str = NULL;
2848 8b473291 2019-02-21 stsp if (refs) {
2849 52b5abe1 2019-08-13 stsp err = build_refs_str(&refs_str, refs, commit_id, repo);
2851 8b473291 2019-02-21 stsp return err;
2854 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2856 abd2672a 2018-12-23 stsp return err;
2858 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2859 15a94983 2018-12-23 stsp if (err) {
2860 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2861 15a94983 2018-12-23 stsp goto done;
2864 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2865 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2866 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2867 abd2672a 2018-12-23 stsp goto done;
2869 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2870 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2871 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2872 abd2672a 2018-12-23 stsp goto done;
2874 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2875 09867e48 2019-08-13 stsp datestr = get_datestr(&committer_time, datebuf);
2876 09867e48 2019-08-13 stsp if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2877 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2878 abd2672a 2018-12-23 stsp goto done;
2880 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2881 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2882 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2883 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2884 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2885 abd2672a 2018-12-23 stsp goto done;
2887 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, commit);
2889 5943eee2 2019-08-13 stsp goto done;
2890 5943eee2 2019-08-13 stsp if (fprintf(outfile, "%s\n", logmsg) < 0) {
2891 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2892 abd2672a 2018-12-23 stsp goto done;
2895 abd2672a 2018-12-23 stsp free(id_str);
2896 5943eee2 2019-08-13 stsp free(logmsg);
2897 8b473291 2019-02-21 stsp free(refs_str);
2898 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2899 abd2672a 2018-12-23 stsp return err;
2902 f44b1f58 2020-02-02 tracey const struct got_error *
2903 f44b1f58 2020-02-02 tracey get_filestream_info(size_t *filesize, int *nlines, off_t **line_offsets,
2904 f44b1f58 2020-02-02 tracey FILE *infile)
2906 f44b1f58 2020-02-02 tracey size_t len;
2907 f44b1f58 2020-02-02 tracey char *buf = NULL;
2909 f44b1f58 2020-02-02 tracey size_t noffsets = 0;
2910 f44b1f58 2020-02-02 tracey off_t off = 0;
2912 f44b1f58 2020-02-02 tracey if (line_offsets)
2913 f44b1f58 2020-02-02 tracey *line_offsets = NULL;
2914 f44b1f58 2020-02-02 tracey if (filesize)
2915 f44b1f58 2020-02-02 tracey *filesize = 0;
2916 f44b1f58 2020-02-02 tracey if (nlines)
2917 f44b1f58 2020-02-02 tracey *nlines = 0;
2919 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_END) == -1)
2920 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
2921 f44b1f58 2020-02-02 tracey len = ftell(infile) + 1;
2922 f44b1f58 2020-02-02 tracey if (ferror(infile))
2923 f44b1f58 2020-02-02 tracey return got_error_from_errno("ftell");
2924 f44b1f58 2020-02-02 tracey if (fseek(infile, 0, SEEK_SET) == -1)
2925 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseek");
2927 f44b1f58 2020-02-02 tracey if (len == 0)
2928 f44b1f58 2020-02-02 tracey return NULL;
2929 f44b1f58 2020-02-02 tracey if ((buf = calloc(len, sizeof(char *))) == NULL)
2930 f44b1f58 2020-02-02 tracey return got_error_from_errno("calloc");
2932 f44b1f58 2020-02-02 tracey fread(buf, 1, len, infile);
2933 f44b1f58 2020-02-02 tracey if (ferror(infile))
2934 f44b1f58 2020-02-02 tracey return got_error_from_errno("fread");
2937 f44b1f58 2020-02-02 tracey if (line_offsets && nlines) {
2938 f44b1f58 2020-02-02 tracey if (*line_offsets == NULL) {
2939 f44b1f58 2020-02-02 tracey /* Have some data but perhaps no '\n'. */
2940 f44b1f58 2020-02-02 tracey noffsets = 1;
2941 f44b1f58 2020-02-02 tracey *nlines = 1;
2942 f44b1f58 2020-02-02 tracey *line_offsets = calloc(1, sizeof(**line_offsets));
2943 f44b1f58 2020-02-02 tracey if (*line_offsets == NULL)
2944 f44b1f58 2020-02-02 tracey return got_error_from_errno("calloc");
2945 f44b1f58 2020-02-02 tracey /* Skip forward over end of first line. */
2946 f44b1f58 2020-02-02 tracey while (i < len) {
2947 f44b1f58 2020-02-02 tracey if (buf[i] == '\n')
2952 f44b1f58 2020-02-02 tracey /* Scan '\n' offsets in remaining chunk of data. */
2953 f44b1f58 2020-02-02 tracey while (i < len) {
2954 f44b1f58 2020-02-02 tracey if (buf[i] != '\n') {
2956 f44b1f58 2020-02-02 tracey continue;
2958 f44b1f58 2020-02-02 tracey (*nlines)++;
2959 f44b1f58 2020-02-02 tracey if (noffsets < *nlines) {
2960 f44b1f58 2020-02-02 tracey off_t *o = recallocarray(*line_offsets,
2961 f44b1f58 2020-02-02 tracey noffsets, *nlines,
2962 f44b1f58 2020-02-02 tracey sizeof(**line_offsets));
2963 f44b1f58 2020-02-02 tracey if (o == NULL) {
2964 f44b1f58 2020-02-02 tracey free(*line_offsets);
2965 f44b1f58 2020-02-02 tracey *line_offsets = NULL;
2966 f44b1f58 2020-02-02 tracey return got_error_from_errno(
2967 f44b1f58 2020-02-02 tracey "recallocarray");
2969 f44b1f58 2020-02-02 tracey *line_offsets = o;
2970 f44b1f58 2020-02-02 tracey noffsets = *nlines;
2972 f44b1f58 2020-02-02 tracey off = i + 1;
2973 f44b1f58 2020-02-02 tracey (*line_offsets)[*nlines - 1] = off;
2978 f44b1f58 2020-02-02 tracey if (fflush(infile) != 0)
2979 f44b1f58 2020-02-02 tracey return got_error_from_errno("fflush");
2980 f44b1f58 2020-02-02 tracey rewind(infile);
2982 f44b1f58 2020-02-02 tracey if (filesize)
2983 f44b1f58 2020-02-02 tracey *filesize = len;
2985 f44b1f58 2020-02-02 tracey return NULL;
2988 abd2672a 2018-12-23 stsp static const struct got_error *
2989 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
2991 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
2992 48ae06ee 2018-10-18 stsp FILE *f = NULL;
2993 15a94983 2018-12-23 stsp int obj_type;
2995 511a516b 2018-05-19 stsp f = got_opentemp();
2996 48ae06ee 2018-10-18 stsp if (f == NULL) {
2997 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
2998 48ae06ee 2018-10-18 stsp goto done;
3000 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
3001 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3002 fb43ecf1 2019-02-11 stsp goto done;
3006 15a94983 2018-12-23 stsp if (s->id1)
3007 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
3009 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
3011 15a94983 2018-12-23 stsp goto done;
3013 15a94983 2018-12-23 stsp switch (obj_type) {
3014 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
3015 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
3016 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3018 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
3019 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
3020 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3022 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
3023 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
3024 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
3025 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
3027 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3029 3ffacbe1 2020-02-02 tracey goto done;
3030 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
3031 f44b1f58 2020-02-02 tracey if (s->id1 == NULL) {
3032 f44b1f58 2020-02-02 tracey err =write_commit_info(s->id2, s->refs, s->repo, s->f);
3033 f44b1f58 2020-02-02 tracey if (err)
3034 f44b1f58 2020-02-02 tracey goto done;
3035 f44b1f58 2020-02-02 tracey } else {
3036 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
3037 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3038 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
3039 f44b1f58 2020-02-02 tracey err = write_commit_info(s->id2, s->refs,
3040 f44b1f58 2020-02-02 tracey s->repo, s->f);
3041 f44b1f58 2020-02-02 tracey if (err)
3042 f44b1f58 2020-02-02 tracey goto done;
3047 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
3049 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
3050 f44b1f58 2020-02-02 tracey s->diff_context, 0, s->repo, s->f);
3054 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3057 f44b1f58 2020-02-02 tracey if (err)
3058 f44b1f58 2020-02-02 tracey goto done;
3059 f44b1f58 2020-02-02 tracey err = get_filestream_info(&s->filesize, &s->nlines, &s->line_offsets,
3062 f44b1f58 2020-02-02 tracey if (s->f && fflush(s->f) != 0 && err == NULL)
3063 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
3064 48ae06ee 2018-10-18 stsp return err;
3067 f5215bb9 2019-02-22 stsp static void
3068 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
3070 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
3071 f5215bb9 2019-02-22 stsp update_panels();
3072 f5215bb9 2019-02-22 stsp doupdate();
3075 f44b1f58 2020-02-02 tracey static const struct got_error *
3076 f44b1f58 2020-02-02 tracey search_start_diff_view(struct tog_view *view)
3078 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3080 f44b1f58 2020-02-02 tracey s->matched_line = 0;
3081 f44b1f58 2020-02-02 tracey return NULL;
3084 f44b1f58 2020-02-02 tracey static const struct got_error *
3085 f44b1f58 2020-02-02 tracey search_next_diff_view(struct tog_view *view)
3087 f44b1f58 2020-02-02 tracey struct tog_diff_view_state *s = &view->state.diff;
3088 f44b1f58 2020-02-02 tracey int lineno;
3090 f44b1f58 2020-02-02 tracey if (!view->searching) {
3091 f44b1f58 2020-02-02 tracey view->search_next_done = 1;
3092 f44b1f58 2020-02-02 tracey return NULL;
3095 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3096 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3097 f44b1f58 2020-02-02 tracey lineno = s->matched_line + 1;
3099 f44b1f58 2020-02-02 tracey lineno = s->matched_line - 1;
3100 f44b1f58 2020-02-02 tracey } else {
3101 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3102 f44b1f58 2020-02-02 tracey lineno = 1;
3104 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3107 f44b1f58 2020-02-02 tracey while (1) {
3108 f44b1f58 2020-02-02 tracey char *line = NULL;
3109 f44b1f58 2020-02-02 tracey off_t offset;
3110 f44b1f58 2020-02-02 tracey size_t len;
3112 f44b1f58 2020-02-02 tracey if (lineno <= 0 || lineno > s->nlines) {
3113 f44b1f58 2020-02-02 tracey if (s->matched_line == 0) {
3114 f44b1f58 2020-02-02 tracey view->search_next_done = 1;
3115 f44b1f58 2020-02-02 tracey free(line);
3119 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3120 f44b1f58 2020-02-02 tracey lineno = 1;
3122 f44b1f58 2020-02-02 tracey lineno = s->nlines;
3125 f44b1f58 2020-02-02 tracey offset = s->line_offsets[lineno - 1];
3126 f44b1f58 2020-02-02 tracey if (fseeko(s->f, offset, SEEK_SET) != 0) {
3127 f44b1f58 2020-02-02 tracey free(line);
3128 f44b1f58 2020-02-02 tracey return got_error_from_errno("fseeko");
3130 f44b1f58 2020-02-02 tracey free(line);
3131 f44b1f58 2020-02-02 tracey line = parse_next_line(s->f, &len);
3132 f44b1f58 2020-02-02 tracey if (line && match_line(line, &view->regex)) {
3133 f44b1f58 2020-02-02 tracey view->search_next_done = 1;
3134 f44b1f58 2020-02-02 tracey s->matched_line = lineno;
3135 f44b1f58 2020-02-02 tracey free(line);
3138 f44b1f58 2020-02-02 tracey free(line);
3139 f44b1f58 2020-02-02 tracey if (view->searching == TOG_SEARCH_FORWARD)
3140 f44b1f58 2020-02-02 tracey lineno++;
3142 f44b1f58 2020-02-02 tracey lineno--;
3145 f44b1f58 2020-02-02 tracey if (s->matched_line) {
3146 f44b1f58 2020-02-02 tracey s->first_displayed_line = s->matched_line;
3147 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3150 f44b1f58 2020-02-02 tracey return NULL;
3153 48ae06ee 2018-10-18 stsp static const struct got_error *
3154 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
3155 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
3156 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
3158 48ae06ee 2018-10-18 stsp const struct got_error *err;
3159 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3161 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
3162 15a94983 2018-12-23 stsp int type1, type2;
3163 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
3165 15a94983 2018-12-23 stsp return err;
3166 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
3168 15a94983 2018-12-23 stsp return err;
3170 15a94983 2018-12-23 stsp if (type1 != type2)
3171 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
3173 f44b1f58 2020-02-02 tracey s->first_displayed_line = 1;
3174 f44b1f58 2020-02-02 tracey s->last_displayed_line = view->nlines;
3175 f44b1f58 2020-02-02 tracey s->selected_line = 1;
3176 f44b1f58 2020-02-02 tracey s->repo = repo;
3177 f44b1f58 2020-02-02 tracey s->refs = refs;
3178 f44b1f58 2020-02-02 tracey s->id1 = id1;
3179 f44b1f58 2020-02-02 tracey s->id2 = id2;
3181 15a94983 2018-12-23 stsp if (id1) {
3182 5465d566 2020-02-01 tracey s->id1 = got_object_id_dup(id1);
3183 5465d566 2020-02-01 tracey if (s->id1 == NULL)
3184 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3186 5465d566 2020-02-01 tracey s->id1 = NULL;
3188 5465d566 2020-02-01 tracey s->id2 = got_object_id_dup(id2);
3189 5465d566 2020-02-01 tracey if (s->id2 == NULL) {
3190 5465d566 2020-02-01 tracey free(s->id1);
3191 5465d566 2020-02-01 tracey s->id1 = NULL;
3192 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3194 5465d566 2020-02-01 tracey s->f = NULL;
3195 5465d566 2020-02-01 tracey s->first_displayed_line = 1;
3196 5465d566 2020-02-01 tracey s->last_displayed_line = view->nlines;
3197 5465d566 2020-02-01 tracey s->diff_context = 3;
3198 5465d566 2020-02-01 tracey s->log_view = log_view;
3199 5465d566 2020-02-01 tracey s->repo = repo;
3200 5465d566 2020-02-01 tracey s->refs = refs;
3202 f44b1f58 2020-02-02 tracey SIMPLEQ_INIT(&s->colors);
3203 6d17833f 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
3204 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3205 11b20872 2019-11-08 stsp "^-", TOG_COLOR_DIFF_MINUS,
3206 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_MINUS"));
3208 6d17833f 2019-11-08 stsp return err;
3209 5465d566 2020-02-01 tracey err = add_color(&s->colors, "^\\+",
3210 11b20872 2019-11-08 stsp TOG_COLOR_DIFF_PLUS,
3211 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_PLUS"));
3212 6d17833f 2019-11-08 stsp if (err) {
3213 5465d566 2020-02-01 tracey free_colors(&s->colors);
3214 6d17833f 2019-11-08 stsp return err;
3216 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3217 11b20872 2019-11-08 stsp "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3218 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3219 6d17833f 2019-11-08 stsp if (err) {
3220 5465d566 2020-02-01 tracey free_colors(&s->colors);
3221 6d17833f 2019-11-08 stsp return err;
3224 f44b1f58 2020-02-02 tracey err = add_color(&s->colors,
3225 11b20872 2019-11-08 stsp "^(commit|(blob|file) [-+] )", TOG_COLOR_DIFF_META,
3226 6d17833f 2019-11-08 stsp get_color_value("TOG_COLOR_DIFF_META"));
3227 6d17833f 2019-11-08 stsp if (err) {
3228 5465d566 2020-02-01 tracey free_colors(&s->colors);
3229 6d17833f 2019-11-08 stsp return err;
3232 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3233 11b20872 2019-11-08 stsp "^(from|via): ", TOG_COLOR_AUTHOR,
3234 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_AUTHOR"));
3235 11b20872 2019-11-08 stsp if (err) {
3236 5465d566 2020-02-01 tracey free_colors(&s->colors);
3237 11b20872 2019-11-08 stsp return err;
3240 5465d566 2020-02-01 tracey err = add_color(&s->colors,
3241 11b20872 2019-11-08 stsp "^date: ", TOG_COLOR_DATE,
3242 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_DATE"));
3243 11b20872 2019-11-08 stsp if (err) {
3244 5465d566 2020-02-01 tracey free_colors(&s->colors);
3245 11b20872 2019-11-08 stsp return err;
3249 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
3250 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
3251 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
3253 5465d566 2020-02-01 tracey err = create_diff(s);
3254 48ae06ee 2018-10-18 stsp if (err) {
3255 5465d566 2020-02-01 tracey free(s->id1);
3256 5465d566 2020-02-01 tracey s->id1 = NULL;
3257 5465d566 2020-02-01 tracey free(s->id2);
3258 5465d566 2020-02-01 tracey s->id2 = NULL;
3259 48ae06ee 2018-10-18 stsp return err;
3262 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
3263 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
3264 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
3265 f44b1f58 2020-02-02 tracey view->search_start = search_start_diff_view;
3266 f44b1f58 2020-02-02 tracey view->search_next = search_next_diff_view;
3268 5dc9f4bc 2018-08-04 stsp return NULL;
3271 e5a0f69f 2018-08-18 stsp static const struct got_error *
3272 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
3274 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3275 5465d566 2020-02-01 tracey struct tog_diff_view_state *s = &view->state.diff;
3277 5465d566 2020-02-01 tracey free(s->id1);
3278 5465d566 2020-02-01 tracey s->id1 = NULL;
3279 5465d566 2020-02-01 tracey free(s->id2);
3280 5465d566 2020-02-01 tracey s->id2 = NULL;
3281 5465d566 2020-02-01 tracey if (s->f && fclose(s->f) == EOF)
3282 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3283 5465d566 2020-02-01 tracey free_colors(&s->colors);
3284 f44b1f58 2020-02-02 tracey free(s->line_offsets);
3285 e5a0f69f 2018-08-18 stsp return err;
3288 5dc9f4bc 2018-08-04 stsp static const struct got_error *
3289 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
3291 a3404814 2018-09-02 stsp const struct got_error *err;
3292 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
3293 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
3295 a3404814 2018-09-02 stsp if (s->id1) {
3296 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
3298 a3404814 2018-09-02 stsp return err;
3300 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
3302 a3404814 2018-09-02 stsp return err;
3304 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
3305 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3306 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3307 a3404814 2018-09-02 stsp free(id_str1);
3308 a3404814 2018-09-02 stsp free(id_str2);
3309 a3404814 2018-09-02 stsp return err;
3311 a3404814 2018-09-02 stsp free(id_str1);
3312 a3404814 2018-09-02 stsp free(id_str2);
3314 f44b1f58 2020-02-02 tracey return draw_file(view, s->f, &s->first_displayed_line, s->nlines,
3315 f44b1f58 2020-02-02 tracey s->selected_line, view->nlines, &s->last_displayed_line, &s->eof,
3316 bddb1296 2019-11-08 stsp header, &s->colors);
3319 15a087fe 2019-02-21 stsp static const struct got_error *
3320 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
3321 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
3323 d7a04538 2019-02-21 stsp const struct got_error *err;
3324 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
3325 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
3326 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
3328 15a087fe 2019-02-21 stsp free(s->id2);
3329 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
3330 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
3331 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
3333 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3335 d7a04538 2019-02-21 stsp return err;
3336 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
3337 15a087fe 2019-02-21 stsp free(s->id1);
3338 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
3339 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3340 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
3341 15a087fe 2019-02-21 stsp return NULL;
3344 0cf4efb1 2018-09-29 stsp static const struct got_error *
3345 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3346 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3348 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
3349 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
3350 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
3351 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
3354 e5a0f69f 2018-08-18 stsp switch (ch) {
3356 1e37a5c2 2019-05-12 jcs case KEY_UP:
3357 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
3358 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3360 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3361 a60a9dc4 2019-05-13 jcs case CTRL('b'):
3362 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
3365 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
3366 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3367 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3370 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3371 1e37a5c2 2019-05-12 jcs if (!s->eof)
3372 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3374 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3375 a60a9dc4 2019-05-13 jcs case CTRL('f'):
3377 00ba99a7 2019-05-12 jcs if (s->eof)
3380 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
3381 1e37a5c2 2019-05-12 jcs char *line;
3382 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
3383 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3384 1e37a5c2 2019-05-12 jcs if (line == NULL)
3389 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
3390 1e37a5c2 2019-05-12 jcs s->diff_context--;
3391 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3392 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3396 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3397 1e37a5c2 2019-05-12 jcs s->diff_context++;
3398 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3399 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3404 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3406 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3407 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
3408 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
3409 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3412 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3417 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3421 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3422 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3424 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3425 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3429 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
3431 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
3433 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3434 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
3436 1e37a5c2 2019-05-12 jcs /* Display "loading..." in log view. */
3437 1e37a5c2 2019-05-12 jcs show_log_view(s->log_view);
3438 1e37a5c2 2019-05-12 jcs update_panels();
3439 1e37a5c2 2019-05-12 jcs doupdate();
3441 1e37a5c2 2019-05-12 jcs err = trigger_log_thread(1 /* load_all */,
3442 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
3443 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
3444 1e37a5c2 2019-05-12 jcs &ls->thread_args.need_commits);
3448 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
3453 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
3454 1e37a5c2 2019-05-12 jcs if (entry == NULL)
3457 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
3461 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3462 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
3464 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
3465 1e37a5c2 2019-05-12 jcs err = create_diff(s);
3471 bcbd79e2 2018-08-19 stsp return err;
3474 4ed7e80c 2018-05-20 stsp static const struct got_error *
3475 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
3477 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
3478 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
3479 a273ac94 2020-02-23 naddy struct got_worktree *worktree = NULL;
3480 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3481 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
3482 a273ac94 2020-02-23 naddy char *repo_path = NULL, *cwd = NULL;
3483 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
3485 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
3487 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3489 26ed57b2 2018-05-19 stsp #ifndef PROFILE
3490 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3491 eb6600df 2019-01-04 stsp NULL) == -1)
3492 26ed57b2 2018-05-19 stsp err(1, "pledge");
3495 09b5bff8 2020-02-23 naddy while ((ch = getopt(argc, argv, "r:")) != -1) {
3496 26ed57b2 2018-05-19 stsp switch (ch) {
3497 09b5bff8 2020-02-23 naddy case 'r':
3498 09b5bff8 2020-02-23 naddy repo_path = realpath(optarg, NULL);
3499 09b5bff8 2020-02-23 naddy if (repo_path == NULL)
3500 09b5bff8 2020-02-23 naddy return got_error_from_errno2("realpath",
3504 17020d27 2019-03-07 stsp usage_diff();
3505 26ed57b2 2018-05-19 stsp /* NOTREACHED */
3509 26ed57b2 2018-05-19 stsp argc -= optind;
3510 26ed57b2 2018-05-19 stsp argv += optind;
3512 26ed57b2 2018-05-19 stsp if (argc == 0) {
3513 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
3514 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
3515 15a94983 2018-12-23 stsp id_str1 = argv[0];
3516 15a94983 2018-12-23 stsp id_str2 = argv[1];
3518 26ed57b2 2018-05-19 stsp usage_diff();
3520 a273ac94 2020-02-23 naddy cwd = getcwd(NULL, 0);
3521 a273ac94 2020-02-23 naddy if (cwd == NULL)
3522 a273ac94 2020-02-23 naddy return got_error_from_errno("getcwd");
3524 a273ac94 2020-02-23 naddy error = got_worktree_open(&worktree, cwd);
3525 a273ac94 2020-02-23 naddy if (error && error->code != GOT_ERR_NOT_WORKTREE)
3526 a273ac94 2020-02-23 naddy goto done;
3528 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3529 a273ac94 2020-02-23 naddy if (worktree)
3530 a273ac94 2020-02-23 naddy repo_path =
3531 a273ac94 2020-02-23 naddy strdup(got_worktree_get_repo_path(worktree));
3533 a273ac94 2020-02-23 naddy repo_path = strdup(cwd);
3535 a273ac94 2020-02-23 naddy if (repo_path == NULL) {
3536 a273ac94 2020-02-23 naddy error = got_error_from_errno("strdup");
3537 a273ac94 2020-02-23 naddy goto done;
3540 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
3541 eb6600df 2019-01-04 stsp if (error)
3542 eb6600df 2019-01-04 stsp goto done;
3544 a273ac94 2020-02-23 naddy init_curses();
3546 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3547 26ed57b2 2018-05-19 stsp if (error)
3548 26ed57b2 2018-05-19 stsp goto done;
3550 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id1, id_str1,
3551 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3552 26ed57b2 2018-05-19 stsp if (error)
3553 26ed57b2 2018-05-19 stsp goto done;
3555 dd88155e 2019-06-29 stsp error = got_repo_match_object_id_prefix(&id2, id_str2,
3556 dd88155e 2019-06-29 stsp GOT_OBJ_TYPE_ANY, repo);
3557 26ed57b2 2018-05-19 stsp if (error)
3558 26ed57b2 2018-05-19 stsp goto done;
3560 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3561 8b473291 2019-02-21 stsp if (error)
3562 8b473291 2019-02-21 stsp goto done;
3564 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3565 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
3566 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3567 ea5e7bb5 2018-08-01 stsp goto done;
3569 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3570 5dc9f4bc 2018-08-04 stsp if (error)
3571 5dc9f4bc 2018-08-04 stsp goto done;
3572 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3574 c02c541e 2019-03-29 stsp free(repo_path);
3575 a273ac94 2020-02-23 naddy free(cwd);
3577 921be706 2019-06-28 stsp got_repo_close(repo);
3578 a273ac94 2020-02-23 naddy if (worktree)
3579 a273ac94 2020-02-23 naddy got_worktree_close(worktree);
3580 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3581 26ed57b2 2018-05-19 stsp return error;
3584 4ed7e80c 2018-05-20 stsp __dead static void
3585 9f7d7167 2018-04-29 stsp usage_blame(void)
3588 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3589 9f7d7167 2018-04-29 stsp getprogname());
3593 84451b3e 2018-07-10 stsp struct tog_blame_line {
3594 84451b3e 2018-07-10 stsp int annotated;
3595 84451b3e 2018-07-10 stsp struct got_object_id *id;
3598 4ed7e80c 2018-05-20 stsp static const struct got_error *
3599 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3600 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
3601 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
3602 11b20872 2019-11-08 stsp int *last_displayed_line, int *eof, int max_lines,
3603 11b20872 2019-11-08 stsp struct tog_colors *colors)
3605 84451b3e 2018-07-10 stsp const struct got_error *err;
3606 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
3607 84451b3e 2018-07-10 stsp char *line;
3608 84451b3e 2018-07-10 stsp size_t len;
3609 84451b3e 2018-07-10 stsp wchar_t *wline;
3610 27a741e5 2019-09-11 stsp int width;
3611 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
3612 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
3613 ab089a2a 2018-07-12 stsp char *id_str;
3614 11b20872 2019-11-08 stsp struct tog_color *tc;
3616 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
3618 ab089a2a 2018-07-12 stsp return err;
3620 84451b3e 2018-07-10 stsp rewind(f);
3621 f7d12f7e 2018-08-01 stsp werase(view->window);
3623 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
3624 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3625 ab089a2a 2018-07-12 stsp free(id_str);
3626 ab089a2a 2018-07-12 stsp return err;
3629 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3630 ab089a2a 2018-07-12 stsp free(line);
3631 2550e4c3 2018-07-13 stsp line = NULL;
3633 1cae65b4 2019-09-22 stsp return err;
3634 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3635 a3404814 2018-09-02 stsp wstandout(view->window);
3636 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3638 11b20872 2019-11-08 stsp wattr_on(view->window,
3639 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3640 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3642 11b20872 2019-11-08 stsp wattr_off(view->window,
3643 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3644 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3645 a3404814 2018-09-02 stsp wstandend(view->window);
3646 2550e4c3 2018-07-13 stsp free(wline);
3647 2550e4c3 2018-07-13 stsp wline = NULL;
3648 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3649 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3651 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
3652 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
3653 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
3654 ab089a2a 2018-07-12 stsp free(id_str);
3655 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3657 ab089a2a 2018-07-12 stsp free(id_str);
3658 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
3659 3f60a8ef 2018-07-10 stsp free(line);
3660 2550e4c3 2018-07-13 stsp line = NULL;
3662 3f60a8ef 2018-07-10 stsp return err;
3663 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3664 2550e4c3 2018-07-13 stsp free(wline);
3665 2550e4c3 2018-07-13 stsp wline = NULL;
3666 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3667 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3670 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
3671 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
3672 84451b3e 2018-07-10 stsp if (line == NULL) {
3676 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
3677 84451b3e 2018-07-10 stsp free(line);
3681 27a741e5 2019-09-11 stsp if (view->ncols <= 9) {
3682 27a741e5 2019-09-11 stsp width = 9;
3683 27a741e5 2019-09-11 stsp wline = wcsdup(L"");
3684 27a741e5 2019-09-11 stsp if (wline == NULL)
3685 27a741e5 2019-09-11 stsp err = got_error_from_errno("wcsdup");
3687 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line,
3688 27a741e5 2019-09-11 stsp view->ncols - 9, 9);
3689 27a741e5 2019-09-11 stsp width += 9;
3691 84451b3e 2018-07-10 stsp if (err) {
3692 84451b3e 2018-07-10 stsp free(line);
3693 84451b3e 2018-07-10 stsp return err;
3696 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3697 f7d12f7e 2018-08-01 stsp wstandout(view->window);
3699 8d0fe45a 2019-08-12 stsp if (nlines > 0) {
3700 8d0fe45a 2019-08-12 stsp blame_line = &lines[lineno - 1];
3701 8d0fe45a 2019-08-12 stsp if (blame_line->annotated && prev_id &&
3702 27a741e5 2019-09-11 stsp got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3703 27a741e5 2019-09-11 stsp !(view->focussed &&
3704 27a741e5 2019-09-11 stsp nprinted == selected_line - 1)) {
3705 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3706 27a741e5 2019-09-11 stsp } else if (blame_line->annotated) {
3707 8d0fe45a 2019-08-12 stsp char *id_str;
3708 8d0fe45a 2019-08-12 stsp err = got_object_id_str(&id_str, blame_line->id);
3709 8d0fe45a 2019-08-12 stsp if (err) {
3710 8d0fe45a 2019-08-12 stsp free(line);
3711 8d0fe45a 2019-08-12 stsp free(wline);
3712 8d0fe45a 2019-08-12 stsp return err;
3714 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
3716 11b20872 2019-11-08 stsp wattr_on(view->window,
3717 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3718 27a741e5 2019-09-11 stsp wprintw(view->window, "%.8s", id_str);
3720 11b20872 2019-11-08 stsp wattr_off(view->window,
3721 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
3722 8d0fe45a 2019-08-12 stsp free(id_str);
3723 8d0fe45a 2019-08-12 stsp prev_id = blame_line->id;
3725 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3726 8d0fe45a 2019-08-12 stsp prev_id = NULL;
3729 27a741e5 2019-09-11 stsp waddstr(view->window, "........");
3730 ee41ec32 2018-07-10 stsp prev_id = NULL;
3733 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
3734 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3735 27a741e5 2019-09-11 stsp waddstr(view->window, " ");
3737 27a741e5 2019-09-11 stsp waddwstr(view->window, wline);
3738 27a741e5 2019-09-11 stsp if (width <= view->ncols - 1)
3739 27a741e5 2019-09-11 stsp waddch(view->window, '\n');
3740 84451b3e 2018-07-10 stsp if (++nprinted == 1)
3741 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
3742 84451b3e 2018-07-10 stsp free(line);
3743 2550e4c3 2018-07-13 stsp free(wline);
3744 2550e4c3 2018-07-13 stsp wline = NULL;
3746 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
3748 1a57306a 2018-09-02 stsp view_vborder(view);
3750 84451b3e 2018-07-10 stsp return NULL;
3753 84451b3e 2018-07-10 stsp static const struct got_error *
3754 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3756 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
3757 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
3758 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
3759 1a76625f 2018-10-22 stsp int errcode;
3761 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
3762 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
3763 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
3765 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3766 1a76625f 2018-10-22 stsp if (errcode)
3767 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
3769 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
3770 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
3771 d68a0a7d 2018-07-10 stsp goto done;
3774 d68a0a7d 2018-07-10 stsp if (lineno == -1)
3775 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
3777 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
3778 d68a0a7d 2018-07-10 stsp if (line->annotated)
3779 d68a0a7d 2018-07-10 stsp goto done;
3781 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
3782 84451b3e 2018-07-10 stsp if (line->id == NULL) {
3783 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3784 84451b3e 2018-07-10 stsp goto done;
3786 84451b3e 2018-07-10 stsp line->annotated = 1;
3788 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3789 1a76625f 2018-10-22 stsp if (errcode)
3790 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3791 84451b3e 2018-07-10 stsp return err;
3794 84451b3e 2018-07-10 stsp static void *
3795 84451b3e 2018-07-10 stsp blame_thread(void *arg)
3797 18430de3 2018-07-10 stsp const struct got_error *err;
3798 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
3799 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
3800 1a76625f 2018-10-22 stsp int errcode;
3802 61266923 2020-01-14 stsp err = block_signals_used_by_main_thread();
3804 61266923 2020-01-14 stsp return (void *)err;
3806 0d8ff7d5 2019-08-14 stsp err = got_blame(ta->path, a->commit_id, ta->repo,
3807 fc06ba56 2019-08-22 stsp blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3808 fc06ba56 2019-08-22 stsp if (err && err->code == GOT_ERR_CANCELLED)
3809 fc06ba56 2019-08-22 stsp err = NULL;
3811 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3812 1a76625f 2018-10-22 stsp if (errcode)
3813 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
3814 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3816 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
3817 c9beca56 2018-07-22 stsp ta->repo = NULL;
3818 c9beca56 2018-07-22 stsp *ta->complete = 1;
3820 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3821 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
3822 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3824 18430de3 2018-07-10 stsp return (void *)err;
3827 245d91c1 2018-07-12 stsp static struct got_object_id *
3828 8d0fe45a 2019-08-12 stsp get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3829 8d0fe45a 2019-08-12 stsp int first_displayed_line, int selected_line)
3831 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
3833 8d0fe45a 2019-08-12 stsp if (nlines <= 0)
3834 8d0fe45a 2019-08-12 stsp return NULL;
3836 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
3837 245d91c1 2018-07-12 stsp if (!line->annotated)
3838 245d91c1 2018-07-12 stsp return NULL;
3840 245d91c1 2018-07-12 stsp return line->id;
3843 b880a918 2018-07-10 stsp static const struct got_error *
3844 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
3846 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
3849 245d91c1 2018-07-12 stsp if (blame->thread) {
3850 1a76625f 2018-10-22 stsp int errcode;
3851 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3852 1a76625f 2018-10-22 stsp if (errcode)
3853 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3854 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
3855 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
3856 1a76625f 2018-10-22 stsp if (errcode)
3857 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
3858 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3859 1a76625f 2018-10-22 stsp if (errcode)
3860 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
3861 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
3862 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
3863 245d91c1 2018-07-12 stsp err = NULL;
3864 245d91c1 2018-07-12 stsp blame->thread = NULL;
3866 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
3867 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
3868 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
3870 245d91c1 2018-07-12 stsp if (blame->f) {
3871 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
3872 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
3873 245d91c1 2018-07-12 stsp blame->f = NULL;
3875 57670559 2018-12-23 stsp if (blame->lines) {
3876 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
3877 57670559 2018-12-23 stsp free(blame->lines[i].id);
3878 57670559 2018-12-23 stsp free(blame->lines);
3879 57670559 2018-12-23 stsp blame->lines = NULL;
3881 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
3882 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
3884 245d91c1 2018-07-12 stsp return err;
3887 245d91c1 2018-07-12 stsp static const struct got_error *
3888 fc06ba56 2019-08-22 stsp cancel_blame_view(void *arg)
3890 fc06ba56 2019-08-22 stsp const struct got_error *err = NULL;
3891 fc06ba56 2019-08-22 stsp int *done = arg;
3892 fc06ba56 2019-08-22 stsp int errcode;
3894 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
3895 fc06ba56 2019-08-22 stsp if (errcode)
3896 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3897 fc06ba56 2019-08-22 stsp "pthread_mutex_unlock");
3899 fc06ba56 2019-08-22 stsp if (*done)
3900 fc06ba56 2019-08-22 stsp err = got_error(GOT_ERR_CANCELLED);
3902 fc06ba56 2019-08-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
3903 fc06ba56 2019-08-22 stsp if (errcode)
3904 fc06ba56 2019-08-22 stsp return got_error_set_errno(errcode,
3905 fc06ba56 2019-08-22 stsp "pthread_mutex_lock");
3907 fc06ba56 2019-08-22 stsp return err;
3910 fc06ba56 2019-08-22 stsp static const struct got_error *
3911 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3912 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
3913 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
3914 245d91c1 2018-07-12 stsp struct got_repository *repo)
3916 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
3917 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
3918 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
3919 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
3920 15a94983 2018-12-23 stsp int obj_type;
3922 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3924 15a94983 2018-12-23 stsp return err;
3926 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
3928 84451b3e 2018-07-10 stsp goto done;
3930 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
3931 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
3932 84451b3e 2018-07-10 stsp goto done;
3935 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3937 a70480e0 2018-06-23 stsp goto done;
3938 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
3939 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
3940 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
3941 84451b3e 2018-07-10 stsp goto done;
3943 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3944 6c4c42e0 2019-06-24 stsp &blame->line_offsets, blame->f, blob);
3945 b02560ec 2019-08-19 stsp if (err || blame->nlines == 0)
3946 84451b3e 2018-07-10 stsp goto done;
3948 b02560ec 2019-08-19 stsp /* Don't include \n at EOF in the blame line count. */
3949 b02560ec 2019-08-19 stsp if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
3950 b02560ec 2019-08-19 stsp blame->nlines--;
3952 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
3953 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
3954 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3955 84451b3e 2018-07-10 stsp goto done;
3958 c9956ddf 2019-09-08 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
3960 bd24772e 2018-07-11 stsp goto done;
3962 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
3963 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
3964 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
3965 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
3966 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
3967 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3968 245d91c1 2018-07-12 stsp goto done;
3970 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
3972 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
3973 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
3974 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
3975 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
3976 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_cb = cancel_blame_view;
3977 fc06ba56 2019-08-22 stsp blame->thread_args.cancel_arg = done;
3978 245d91c1 2018-07-12 stsp *blame_complete = 0;
3982 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
3983 27d434c2 2018-09-15 stsp free(obj_id);
3985 245d91c1 2018-07-12 stsp stop_blame(blame);
3986 245d91c1 2018-07-12 stsp return err;
3989 245d91c1 2018-07-12 stsp static const struct got_error *
3990 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
3991 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3992 8b473291 2019-02-21 stsp struct got_repository *repo)
3994 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
3995 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3997 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
3999 c4843652 2019-08-12 stsp s->path = strdup(path);
4000 c4843652 2019-08-12 stsp if (s->path == NULL)
4001 c4843652 2019-08-12 stsp return got_error_from_errno("strdup");
4003 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4004 c4843652 2019-08-12 stsp if (err) {
4005 c4843652 2019-08-12 stsp free(s->path);
4006 7cbe629d 2018-08-04 stsp return err;
4009 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4010 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
4011 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
4012 fb2756b9 2018-08-04 stsp s->selected_line = 1;
4013 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
4014 fb2756b9 2018-08-04 stsp s->repo = repo;
4015 8b473291 2019-02-21 stsp s->refs = refs;
4016 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
4017 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
4019 11b20872 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4020 11b20872 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4021 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4022 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4024 11b20872 2019-11-08 stsp return err;
4027 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
4028 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
4029 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
4030 6c4c42e0 2019-06-24 stsp view->search_start = search_start_blame_view;
4031 6c4c42e0 2019-06-24 stsp view->search_next = search_next_blame_view;
4033 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
4034 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
4035 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
4036 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
4039 e5a0f69f 2018-08-18 stsp static const struct got_error *
4040 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
4042 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4043 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4045 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
4046 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
4048 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4049 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
4050 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4051 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4052 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
4055 e5a0f69f 2018-08-18 stsp free(s->path);
4056 11b20872 2019-11-08 stsp free_colors(&s->colors);
4058 e5a0f69f 2018-08-18 stsp return err;
4061 7cbe629d 2018-08-04 stsp static const struct got_error *
4062 6c4c42e0 2019-06-24 stsp search_start_blame_view(struct tog_view *view)
4064 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4066 6c4c42e0 2019-06-24 stsp s->matched_line = 0;
4067 6c4c42e0 2019-06-24 stsp return NULL;
4070 6c4c42e0 2019-06-24 stsp static const struct got_error *
4071 6c4c42e0 2019-06-24 stsp search_next_blame_view(struct tog_view *view)
4073 6c4c42e0 2019-06-24 stsp struct tog_blame_view_state *s = &view->state.blame;
4074 6c4c42e0 2019-06-24 stsp int lineno;
4076 6c4c42e0 2019-06-24 stsp if (!view->searching) {
4077 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
4078 6c4c42e0 2019-06-24 stsp return NULL;
4081 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4082 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4083 2246482e 2019-06-25 stsp lineno = s->matched_line + 1;
4085 2246482e 2019-06-25 stsp lineno = s->matched_line - 1;
4087 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4088 6c4c42e0 2019-06-24 stsp lineno = 1;
4090 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4093 6c4c42e0 2019-06-24 stsp while (1) {
4094 6c4c42e0 2019-06-24 stsp char *line = NULL;
4095 6c4c42e0 2019-06-24 stsp off_t offset;
4096 6c4c42e0 2019-06-24 stsp size_t len;
4098 6c4c42e0 2019-06-24 stsp if (lineno <= 0 || lineno > s->blame.nlines) {
4099 6c4c42e0 2019-06-24 stsp if (s->matched_line == 0) {
4100 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
4101 6c4c42e0 2019-06-24 stsp free(line);
4105 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4106 6c4c42e0 2019-06-24 stsp lineno = 1;
4108 6c4c42e0 2019-06-24 stsp lineno = s->blame.nlines;
4111 6c4c42e0 2019-06-24 stsp offset = s->blame.line_offsets[lineno - 1];
4112 6c4c42e0 2019-06-24 stsp if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4113 6c4c42e0 2019-06-24 stsp free(line);
4114 6c4c42e0 2019-06-24 stsp return got_error_from_errno("fseeko");
4116 6c4c42e0 2019-06-24 stsp free(line);
4117 6c4c42e0 2019-06-24 stsp line = parse_next_line(s->blame.f, &len);
4118 2246482e 2019-06-25 stsp if (line && match_line(line, &view->regex)) {
4119 6c4c42e0 2019-06-24 stsp view->search_next_done = 1;
4120 6c4c42e0 2019-06-24 stsp s->matched_line = lineno;
4121 6c4c42e0 2019-06-24 stsp free(line);
4124 6c4c42e0 2019-06-24 stsp free(line);
4125 6c4c42e0 2019-06-24 stsp if (view->searching == TOG_SEARCH_FORWARD)
4131 6c4c42e0 2019-06-24 stsp if (s->matched_line) {
4132 6c4c42e0 2019-06-24 stsp s->first_displayed_line = s->matched_line;
4133 6c4c42e0 2019-06-24 stsp s->selected_line = 1;
4136 6c4c42e0 2019-06-24 stsp return NULL;
4139 6c4c42e0 2019-06-24 stsp static const struct got_error *
4140 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
4142 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
4143 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
4144 2b380cc8 2018-10-24 stsp int errcode;
4146 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
4147 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4148 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
4149 2b380cc8 2018-10-24 stsp if (errcode)
4150 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
4152 51fe7530 2019-08-19 stsp halfdelay(1); /* fast refresh while annotating */
4155 51fe7530 2019-08-19 stsp if (s->blame_complete)
4156 51fe7530 2019-08-19 stsp halfdelay(10); /* disable fast refresh */
4158 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
4159 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
4160 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
4161 11b20872 2019-11-08 stsp &s->last_displayed_line, &s->eof, view->nlines, &s->colors);
4163 669b5ffa 2018-10-07 stsp view_vborder(view);
4164 e5a0f69f 2018-08-18 stsp return err;
4167 e5a0f69f 2018-08-18 stsp static const struct got_error *
4168 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
4169 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
4171 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
4172 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
4173 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
4174 669b5ffa 2018-10-07 stsp int begin_x = 0;
4176 e5a0f69f 2018-08-18 stsp switch (ch) {
4178 1e37a5c2 2019-05-12 jcs s->done = 1;
4181 1e37a5c2 2019-05-12 jcs case KEY_UP:
4182 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
4183 1e37a5c2 2019-05-12 jcs s->selected_line--;
4184 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
4185 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
4186 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
4188 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
4189 ea025d1d 2020-02-22 naddy case CTRL('b'):
4190 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
4191 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
4194 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
4195 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
4196 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
4198 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
4201 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
4202 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
4203 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
4204 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
4205 1e37a5c2 2019-05-12 jcs s->selected_line++;
4206 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
4207 1e37a5c2 2019-05-12 jcs s->blame.nlines)
4208 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
4211 1e37a5c2 2019-05-12 jcs case 'p': {
4212 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4213 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4214 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4215 1e37a5c2 2019-05-12 jcs if (id == NULL)
4217 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
4218 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
4219 15a94983 2018-12-23 stsp struct got_object_qid *pid;
4220 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
4221 1e37a5c2 2019-05-12 jcs int obj_type;
4222 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
4223 1e37a5c2 2019-05-12 jcs s->repo, id);
4226 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
4227 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
4228 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
4229 15a94983 2018-12-23 stsp got_object_commit_close(commit);
4232 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
4233 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
4234 1e37a5c2 2019-05-12 jcs pid->id, s->path);
4235 e5a0f69f 2018-08-18 stsp if (err) {
4236 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
4237 1e37a5c2 2019-05-12 jcs err = NULL;
4238 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4241 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
4243 1e37a5c2 2019-05-12 jcs free(blob_id);
4244 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
4245 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
4246 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4249 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4251 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4253 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
4254 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
4256 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
4261 1e37a5c2 2019-05-12 jcs s->done = 1;
4262 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4263 1e37a5c2 2019-05-12 jcs s->done = 0;
4264 1e37a5c2 2019-05-12 jcs if (thread_err)
4266 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4267 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
4268 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4269 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4270 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
4271 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
4276 1e37a5c2 2019-05-12 jcs case 'B': {
4277 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
4278 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
4279 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
4281 1e37a5c2 2019-05-12 jcs s->done = 1;
4282 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
4283 1e37a5c2 2019-05-12 jcs s->done = 0;
4284 1e37a5c2 2019-05-12 jcs if (thread_err)
4286 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4287 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
4288 1e37a5c2 2019-05-12 jcs s->blamed_commit =
4289 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
4290 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
4291 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
4292 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
4293 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
4298 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
4299 1e37a5c2 2019-05-12 jcs case '\r': {
4300 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
4301 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
4302 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
4303 8d0fe45a 2019-08-12 stsp id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4304 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
4305 1e37a5c2 2019-05-12 jcs if (id == NULL)
4307 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
4310 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
4311 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
4312 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
4313 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
4314 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4315 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
4316 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4317 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
4320 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
4321 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
4322 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
4324 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4327 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
4328 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
4331 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
4333 1e37a5c2 2019-05-12 jcs view_close(diff_view);
4336 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
4337 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
4339 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
4344 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
4345 ea025d1d 2020-02-22 naddy case CTRL('f'):
4347 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4348 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
4349 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
4352 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
4353 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
4354 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4355 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4358 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
4359 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
4360 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
4361 1e37a5c2 2019-05-12 jcs view->nlines - 2;
4363 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
4364 1e37a5c2 2019-05-12 jcs s->blame.nlines -
4365 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
4367 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
4368 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
4369 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
4370 1e37a5c2 2019-05-12 jcs view->nlines - 2);
4376 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
4379 a70480e0 2018-06-23 stsp static const struct got_error *
4380 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
4382 a70480e0 2018-06-23 stsp const struct got_error *error;
4383 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
4384 8b473291 2019-02-21 stsp struct got_reflist_head refs;
4385 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
4386 f135c941 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4387 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
4388 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
4390 e1cd8fed 2018-08-01 stsp struct tog_view *view;
4392 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
4394 a70480e0 2018-06-23 stsp #ifndef PROFILE
4395 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4396 8e94dd5b 2019-01-04 stsp NULL) == -1)
4397 a70480e0 2018-06-23 stsp err(1, "pledge");
4400 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4401 a70480e0 2018-06-23 stsp switch (ch) {
4403 a70480e0 2018-06-23 stsp commit_id_str = optarg;
4406 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
4407 69069811 2018-08-02 stsp if (repo_path == NULL)
4408 9ba1d308 2019-10-21 stsp return got_error_from_errno2("realpath",
4412 17020d27 2019-03-07 stsp usage_blame();
4413 a70480e0 2018-06-23 stsp /* NOTREACHED */
4417 a70480e0 2018-06-23 stsp argc -= optind;
4418 a70480e0 2018-06-23 stsp argv += optind;
4420 f135c941 2020-02-20 stsp if (argc != 1)
4421 a70480e0 2018-06-23 stsp usage_blame();
4423 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
4424 6962eb72 2020-02-20 stsp if (cwd == NULL)
4425 6962eb72 2020-02-20 stsp return got_error_from_errno("getcwd");
4427 f135c941 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
4428 f135c941 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
4429 f135c941 2020-02-20 stsp goto done;
4431 69069811 2018-08-02 stsp if (repo_path == NULL) {
4432 f135c941 2020-02-20 stsp if (worktree)
4433 eb41ed75 2019-02-05 stsp repo_path =
4434 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
4436 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
4438 f135c941 2020-02-20 stsp if (repo_path == NULL) {
4439 f135c941 2020-02-20 stsp error = got_error_from_errno("strdup");
4440 f135c941 2020-02-20 stsp goto done;
4443 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
4444 c02c541e 2019-03-29 stsp if (error != NULL)
4445 8e94dd5b 2019-01-04 stsp goto done;
4447 f135c941 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4448 f135c941 2020-02-20 stsp worktree);
4449 c02c541e 2019-03-29 stsp if (error)
4450 92205607 2019-01-04 stsp goto done;
4452 f135c941 2020-02-20 stsp init_curses();
4454 f135c941 2020-02-20 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
4455 eb41ed75 2019-02-05 stsp if (error)
4456 69069811 2018-08-02 stsp goto done;
4458 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
4459 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
4460 a0975128 2020-02-07 stsp error = got_ref_open(&head_ref, repo, worktree ?
4461 a0975128 2020-02-07 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4462 a70480e0 2018-06-23 stsp if (error != NULL)
4463 66b4983c 2018-06-23 stsp goto done;
4464 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
4465 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
4467 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
4468 71a27632 2020-01-15 stsp commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4470 a19e88aa 2018-06-23 stsp if (error != NULL)
4471 8b473291 2019-02-21 stsp goto done;
4473 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4474 8b473291 2019-02-21 stsp if (error)
4475 a19e88aa 2018-06-23 stsp goto done;
4477 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4478 e1cd8fed 2018-08-01 stsp if (view == NULL) {
4479 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4480 e1cd8fed 2018-08-01 stsp goto done;
4482 8b473291 2019-02-21 stsp error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
4483 7cbe629d 2018-08-04 stsp if (error)
4484 7cbe629d 2018-08-04 stsp goto done;
4485 12314ad4 2019-08-31 stsp if (worktree) {
4486 12314ad4 2019-08-31 stsp /* Release work tree lock. */
4487 12314ad4 2019-08-31 stsp got_worktree_close(worktree);
4488 12314ad4 2019-08-31 stsp worktree = NULL;
4490 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4492 69069811 2018-08-02 stsp free(repo_path);
4493 f135c941 2020-02-20 stsp free(in_repo_path);
4494 69069811 2018-08-02 stsp free(cwd);
4495 a70480e0 2018-06-23 stsp free(commit_id);
4496 eb41ed75 2019-02-05 stsp if (worktree)
4497 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
4499 a70480e0 2018-06-23 stsp got_repo_close(repo);
4500 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4501 a70480e0 2018-06-23 stsp return error;
4504 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4505 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
4506 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
4507 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
4508 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
4509 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
4510 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int selected, int limit,
4511 f26dddb7 2019-11-08 stsp int isroot, struct tog_colors *colors)
4513 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4514 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
4515 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
4516 f26dddb7 2019-11-08 stsp struct tog_color *tc;
4517 56e0773d 2019-11-28 stsp int width, n, i, nentries;
4519 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
4521 f7d12f7e 2018-08-01 stsp werase(view->window);
4523 ffd1d5e5 2018-06-23 stsp if (limit == 0)
4524 ffd1d5e5 2018-06-23 stsp return NULL;
4526 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, label, view->ncols, 0);
4528 ffd1d5e5 2018-06-23 stsp return err;
4529 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4530 a3404814 2018-09-02 stsp wstandout(view->window);
4531 11b20872 2019-11-08 stsp tc = get_color(colors, TOG_COLOR_COMMIT);
4533 11b20872 2019-11-08 stsp wattr_on(view->window,
4534 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4535 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4537 11b20872 2019-11-08 stsp wattr_off(view->window,
4538 11b20872 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4539 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
4540 a3404814 2018-09-02 stsp wstandend(view->window);
4541 2550e4c3 2018-07-13 stsp free(wline);
4542 2550e4c3 2018-07-13 stsp wline = NULL;
4543 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4544 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4545 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4546 ffd1d5e5 2018-06-23 stsp return NULL;
4547 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, parent_path, view->ncols, 0);
4549 ce52c690 2018-06-23 stsp return err;
4550 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4551 2550e4c3 2018-07-13 stsp free(wline);
4552 2550e4c3 2018-07-13 stsp wline = NULL;
4553 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4554 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4555 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4556 ffd1d5e5 2018-06-23 stsp return NULL;
4557 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4558 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
4559 a1eca9bb 2018-06-23 stsp return NULL;
4561 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
4562 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(tree);
4563 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
4564 0cf4efb1 2018-09-29 stsp if (view->focussed)
4565 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4566 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
4568 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
4569 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
4570 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4571 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4572 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4573 ffd1d5e5 2018-06-23 stsp return NULL;
4577 56e0773d 2019-11-28 stsp te = *first_displayed_entry;
4580 56e0773d 2019-11-28 stsp nentries = got_object_tree_get_nentries(tree);
4581 56e0773d 2019-11-28 stsp for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4582 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
4583 848d6979 2019-08-12 stsp const char *modestr = "";
4584 56e0773d 2019-11-28 stsp mode_t mode;
4586 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, i);
4587 56e0773d 2019-11-28 stsp mode = got_tree_entry_get_mode(te);
4589 1d13200f 2018-07-12 stsp if (show_ids) {
4590 56e0773d 2019-11-28 stsp err = got_object_id_str(&id_str,
4591 56e0773d 2019-11-28 stsp got_tree_entry_get_id(te));
4593 638f9024 2019-05-13 stsp return got_error_from_errno(
4594 230a42bd 2019-05-11 jcs "got_object_id_str");
4596 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
4597 63c5ca5d 2019-08-24 stsp modestr = "$";
4598 56e0773d 2019-11-28 stsp else if (S_ISLNK(mode))
4599 848d6979 2019-08-12 stsp modestr = "@";
4600 56e0773d 2019-11-28 stsp else if (S_ISDIR(mode))
4601 848d6979 2019-08-12 stsp modestr = "/";
4602 56e0773d 2019-11-28 stsp else if (mode & S_IXUSR)
4603 848d6979 2019-08-12 stsp modestr = "*";
4604 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
4605 56e0773d 2019-11-28 stsp got_tree_entry_get_name(te), modestr) == -1) {
4606 1d13200f 2018-07-12 stsp free(id_str);
4607 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4609 1d13200f 2018-07-12 stsp free(id_str);
4610 27a741e5 2019-09-11 stsp err = format_line(&wline, &width, line, view->ncols, 0);
4611 ffd1d5e5 2018-06-23 stsp if (err) {
4612 ffd1d5e5 2018-06-23 stsp free(line);
4615 ffd1d5e5 2018-06-23 stsp if (n == selected) {
4616 0cf4efb1 2018-09-29 stsp if (view->focussed)
4617 0cf4efb1 2018-09-29 stsp wstandout(view->window);
4618 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
4620 bddb1296 2019-11-08 stsp tc = match_color(colors, line);
4622 c0b01bdb 2019-11-08 stsp wattr_on(view->window,
4623 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4624 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
4626 c0b01bdb 2019-11-08 stsp wattr_off(view->window,
4627 f26dddb7 2019-11-08 stsp COLOR_PAIR(tc->colorpair), NULL);
4628 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
4629 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
4630 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
4631 f7d12f7e 2018-08-01 stsp wstandend(view->window);
4632 ffd1d5e5 2018-06-23 stsp free(line);
4633 2550e4c3 2018-07-13 stsp free(wline);
4634 2550e4c3 2018-07-13 stsp wline = NULL;
4636 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
4637 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
4638 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
4642 ffd1d5e5 2018-06-23 stsp return err;
4645 ffd1d5e5 2018-06-23 stsp static void
4646 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
4647 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
4648 56e0773d 2019-11-28 stsp struct got_tree_object *tree, int isroot)
4650 56e0773d 2019-11-28 stsp struct got_tree_entry *te;
4653 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
4656 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(tree, 0);
4657 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
4658 ffd1d5e5 2018-06-23 stsp if (!isroot)
4659 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4664 56e0773d 2019-11-28 stsp while (*first_displayed_entry && i < maxscroll) {
4665 56e0773d 2019-11-28 stsp *first_displayed_entry = got_tree_entry_get_prev(tree,
4666 56e0773d 2019-11-28 stsp *first_displayed_entry);
4669 56e0773d 2019-11-28 stsp if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4670 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
4673 768394f3 2019-01-24 stsp static int
4674 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4675 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
4676 56e0773d 2019-11-28 stsp struct got_tree_object *tree)
4678 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
4679 ffd1d5e5 2018-06-23 stsp int n = 0;
4681 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
4682 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, *first_displayed_entry);
4684 56e0773d 2019-11-28 stsp next = got_object_tree_get_first_entry(tree);
4686 768394f3 2019-01-24 stsp last = last_displayed_entry;
4687 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
4688 56e0773d 2019-11-28 stsp last = got_tree_entry_get_next(tree, last);
4689 768394f3 2019-01-24 stsp if (last) {
4690 768394f3 2019-01-24 stsp *first_displayed_entry = next;
4691 56e0773d 2019-11-28 stsp next = got_tree_entry_get_next(tree, next);
4697 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4698 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
4699 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
4701 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
4702 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
4703 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
4705 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
4706 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(pt->selected_entry))
4707 56e0773d 2019-11-28 stsp + 1 /* slash */;
4709 56e0773d 2019-11-28 stsp len += strlen(got_tree_entry_get_name(te));
4711 ce52c690 2018-06-23 stsp *path = calloc(1, len);
4712 ffd1d5e5 2018-06-23 stsp if (path == NULL)
4713 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
4715 ce52c690 2018-06-23 stsp (*path)[0] = '/';
4716 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
4717 d9765a41 2018-06-23 stsp while (pt) {
4718 56e0773d 2019-11-28 stsp const char *name = got_tree_entry_get_name(pt->selected_entry);
4719 56e0773d 2019-11-28 stsp if (strlcat(*path, name, len) >= len) {
4720 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4721 cb2ebc8a 2018-06-23 stsp goto done;
4723 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
4724 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4725 cb2ebc8a 2018-06-23 stsp goto done;
4727 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4730 56e0773d 2019-11-28 stsp if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4731 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
4732 ce52c690 2018-06-23 stsp goto done;
4736 ce52c690 2018-06-23 stsp if (err) {
4737 ce52c690 2018-06-23 stsp free(*path);
4738 ce52c690 2018-06-23 stsp *path = NULL;
4740 ce52c690 2018-06-23 stsp return err;
4743 ce52c690 2018-06-23 stsp static const struct got_error *
4744 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
4745 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4746 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4747 8b473291 2019-02-21 stsp struct got_repository *repo)
4749 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
4750 ce52c690 2018-06-23 stsp char *path;
4751 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
4753 a0de39f3 2019-08-09 stsp *new_view = NULL;
4755 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
4757 ce52c690 2018-06-23 stsp return err;
4759 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4760 83ce39e3 2019-08-12 stsp if (blame_view == NULL) {
4761 83ce39e3 2019-08-12 stsp err = got_error_from_errno("view_open");
4762 83ce39e3 2019-08-12 stsp goto done;
4765 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
4766 e5a0f69f 2018-08-18 stsp if (err) {
4767 fc06ba56 2019-08-22 stsp if (err->code == GOT_ERR_CANCELLED)
4768 fc06ba56 2019-08-22 stsp err = NULL;
4769 e5a0f69f 2018-08-18 stsp view_close(blame_view);
4771 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
4773 83ce39e3 2019-08-12 stsp free(path);
4774 69efd4c4 2018-07-18 stsp return err;
4777 69efd4c4 2018-07-18 stsp static const struct got_error *
4778 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
4779 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
4780 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4781 8b473291 2019-02-21 stsp struct got_repository *repo)
4783 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
4784 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
4785 69efd4c4 2018-07-18 stsp char *path;
4787 a0de39f3 2019-08-09 stsp *new_view = NULL;
4789 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4790 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
4791 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
4793 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
4795 69efd4c4 2018-07-18 stsp return err;
4797 f135c941 2020-02-20 stsp err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4799 e5a0f69f 2018-08-18 stsp view_close(log_view);
4801 e5a0f69f 2018-08-18 stsp *new_view = log_view;
4802 cb2ebc8a 2018-06-23 stsp free(path);
4803 cb2ebc8a 2018-06-23 stsp return err;
4806 ffd1d5e5 2018-06-23 stsp static const struct got_error *
4807 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
4808 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
4809 8b473291 2019-02-21 stsp struct got_repository *repo)
4811 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
4812 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
4813 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4815 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
4817 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
4818 ffd1d5e5 2018-06-23 stsp if (err != NULL)
4819 ffd1d5e5 2018-06-23 stsp goto done;
4821 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4822 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4823 ffd1d5e5 2018-06-23 stsp goto done;
4826 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
4827 56e0773d 2019-11-28 stsp s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
4828 56e0773d 2019-11-28 stsp s->selected_entry = got_object_tree_get_entry(s->tree, 0);
4829 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
4830 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
4831 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
4832 6484ec90 2018-09-29 stsp goto done;
4834 8b473291 2019-02-21 stsp s->refs = refs;
4835 fb2756b9 2018-08-04 stsp s->repo = repo;
4837 bddb1296 2019-11-08 stsp SIMPLEQ_INIT(&s->colors);
4839 c0b01bdb 2019-11-08 stsp if (has_colors() && getenv("TOG_COLORS") != NULL) {
4840 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\$$",
4841 11b20872 2019-11-08 stsp TOG_COLOR_TREE_SUBMODULE,
4842 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SUBMODULE"));
4844 c0b01bdb 2019-11-08 stsp goto done;
4845 11b20872 2019-11-08 stsp err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
4846 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_SYMLINK"));
4847 c0b01bdb 2019-11-08 stsp if (err) {
4848 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4849 c0b01bdb 2019-11-08 stsp goto done;
4851 11b20872 2019-11-08 stsp err = add_color(&s->colors, "/$",
4852 11b20872 2019-11-08 stsp TOG_COLOR_TREE_DIRECTORY,
4853 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_DIRECTORY"));
4854 c0b01bdb 2019-11-08 stsp if (err) {
4855 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4856 c0b01bdb 2019-11-08 stsp goto done;
4859 11b20872 2019-11-08 stsp err = add_color(&s->colors, "\\*$",
4860 11b20872 2019-11-08 stsp TOG_COLOR_TREE_EXECUTABLE,
4861 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
4862 11b20872 2019-11-08 stsp if (err) {
4863 11b20872 2019-11-08 stsp free_colors(&s->colors);
4864 11b20872 2019-11-08 stsp goto done;
4867 11b20872 2019-11-08 stsp err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
4868 11b20872 2019-11-08 stsp get_color_value("TOG_COLOR_COMMIT"));
4869 c0b01bdb 2019-11-08 stsp if (err) {
4870 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4871 c0b01bdb 2019-11-08 stsp goto done;
4875 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
4876 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
4877 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
4878 7c32bd05 2019-06-22 stsp view->search_start = search_start_tree_view;
4879 7c32bd05 2019-06-22 stsp view->search_next = search_next_tree_view;
4881 ad80ab7b 2018-08-04 stsp free(commit_id_str);
4882 6484ec90 2018-09-29 stsp if (err) {
4883 fb2756b9 2018-08-04 stsp free(s->tree_label);
4884 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4886 ad80ab7b 2018-08-04 stsp return err;
4889 e5a0f69f 2018-08-18 stsp static const struct got_error *
4890 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
4892 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
4894 bddb1296 2019-11-08 stsp free_colors(&s->colors);
4895 fb2756b9 2018-08-04 stsp free(s->tree_label);
4896 6484ec90 2018-09-29 stsp s->tree_label = NULL;
4897 6484ec90 2018-09-29 stsp free(s->commit_id);
4898 6484ec90 2018-09-29 stsp s->commit_id = NULL;
4899 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
4900 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
4901 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
4902 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
4903 ad80ab7b 2018-08-04 stsp free(parent);
4906 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
4907 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
4908 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
4910 7c32bd05 2019-06-22 stsp return NULL;
4913 7c32bd05 2019-06-22 stsp static const struct got_error *
4914 7c32bd05 2019-06-22 stsp search_start_tree_view(struct tog_view *view)
4916 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4918 7c32bd05 2019-06-22 stsp s->matched_entry = NULL;
4919 7c32bd05 2019-06-22 stsp return NULL;
4922 7c32bd05 2019-06-22 stsp static int
4923 7c32bd05 2019-06-22 stsp match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4925 7c32bd05 2019-06-22 stsp regmatch_t regmatch;
4927 56e0773d 2019-11-28 stsp return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
4931 7c32bd05 2019-06-22 stsp static const struct got_error *
4932 7c32bd05 2019-06-22 stsp search_next_tree_view(struct tog_view *view)
4934 7c32bd05 2019-06-22 stsp struct tog_tree_view_state *s = &view->state.tree;
4935 56e0773d 2019-11-28 stsp struct got_tree_entry *te = NULL;
4937 7c32bd05 2019-06-22 stsp if (!view->searching) {
4938 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4939 7c32bd05 2019-06-22 stsp return NULL;
4942 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4943 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD) {
4944 7c32bd05 2019-06-22 stsp if (s->selected_entry)
4945 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree,
4946 56e0773d 2019-11-28 stsp s->selected_entry);
4948 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
4950 56e0773d 2019-11-28 stsp if (s->selected_entry == NULL)
4951 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
4953 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree,
4954 56e0773d 2019-11-28 stsp s->selected_entry);
4957 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4958 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
4960 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
4963 7c32bd05 2019-06-22 stsp while (1) {
4964 56e0773d 2019-11-28 stsp if (te == NULL) {
4965 ac66afb8 2019-06-24 stsp if (s->matched_entry == NULL) {
4966 ac66afb8 2019-06-24 stsp view->search_next_done = 1;
4967 ac66afb8 2019-06-24 stsp return NULL;
4969 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4970 56e0773d 2019-11-28 stsp te = got_object_tree_get_first_entry(s->tree);
4972 56e0773d 2019-11-28 stsp te = got_object_tree_get_last_entry(s->tree);
4975 56e0773d 2019-11-28 stsp if (match_tree_entry(te, &view->regex)) {
4976 7c32bd05 2019-06-22 stsp view->search_next_done = 1;
4977 56e0773d 2019-11-28 stsp s->matched_entry = te;
4981 7c32bd05 2019-06-22 stsp if (view->searching == TOG_SEARCH_FORWARD)
4982 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
4984 56e0773d 2019-11-28 stsp te = got_tree_entry_get_prev(s->tree, te);
4987 7c32bd05 2019-06-22 stsp if (s->matched_entry) {
4988 7c32bd05 2019-06-22 stsp s->first_displayed_entry = s->matched_entry;
4989 7c32bd05 2019-06-22 stsp s->selected = 0;
4992 e5a0f69f 2018-08-18 stsp return NULL;
4995 ad80ab7b 2018-08-04 stsp static const struct got_error *
4996 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
4998 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
4999 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
5000 e5a0f69f 2018-08-18 stsp char *parent_path;
5002 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
5004 e5a0f69f 2018-08-18 stsp return err;
5006 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
5007 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
5008 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
5009 56e0773d 2019-11-28 stsp s->tree, s->selected, view->nlines, s->tree == s->root,
5010 bddb1296 2019-11-08 stsp &s->colors);
5011 e5a0f69f 2018-08-18 stsp free(parent_path);
5013 669b5ffa 2018-10-07 stsp view_vborder(view);
5014 e5a0f69f 2018-08-18 stsp return err;
5017 e5a0f69f 2018-08-18 stsp static const struct got_error *
5018 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
5019 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
5021 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
5022 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
5023 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
5024 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
5026 e5a0f69f 2018-08-18 stsp switch (ch) {
5028 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
5031 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
5033 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
5034 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
5035 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
5036 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
5037 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
5038 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
5039 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
5041 1e37a5c2 2019-05-12 jcs return err;
5042 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
5044 1e37a5c2 2019-05-12 jcs view_close(log_view);
5047 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
5048 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
5050 1e37a5c2 2019-05-12 jcs *new_view = log_view;
5053 1e37a5c2 2019-05-12 jcs case KEY_UP:
5054 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
5055 1e37a5c2 2019-05-12 jcs s->selected--;
5056 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
5059 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
5061 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
5062 56e0773d 2019-11-28 stsp s->tree, s->tree == s->root);
5064 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
5065 ea025d1d 2020-02-22 naddy case CTRL('b'):
5066 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
5067 56e0773d 2019-11-28 stsp MAX(0, view->nlines - 4 - s->selected), s->tree,
5068 1e37a5c2 2019-05-12 jcs s->tree == s->root);
5069 1e37a5c2 2019-05-12 jcs s->selected = 0;
5070 56e0773d 2019-11-28 stsp if (got_object_tree_get_first_entry(s->tree) ==
5071 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
5072 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
5075 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
5076 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
5077 1e37a5c2 2019-05-12 jcs s->selected++;
5080 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5082 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
5084 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
5085 56e0773d 2019-11-28 stsp s->last_displayed_entry, s->tree);
5087 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
5088 ea025d1d 2020-02-22 naddy case CTRL('f'):
5089 56e0773d 2019-11-28 stsp if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5091 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
5092 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
5093 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5096 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
5097 56e0773d 2019-11-28 stsp view->nlines, s->last_displayed_entry, s->tree);
5098 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
5099 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
5100 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
5101 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
5103 1e37a5c2 2019-05-12 jcs ndisplayed++;
5104 56e0773d 2019-11-28 stsp te = got_tree_entry_get_next(s->tree, te);
5105 1e37a5c2 2019-05-12 jcs } while (te);
5106 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
5109 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
5111 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
5112 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5113 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
5114 1e37a5c2 2019-05-12 jcs /* user selected '..' */
5115 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
5117 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
5118 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
5120 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
5121 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
5122 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
5123 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
5124 1e37a5c2 2019-05-12 jcs s->selected_entry =
5125 1e37a5c2 2019-05-12 jcs parent->selected_entry;
5126 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
5127 1e37a5c2 2019-05-12 jcs free(parent);
5128 56e0773d 2019-11-28 stsp } else if (S_ISDIR(got_tree_entry_get_mode(
5129 56e0773d 2019-11-28 stsp s->selected_entry))) {
5130 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
5131 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, s->repo,
5132 56e0773d 2019-11-28 stsp got_tree_entry_get_id(s->selected_entry));
5135 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
5136 941e9f74 2019-05-21 stsp if (err) {
5137 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
5140 56e0773d 2019-11-28 stsp } else if (S_ISREG(got_tree_entry_get_mode(
5141 56e0773d 2019-11-28 stsp s->selected_entry))) {
5142 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
5143 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
5144 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
5146 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
5147 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
5148 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
5151 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
5152 669b5ffa 2018-10-07 stsp err = view_close_child(view);
5154 669b5ffa 2018-10-07 stsp return err;
5155 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
5156 669b5ffa 2018-10-07 stsp if (err) {
5157 1e37a5c2 2019-05-12 jcs view_close(blame_view);
5160 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
5161 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
5163 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
5166 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
5167 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
5168 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
5174 ffd1d5e5 2018-06-23 stsp return err;
5177 ffd1d5e5 2018-06-23 stsp __dead static void
5178 ffd1d5e5 2018-06-23 stsp usage_tree(void)
5181 55cccc34 2020-02-20 stsp fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5182 ffd1d5e5 2018-06-23 stsp getprogname());
5186 ffd1d5e5 2018-06-23 stsp static const struct got_error *
5187 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
5189 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
5190 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
5191 55cccc34 2020-02-20 stsp struct got_worktree *worktree = NULL;
5192 8b473291 2019-02-21 stsp struct got_reflist_head refs;
5193 55cccc34 2020-02-20 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5194 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
5195 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
5196 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
5197 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
5199 5221c383 2018-08-01 stsp struct tog_view *view;
5201 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
5203 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
5204 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
5205 d188b9a6 2019-01-04 stsp NULL) == -1)
5206 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
5209 74283ab8 2020-02-07 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5210 ffd1d5e5 2018-06-23 stsp switch (ch) {
5212 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
5215 74283ab8 2020-02-07 stsp repo_path = realpath(optarg, NULL);
5216 74283ab8 2020-02-07 stsp if (repo_path == NULL)
5217 74283ab8 2020-02-07 stsp return got_error_from_errno2("realpath",
5221 17020d27 2019-03-07 stsp usage_tree();
5222 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
5226 ffd1d5e5 2018-06-23 stsp argc -= optind;
5227 ffd1d5e5 2018-06-23 stsp argv += optind;
5229 55cccc34 2020-02-20 stsp if (argc > 1)
5230 74283ab8 2020-02-07 stsp usage_tree();
5232 55cccc34 2020-02-20 stsp cwd = getcwd(NULL, 0);
5233 55cccc34 2020-02-20 stsp if (cwd == NULL)
5234 55cccc34 2020-02-20 stsp return got_error_from_errno("getcwd");
5236 55cccc34 2020-02-20 stsp error = got_worktree_open(&worktree, cwd);
5237 55cccc34 2020-02-20 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5238 55cccc34 2020-02-20 stsp goto done;
5240 74283ab8 2020-02-07 stsp if (repo_path == NULL) {
5241 55cccc34 2020-02-20 stsp if (worktree)
5242 52185f70 2019-02-05 stsp repo_path =
5243 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
5245 e4a0e26d 2020-02-20 stsp repo_path = strdup(cwd);
5247 55cccc34 2020-02-20 stsp if (repo_path == NULL) {
5248 55cccc34 2020-02-20 stsp error = got_error_from_errno("strdup");
5249 55cccc34 2020-02-20 stsp goto done;
5252 c9956ddf 2019-09-08 stsp error = got_repo_open(&repo, repo_path, NULL);
5253 c02c541e 2019-03-29 stsp if (error != NULL)
5254 52185f70 2019-02-05 stsp goto done;
5256 55cccc34 2020-02-20 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5257 55cccc34 2020-02-20 stsp repo, worktree);
5258 55cccc34 2020-02-20 stsp if (error)
5259 55cccc34 2020-02-20 stsp goto done;
5261 55cccc34 2020-02-20 stsp init_curses();
5263 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
5264 c02c541e 2019-03-29 stsp if (error)
5265 52185f70 2019-02-05 stsp goto done;
5267 71a27632 2020-01-15 stsp error = got_repo_match_object_id(&commit_id, NULL,
5268 71a27632 2020-01-15 stsp commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5269 71a27632 2020-01-15 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5270 55cccc34 2020-02-20 stsp if (error)
5271 ffd1d5e5 2018-06-23 stsp goto done;
5273 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
5274 55cccc34 2020-02-20 stsp if (error)
5275 ffd1d5e5 2018-06-23 stsp goto done;
5277 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
5278 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
5279 55cccc34 2020-02-20 stsp if (error)
5280 8b473291 2019-02-21 stsp goto done;
5282 b8bad2ba 2019-08-23 stsp error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5283 8b473291 2019-02-21 stsp if (error)
5284 ffd1d5e5 2018-06-23 stsp goto done;
5286 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5287 5221c383 2018-08-01 stsp if (view == NULL) {
5288 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
5289 5221c383 2018-08-01 stsp goto done;
5291 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
5292 ad80ab7b 2018-08-04 stsp if (error)
5293 ad80ab7b 2018-08-04 stsp goto done;
5294 55cccc34 2020-02-20 stsp if (!got_path_is_root_dir(in_repo_path)) {
5295 55cccc34 2020-02-20 stsp error = tree_view_walk_path(&view->state.tree, commit_id,
5296 55cccc34 2020-02-20 stsp in_repo_path, repo);
5297 55cccc34 2020-02-20 stsp if (error)
5298 55cccc34 2020-02-20 stsp goto done;
5301 55cccc34 2020-02-20 stsp if (worktree) {
5302 55cccc34 2020-02-20 stsp /* Release work tree lock. */
5303 55cccc34 2020-02-20 stsp got_worktree_close(worktree);
5304 55cccc34 2020-02-20 stsp worktree = NULL;
5306 e5a0f69f 2018-08-18 stsp error = view_loop(view);
5308 52185f70 2019-02-05 stsp free(repo_path);
5309 e4a0e26d 2020-02-20 stsp free(cwd);
5310 ffd1d5e5 2018-06-23 stsp free(commit_id);
5311 ffd1d5e5 2018-06-23 stsp if (commit)
5312 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
5314 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
5316 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
5317 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
5318 ffd1d5e5 2018-06-23 stsp return error;
5321 ce5b7c56 2019-07-09 stsp static void
5322 ce5b7c56 2019-07-09 stsp list_commands(void)
5326 ce5b7c56 2019-07-09 stsp fprintf(stderr, "commands:");
5327 ce5b7c56 2019-07-09 stsp for (i = 0; i < nitems(tog_commands); i++) {
5328 ce5b7c56 2019-07-09 stsp struct tog_cmd *cmd = &tog_commands[i];
5329 ce5b7c56 2019-07-09 stsp fprintf(stderr, " %s", cmd->name);
5331 ce5b7c56 2019-07-09 stsp fputc('\n', stderr);
5334 4ed7e80c 2018-05-20 stsp __dead static void
5335 ce5b7c56 2019-07-09 stsp usage(int hflag)
5337 ee85c5e8 2020-02-29 stsp fprintf(stderr, "usage: %s [-h] [-V | --version] [command] "
5338 ee85c5e8 2020-02-29 stsp "[arg ...]\n", getprogname());
5339 ee85c5e8 2020-02-29 stsp if (hflag) {
5340 ee85c5e8 2020-02-29 stsp fprintf(stderr, "lazy usage: %s path\n", getprogname());
5341 ce5b7c56 2019-07-09 stsp list_commands();
5346 c2301be8 2018-04-30 stsp static char **
5347 ee85c5e8 2020-02-29 stsp make_argv(int argc, ...)
5349 ee85c5e8 2020-02-29 stsp va_list ap;
5350 c2301be8 2018-04-30 stsp char **argv;
5353 ee85c5e8 2020-02-29 stsp va_start(ap, argc);
5355 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
5356 c2301be8 2018-04-30 stsp if (argv == NULL)
5357 c2301be8 2018-04-30 stsp err(1, "calloc");
5358 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++) {
5359 ee85c5e8 2020-02-29 stsp argv[i] = strdup(va_arg(ap, char *));
5360 ee85c5e8 2020-02-29 stsp if (argv[i] == NULL)
5361 e10c916e 2019-09-15 hiltjo err(1, "strdup");
5364 ee85c5e8 2020-02-29 stsp va_end(ap);
5365 c2301be8 2018-04-30 stsp return argv;
5369 ee85c5e8 2020-02-29 stsp * Try to convert 'tog path' into a 'tog log path' command.
5370 ee85c5e8 2020-02-29 stsp * The user could simply have mistyped the command rather than knowingly
5371 ee85c5e8 2020-02-29 stsp * provided a path. So check whether argv[0] can in fact be resolved
5372 ee85c5e8 2020-02-29 stsp * to a path in the HEAD commit and print a special error if not.
5373 ee85c5e8 2020-02-29 stsp * This hack is for mpi@ <3
5375 ee85c5e8 2020-02-29 stsp static const struct got_error *
5376 ee85c5e8 2020-02-29 stsp tog_log_with_path(int argc, char *argv[])
5378 ee85c5e8 2020-02-29 stsp const struct got_error *error = NULL;
5379 ee85c5e8 2020-02-29 stsp struct tog_cmd *cmd = NULL;
5380 ee85c5e8 2020-02-29 stsp struct got_repository *repo = NULL;
5381 ee85c5e8 2020-02-29 stsp struct got_worktree *worktree = NULL;
5382 ee85c5e8 2020-02-29 stsp struct got_object_id *commit_id = NULL, *id = NULL;
5383 ee85c5e8 2020-02-29 stsp char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5384 ee85c5e8 2020-02-29 stsp char *commit_id_str = NULL, **cmd_argv = NULL;
5386 ee85c5e8 2020-02-29 stsp cwd = getcwd(NULL, 0);
5387 ee85c5e8 2020-02-29 stsp if (cwd == NULL)
5388 ee85c5e8 2020-02-29 stsp return got_error_from_errno("getcwd");
5390 ee85c5e8 2020-02-29 stsp error = got_worktree_open(&worktree, cwd);
5391 ee85c5e8 2020-02-29 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
5392 ee85c5e8 2020-02-29 stsp goto done;
5394 ee85c5e8 2020-02-29 stsp if (worktree)
5395 ee85c5e8 2020-02-29 stsp repo_path = strdup(got_worktree_get_repo_path(worktree));
5397 ee85c5e8 2020-02-29 stsp repo_path = strdup(cwd);
5398 ee85c5e8 2020-02-29 stsp if (repo_path == NULL) {
5399 ee85c5e8 2020-02-29 stsp error = got_error_from_errno("strdup");
5400 ee85c5e8 2020-02-29 stsp goto done;
5403 ee85c5e8 2020-02-29 stsp error = got_repo_open(&repo, repo_path, NULL);
5404 ee85c5e8 2020-02-29 stsp if (error != NULL)
5405 ee85c5e8 2020-02-29 stsp goto done;
5407 ee85c5e8 2020-02-29 stsp error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5408 ee85c5e8 2020-02-29 stsp repo, worktree);
5409 ee85c5e8 2020-02-29 stsp if (error)
5410 ee85c5e8 2020-02-29 stsp goto done;
5412 ee85c5e8 2020-02-29 stsp error = got_repo_match_object_id(&commit_id, NULL, worktree ?
5413 ee85c5e8 2020-02-29 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
5414 ee85c5e8 2020-02-29 stsp GOT_OBJ_TYPE_COMMIT, 1, repo);
5415 ee85c5e8 2020-02-29 stsp if (error)
5416 ee85c5e8 2020-02-29 stsp goto done;
5418 ee85c5e8 2020-02-29 stsp if (worktree) {
5419 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5420 ee85c5e8 2020-02-29 stsp worktree = NULL;
5423 ee85c5e8 2020-02-29 stsp error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
5424 ee85c5e8 2020-02-29 stsp if (error) {
5425 ee85c5e8 2020-02-29 stsp if (error->code != GOT_ERR_NO_TREE_ENTRY)
5426 ee85c5e8 2020-02-29 stsp goto done;
5427 ee85c5e8 2020-02-29 stsp fprintf(stderr, "%s: '%s' is no known command or path\n",
5428 ee85c5e8 2020-02-29 stsp getprogname(), argv[0]);
5430 ee85c5e8 2020-02-29 stsp /* not reached */
5433 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5434 ee85c5e8 2020-02-29 stsp repo = NULL;
5436 ee85c5e8 2020-02-29 stsp error = got_object_id_str(&commit_id_str, commit_id);
5437 ee85c5e8 2020-02-29 stsp if (error)
5438 ee85c5e8 2020-02-29 stsp goto done;
5440 ee85c5e8 2020-02-29 stsp cmd = &tog_commands[0]; /* log */
5442 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
5443 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv);
5446 ee85c5e8 2020-02-29 stsp got_repo_close(repo);
5447 ee85c5e8 2020-02-29 stsp if (worktree)
5448 ee85c5e8 2020-02-29 stsp got_worktree_close(worktree);
5450 ee85c5e8 2020-02-29 stsp free(commit_id_str);
5451 ee85c5e8 2020-02-29 stsp free(commit_id);
5452 ee85c5e8 2020-02-29 stsp free(cwd);
5453 ee85c5e8 2020-02-29 stsp free(repo_path);
5454 ee85c5e8 2020-02-29 stsp free(in_repo_path);
5455 ee85c5e8 2020-02-29 stsp if (cmd_argv) {
5457 ee85c5e8 2020-02-29 stsp for (i = 0; i < argc; i++)
5458 ee85c5e8 2020-02-29 stsp free(cmd_argv[i]);
5459 ee85c5e8 2020-02-29 stsp free(cmd_argv);
5461 ee85c5e8 2020-02-29 stsp return error;
5465 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
5467 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
5468 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
5469 53ccebc2 2019-07-30 stsp int ch, hflag = 0, Vflag = 0;
5470 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
5471 83cd27f8 2020-01-13 stsp static struct option longopts[] = {
5472 83cd27f8 2020-01-13 stsp { "version", no_argument, NULL, 'V' },
5473 83cd27f8 2020-01-13 stsp { NULL, 0, NULL, 0}
5476 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
5478 6586ea88 2020-01-13 stsp while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5479 9f7d7167 2018-04-29 stsp switch (ch) {
5481 9f7d7167 2018-04-29 stsp hflag = 1;
5484 53ccebc2 2019-07-30 stsp Vflag = 1;
5487 ce5b7c56 2019-07-09 stsp usage(hflag);
5488 9f7d7167 2018-04-29 stsp /* NOTREACHED */
5492 9f7d7167 2018-04-29 stsp argc -= optind;
5493 9f7d7167 2018-04-29 stsp argv += optind;
5494 9f7d7167 2018-04-29 stsp optind = 0;
5495 c2301be8 2018-04-30 stsp optreset = 1;
5497 53ccebc2 2019-07-30 stsp if (Vflag) {
5498 53ccebc2 2019-07-30 stsp got_version_print_str();
5502 c2301be8 2018-04-30 stsp if (argc == 0) {
5503 f29d3e89 2018-06-23 stsp if (hflag)
5504 ce5b7c56 2019-07-09 stsp usage(hflag);
5505 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
5506 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
5508 ee85c5e8 2020-02-29 stsp cmd_argv = make_argv(argc, cmd->name);
5512 dfd6c250 2020-02-28 stsp /* Did the user specify a command? */
5513 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
5514 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
5515 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
5516 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
5522 ee85c5e8 2020-02-29 stsp if (cmd == NULL) {
5523 ee85c5e8 2020-02-29 stsp if (argc != 1)
5525 ee85c5e8 2020-02-29 stsp /* No command specified; try log with a path */
5526 ee85c5e8 2020-02-29 stsp error = tog_log_with_path(argc, argv);
5528 ee85c5e8 2020-02-29 stsp if (hflag)
5529 ee85c5e8 2020-02-29 stsp cmd->cmd_usage();
5531 ee85c5e8 2020-02-29 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5535 a2f4a359 2020-02-28 stsp if (cmd_argv) {
5537 a2f4a359 2020-02-28 stsp for (i = 0; i < argc; i++)
5538 a2f4a359 2020-02-28 stsp free(cmd_argv[i]);
5539 a2f4a359 2020-02-28 stsp free(cmd_argv);
5542 fc06ba56 2019-08-22 stsp if (error && error->code != GOT_ERR_CANCELLED)
5543 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
